Merge pull request #2755 from dilyanpalauzov/imap_fetchnews_simplify

imap/fetchnews.c: simplify: int r=0; if (r!=0) … is a no-op
cyrusimap · Aug 22, 2024 · b30b9c4 · b30b9c4
2 parents 4874b88 + ce4692d
commit b30b9c4
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/imap/fetchnews.c b/imap/fetchnews.c
@@ -78,32 +78,26 @@ static int newsrc_dbopen = 0;
 static int newsrc_init(const char *fname, int myflags __attribute__((unused)))
 {
     char buf[1024];
-    int r = 0;
-
-    if (r != 0)
-        syslog(LOG_ERR, "DBERROR: init %s: %s", buf,
-               cyrusdb_strerror(r));
-    else {
-        char *tofree = NULL;
+    int r;
+    char *tofree = NULL;
 
-        if (!fname)
-            fname = config_getstring(IMAPOPT_NEWSRC_DB_PATH);
+    if (!fname)
+        fname = config_getstring(IMAPOPT_NEWSRC_DB_PATH);
 
-        /* create db file name */
-        if (!fname) {
-            tofree = strconcat(config_dir, FNAME_NEWSRCDB, (char *)NULL);
-            fname = tofree;
-        }
+    /* create db file name */
+    if (!fname) {
+        tofree = strconcat(config_dir, FNAME_NEWSRCDB, (char *)NULL);
+        fname = tofree;
+    }
 
-        r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &newsrc_db);
-        if (r != 0)
-            syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
-                   cyrusdb_strerror(r));
-        else
-            newsrc_dbopen = 1;
+    r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &newsrc_db);
+    if (r != 0)
+        syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
+               cyrusdb_strerror(r));
+    else
+        newsrc_dbopen = 1;
 
-        free(tofree);
-    }
+    free(tofree);
 
     return r;
 }