global: remove unnecessary ENOENT checks from unlink_directory() calls

diff --git a/src/lib-fs/test-fs-posix.c b/src/lib-fs/test-fs-posix.c
index c9c1ef94086bc0cb98b5bd894df22ef5835ace54..8f5c35a8f4ac302c99c4cb6613fdb428af3a92dc 100644 (file)
--- a/src/lib-fs/test-fs-posix.c
+++ b/src/lib-fs/test-fs-posix.c
@@ -15,8 +15,7 @@ static void test_fs_posix(void)
        const char testdir[] = ".test-fs-posix";
        const char *unlink_err;
 
-       if (unlink_directory(testdir, UNLINK_DIRECTORY_FLAG_RMDIR, &unlink_err) < 0 &&
-           errno != ENOENT) {
+       if (unlink_directory(testdir, UNLINK_DIRECTORY_FLAG_RMDIR, &unlink_err) < 0) {
                i_error("Couldn't prepare test directory (%s): %s", testdir, unlink_err);
                goto error_no_testdir;
        }

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index 8ef4f7bef77c5363540a35252d42bce5c78d2fbd..34706ca3dba4d977abe9aaf717a7e4a349e0339a 100644 (file)
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -1971,7 +1971,7 @@ static void test_tmp_dir_deinit(void)
        const char *error;
 
        if (unlink_directory(tmp_dir,
-               UNLINK_DIRECTORY_FLAG_RMDIR, &error) < 0 && errno != ENOENT) {
+               UNLINK_DIRECTORY_FLAG_RMDIR, &error) < 0) {
                i_warning("failed to remove temporary directory `%s': %s.",
                        tmp_dir, error);
        }

diff --git a/src/lib-storage/list/mailbox-list-delete.c b/src/lib-storage/list/mailbox-list-delete.c
index 2ce78a69053245be3b500a83848afd50a8a6b95d..69715851c22023cf0a06fcea6754175ca11bd7c2 100644 (file)
--- a/src/lib-storage/list/mailbox-list-delete.c
+++ b/src/lib-storage/list/mailbox-list-delete.c
@@ -383,7 +383,7 @@ static int mailbox_list_try_delete(struct mailbox_list *list, const char *name,
        } else {
                if (mailbox_list_delete_trash(path, &error) == 0)
                        ret = 1;
-               else if (errno == ENOENT || errno == ENOTEMPTY)
+               else if (errno == ENOTEMPTY)
                        ret = 0;
                else {
                        mailbox_list_set_critical(list,

diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c
index db64ccd010a01d4e6bdc67a1603e78618b526a65..39068a8867aadfc41d0ac345929e17e489110ca2 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index-backend.c
+++ b/src/lib-storage/list/mailbox-list-index-backend.c
@@ -606,7 +606,7 @@ index_list_try_delete(struct mailbox_list *_list, const char *name,
                        return;
        } else {
                if (mailbox_list_delete_trash(path, &error) < 0 &&
-                   errno != ENOENT && errno != ENOTEMPTY) {
+                   errno != ENOTEMPTY) {
                        mailbox_list_set_critical(_list,
                                "unlink_directory(%s) failed: %s", path, error);
                }

diff --git a/src/plugins/fts-lucene/lucene-wrapper.cc b/src/plugins/fts-lucene/lucene-wrapper.cc
index 047af18540e1d86a3cab8b2b0057d2715929e838..9d5840d63412fdfedb1fdd3159ae1e8e3c3e7506 100644 (file)
--- a/src/plugins/fts-lucene/lucene-wrapper.cc
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc
@@ -275,8 +275,7 @@ static void lucene_handle_error(struct lucene_index *index, CLuceneError &err,
             err.number() == CL_ERR_IO)) {
                /* delete corrupted index. most IO errors are also about
                   missing files and other such corruption.. */
-               if (unlink_directory(index->path, (enum unlink_directory_flags)0, &error) < 0 &&
-                   errno != ENOENT)
+               if (unlink_directory(index->path, (enum unlink_directory_flags)0, &error) < 0)
                        i_error("unlink_directory(%s) failed: %s", index->path, error);
                rescan_clear_unseen_mailboxes(index, NULL);
        }