]> code.delx.au - pulseaudio/commitdiff
stream-restore: Don't verify entry validity needlessly.
authorTanu Kaskinen <tanuk@iki.fi>
Fri, 6 Jan 2012 14:15:58 +0000 (16:15 +0200)
committerTanu Kaskinen <tanuk@iki.fi>
Sat, 28 Jan 2012 14:43:49 +0000 (16:43 +0200)
clean_up_db() makes sure that all entries in the database
are valid.

src/modules/module-stream-restore.c

index d1c87285d573de72aa0987422e26c39d5b9a6b5e..23889ca09f81e94bda927cae2cf522c775b49981 100644 (file)
@@ -2460,22 +2460,14 @@ int pa__init(pa_module*m) {
         pa_datum next_key;
         char *name;
         struct dbus_entry *de;
         pa_datum next_key;
         char *name;
         struct dbus_entry *de;
-        struct entry *e;
-
-        done = !pa_database_next(u->database, &key, &next_key, NULL);
 
         name = pa_xstrndup(key.data, key.size);
 
         name = pa_xstrndup(key.data, key.size);
-        pa_datum_free(&key);
-
-        /* Use entry_read() for checking that the entry is valid. */
-        if ((e = entry_read(u, name))) {
-            de = dbus_entry_new(u, name);
-            pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
-            entry_free(e);
-        }
-
+        de = dbus_entry_new(u, name);
+        pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
         pa_xfree(name);
 
         pa_xfree(name);
 
+        done = !pa_database_next(u->database, &key, &next_key, NULL);
+        pa_datum_free(&key);
         key = next_key;
     }
 #endif
         key = next_key;
     }
 #endif