email: Simplified nesting of if statements in *_doing() functions

diff --git a/lib/imap.c b/lib/imap.c
index ae5ec86c250af8f55c3d6e34b05360cb87bc6824..136d643794368540429ce7e495e9f4ecbe5e3277 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -2194,12 +2194,10 @@ static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done)
 
   if(result)
     DEBUGF(infof(conn->data, "DO phase failed\n"));
-  else {
-    if(*dophase_done) {
-      result = imap_dophase_done(conn, FALSE /* not connected */);
+  else if(*dophase_done) {
+    result = imap_dophase_done(conn, FALSE /* not connected */);
 
-      DEBUGF(infof(conn->data, "DO phase is complete\n"));
-    }
+    DEBUGF(infof(conn->data, "DO phase is complete\n"));
   }
 
   return result;

diff --git a/lib/pop3.c b/lib/pop3.c
index 9592664159c74d7ad0bc8a4df6f3cdbb6c6c5b6a..28a359ebe9659a31a85e55737c32b015707cf765 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1566,12 +1566,10 @@ static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
 
   if(result)
     DEBUGF(infof(conn->data, "DO phase failed\n"));
-  else {
-    if(*dophase_done) {
-      result = pop3_dophase_done(conn, FALSE /* not connected */);
+  else if(*dophase_done) {
+    result = pop3_dophase_done(conn, FALSE /* not connected */);
 
-      DEBUGF(infof(conn->data, "DO phase is complete\n"));
-    }
+    DEBUGF(infof(conn->data, "DO phase is complete\n"));
   }
 
   return result;

diff --git a/lib/smtp.c b/lib/smtp.c
index 0f04397cc15178d024e9913251d31917b69788e9..21c202e3c10cafd723c89dcd8c85a456d889304e 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1565,12 +1565,10 @@ static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
 
   if(result)
     DEBUGF(infof(conn->data, "DO phase failed\n"));
-  else {
-    if(*dophase_done) {
-      result = smtp_dophase_done(conn, FALSE /* not connected */);
+  else if(*dophase_done) {
+    result = smtp_dophase_done(conn, FALSE /* not connected */);
 
-      DEBUGF(infof(conn->data, "DO phase is complete\n"));
-    }
+    DEBUGF(infof(conn->data, "DO phase is complete\n"));
   }
 
   return result;