From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Tue, 28 Feb 2023 11:44:48 +0000 (+0000)
Subject: dbox: dbox_cleanup_temp_files() - Remove unnecessary else/else if after returns
X-Git-Tag: 2.4.0~2936
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c7c817cfeba54dd32ac8dd7e70f052be7525c2;p=thirdparty%2Fdovecot%2Fcore.git

dbox: dbox_cleanup_temp_files() - Remove unnecessary else/else if after returns
---

diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c
index 8ff212bc62..498c2cee75 100644
--- a/src/lib-storage/index/dbox-common/dbox-storage.c
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c
@@ -183,38 +183,39 @@ dbox_cleanup_temp_files(struct mailbox *box, const char *path,
 	if (interval == 0) {
 		/* disabled */
 		return FALSE;
-	} else if (last_scan_time >= ioloop_time - (time_t)interval) {
+	}
+
+	if (last_scan_time >= ioloop_time - (time_t)interval) {
 		/* not the time to scan it yet */
 		return FALSE;
-	} else {
-		bool stated = FALSE;
-		if (last_change_time == (time_t)-1) {
-			/* Don't know the ctime yet - look it up. */
-			struct stat st;
-
-			if (stat(path, &st) < 0) {
-				if (errno != ENOENT)
-					e_error(box->event,
-						"stat(%s) failed: %m", path);
-				return FALSE;
-			}
-			last_change_time = st.st_ctime;
-			stated = TRUE;
-		}
-		if (last_scan_time > last_change_time + DBOX_TMP_DELETE_SECS) {
-			/* there haven't been any changes to this directory
-			   since we last checked it. If we did an extra stat(),
-			   we need to update the last_scan_time to avoid
-			   stat()ing the next time. */
-			return stated;
+	}
+
+	bool stated = FALSE;
+	if (last_change_time == (time_t)-1) {
+		/* Don't know the ctime yet - look it up. */
+		struct stat st;
+
+		if (stat(path, &st) < 0) {
+			if (errno != ENOENT)
+				e_error(box->event,
+					"stat(%s) failed: %m", path);
+			return FALSE;
 		}
-		const char *prefix =
-			mailbox_list_get_global_temp_prefix(box->list);
-		(void)unlink_old_files(path, prefix,
-				       ioloop_time - DBOX_TMP_DELETE_SECS);
-		return TRUE;
+		last_change_time = st.st_ctime;
+		stated = TRUE;
 	}
-	return FALSE;
+	if (last_scan_time > last_change_time + DBOX_TMP_DELETE_SECS) {
+		/* there haven't been any changes to this directory
+		   since we last checked it. If we did an extra stat(),
+		   we need to update the last_scan_time to avoid
+		   stat()ing the next time. */
+		return stated;
+	}
+	const char *prefix =
+		mailbox_list_get_global_temp_prefix(box->list);
+	(void)unlink_old_files(path, prefix,
+				ioloop_time - DBOX_TMP_DELETE_SECS);
+	return TRUE;
 }
 
 int dbox_mailbox_check_existence(struct mailbox *box)