lib/config: simplify cleanup in notmuch_database_get_config_list()

The list destructor is always set when necessary (i.e. if the iterator
is successfully created), so there is never a need to invoke it
explicitly, even on failure.

diff --git a/lib/config.cc b/lib/config.cc
index acb397ecc14efbd093f167df41747b69c2277cbb..6cc5986989969c3edc9de5d144ca37ef184c4c30 100644 (file)
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -170,14 +170,8 @@ notmuch_database_get_config_list (notmuch_database_t *notmuch,
     *out = list;
 
   DONE:
-    if (status) {
-       if (list) {
-           talloc_free (list);
-           if (status != NOTMUCH_STATUS_XAPIAN_EXCEPTION)
-               _notmuch_config_list_destroy (list);
-       }
-    } else {
-       talloc_set_destructor (list, _notmuch_config_list_destroy);
+    if (status && list) {
+       talloc_free (list);
     }
 
     return status;