Use pa_hashmap_remove_and_free() where appropriate

[pulseaudio] / src / modules / gconf / module-gconf.c

diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index dee15af0b567ae7a84feec62d38cdb136e13c5d9..388574615950674030c9452fbcb9f32451cd5662 100644 (file)
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -289,11 +289,7 @@ static int handle_event(struct userdata *u) {
                 if (!(name = read_string(u)))
                     goto fail;
 
-                if ((m = pa_hashmap_get(u->module_infos, name))) {
-                    pa_hashmap_remove(u->module_infos, name);
-                    module_info_free(m);
-                }
-
+                pa_hashmap_remove_and_free(u->module_infos, name);
                 pa_xfree(name);
 
                 break;