diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 09:04:15 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 09:04:15 +0300 |
commit | 06232e2965ee02d62ca566fcbf5e805c571b574a (patch) | |
tree | 123b01fed2f5e4ae4bc474d05f199a8b6c52a499 /src/modules/module-stream-restore.c | |
parent | fcf68752e687123a171b1144f78f8eba1625a204 (diff) |
dbus: Take advantage of the PA_HASHMAP_FOREACH macro.
Diffstat (limited to 'src/modules/module-stream-restore.c')
-rw-r--r-- | src/modules/module-stream-restore.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index bccdf938..e9063031 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -553,10 +553,8 @@ static const char **get_entries(struct userdata *u, unsigned *n) { entries = pa_xnew(const char *, *n); - while ((de = pa_hashmap_iterate(u->dbus_entries, &state, NULL))) { - entries[i] = de->object_path; - ++i; - } + PA_HASHMAP_FOREACH(de, u->dbus_entries, state) + entries[i++] = de->object_path; return entries; } @@ -1747,7 +1745,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio struct dbus_entry *de; void *state = NULL; - while ((de = pa_hashmap_iterate(u->dbus_entries, &state, NULL))) { + PA_HASHMAP_FOREACH(de, u->dbus_entries, state) { send_entry_removed_signal(de); dbus_entry_free(pa_hashmap_remove(u->dbus_entries, de->entry_name)); } |