idxset: Use pa_free_cb_t instead of pa_free2_cb_t

There were no users for the userdata pointer.
This commit is contained in:
Tanu Kaskinen 2013-02-12 21:36:55 +02:00
parent 43e7868008
commit 061878b5a4
27 changed files with 81 additions and 119 deletions

View file

@ -449,7 +449,7 @@ static void setting_free(pa_alsa_setting *s) {
pa_assert(s);
if (s->options)
pa_idxset_free(s->options, NULL, NULL);
pa_idxset_free(s->options, NULL);
pa_xfree(s->name);
pa_xfree(s->description);
@ -3289,10 +3289,10 @@ static void profile_free(pa_alsa_profile *p) {
pa_xstrfreev(p->output_mapping_names);
if (p->input_mappings)
pa_idxset_free(p->input_mappings, NULL, NULL);
pa_idxset_free(p->input_mappings, NULL);
if (p->output_mappings)
pa_idxset_free(p->output_mappings, NULL, NULL);
pa_idxset_free(p->output_mappings, NULL);
pa_xfree(p);
}

View file

@ -1547,7 +1547,7 @@ static pa_bool_t sink_set_formats(pa_sink *s, pa_idxset *formats) {
return FALSE;
}
pa_idxset_free(u->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
pa_idxset_free(u->formats, (pa_free_cb_t) pa_format_info_free);
u->formats = pa_idxset_new(NULL, NULL);
/* Note: the logic below won't apply if we're using software encoding.
@ -2455,7 +2455,7 @@ static void userdata_free(struct userdata *u) {
pa_smoother_free(u->smoother);
if (u->formats)
pa_idxset_free(u->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
pa_idxset_free(u->formats, (pa_free_cb_t) pa_format_info_free);
if (u->rates)
pa_xfree(u->rates);

View file

@ -1498,9 +1498,9 @@ static void free_verb(pa_alsa_ucm_verb *verb) {
PA_LLIST_REMOVE(pa_alsa_ucm_device, verb->devices, di);
pa_proplist_free(di->proplist);
if (di->conflicting_devices)
pa_idxset_free(di->conflicting_devices, NULL, NULL);
pa_idxset_free(di->conflicting_devices, NULL);
if (di->supported_devices)
pa_idxset_free(di->supported_devices, NULL, NULL);
pa_idxset_free(di->supported_devices, NULL);
pa_xfree(di);
}
@ -1552,7 +1552,7 @@ void pa_alsa_ucm_mapping_context_free(pa_alsa_ucm_mapping_context *context) {
dev->capture_mapping = NULL;
}
pa_idxset_free(context->ucm_devices, NULL, NULL);
pa_idxset_free(context->ucm_devices, NULL);
}
if (context->ucm_modifiers) {
@ -1563,7 +1563,7 @@ void pa_alsa_ucm_mapping_context_free(pa_alsa_ucm_mapping_context *context) {
mod->capture_mapping = NULL;
}
pa_idxset_free(context->ucm_modifiers, NULL, NULL);
pa_idxset_free(context->ucm_modifiers, NULL);
}
}