From: Sergey Kitov <sergey.kitov@open-xchange.com>
Date: Wed, 20 Sep 2017 08:34:49 +0000 (+0300)
Subject: global: remove unnecessary ENOENT checks from unlink_directory() calls
X-Git-Tag: 2.3.0.rc1~958
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d9053f57383a2382c70f76b0790a7bf192aa891;p=thirdparty%2Fdovecot%2Fcore.git

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 c9c1ef9408..8f5c35a8f4 100644
--- 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 8ef4f7bef7..34706ca3db 100644
--- 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 2ce78a6905..69715851c2 100644
--- 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 db64ccd010..39068a8867 100644
--- 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 047af18540..9d5840d634 100644
--- 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);
 	}