]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: start relying on fs_iter_deinit(NULL) being a no-op
authorJosef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Fri, 25 May 2018 15:03:25 +0000 (11:03 -0400)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Wed, 13 Jun 2018 08:30:02 +0000 (11:30 +0300)
src/lib-dict-extra/dict-fs.c

index 7987ffd540c86428016ab4849372d3412912917e..7967b4f2f0c222ce628867314ac95a761530a850 100644 (file)
@@ -193,10 +193,9 @@ static int fs_dict_iterate_deinit(struct dict_iterate_context *ctx,
        struct fs_dict *dict = (struct fs_dict *)ctx->dict;
        int ret;
 
-       if (iter->fs_iter != NULL) {
-               if (fs_iter_deinit(&iter->fs_iter) < 0 && iter->error == NULL)
-                       iter->error = i_strdup(fs_last_error(dict->fs));
-       }
+       if (fs_iter_deinit(&iter->fs_iter) < 0 && iter->error == NULL)
+               iter->error = i_strdup(fs_last_error(dict->fs));
+
        ret = iter->error != NULL ? -1 : 0;
        *error_r = t_strdup(iter->error);