mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream-restore: Fix a few assertion misuses with the D-Bus code.

Browse source
This commit is contained in:
Tanu Kaskinen 2009-12-03 15:31:11 +02:00 • committed by Colin Guthrie
parent e785f728a5
commit a6b7ac6826
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-stream-restore.c
View file

@ -647,7 +647,7 @@ static void handle_add_entry(DBusConnection *conn, DBusMessage *msg, void *userd
} else { } else {
dbus_entry = dbus_entry_new(u, name); dbus_entry = dbus_entry_new(u, name);
pa_assert(pa_hashmap_put(u->dbus_entries, dbus_entry->entry_name, dbus_entry) >= 0); pa_assert_se(pa_hashmap_put(u->dbus_entries, dbus_entry->entry_name, dbus_entry) == 0);
e->muted_valid = TRUE; e->muted_valid = TRUE;
e->volume_valid = !!map.channels; e->volume_valid = !!map.channels;
@ -1245,10 +1245,10 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
if (created_new_entry) { if (created_new_entry) {
de = dbus_entry_new(u, name); de = dbus_entry_new(u, name);
pa_hashmap_put(u->dbus_entries, de->entry_name, de); pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
send_new_entry_signal(de); send_new_entry_signal(de);
} else { } else {
pa_assert((de = pa_hashmap_get(u->dbus_entries, name))); pa_assert_se(de = pa_hashmap_get(u->dbus_entries, name));
if (device_updated) if (device_updated)
send_device_updated_signal(de, &entry); send_device_updated_signal(de, &entry);
@ -1859,7 +1859,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
} else { } else {
de = dbus_entry_new(u, name); de = dbus_entry_new(u, name);
pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de)); pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
send_new_entry_signal(de); send_new_entry_signal(de);
} }
#endif #endif
@ -2050,7 +2050,7 @@ int pa__init(pa_module*m) {
pa_datum_free(&key); pa_datum_free(&key);
de = dbus_entry_new(u, name); de = dbus_entry_new(u, name);
pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) >= 0); pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
pa_xfree(name); pa_xfree(name);