From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 28 Feb 2013 22:46:22 +0000 (+0000)
Subject: imap: Updated the coding style for state changes after a send operation
X-Git-Tag: curl-7_30_0~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b06a78622609;p=thirdparty%2Fcurl.git

imap: Updated the coding style for state changes after a send operation

Some state changes would be performed after a failure test that
performed a hard return, whilst others would be performed within a test
for success. Updated the code, for consistency, so all instances are
performed within a success test.
---

diff --git a/lib/imap.c b/lib/imap.c
index e67d6a5c38..c9e2a1923d 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -492,10 +492,8 @@ static CURLcode imap_state_capability(struct connectdata *conn)
   /* Send the CAPABILITY command */
   result = imap_sendf(conn, "CAPABILITY");
 
-  if(result)
-    return result;
-
-  state(conn, IMAP_CAPABILITY);
+  if(!result)
+    state(conn, IMAP_CAPABILITY);
 
   return CURLE_OK;
 }
@@ -559,10 +557,8 @@ static CURLcode imap_state_login(struct connectdata *conn)
   Curl_safefree(user);
   Curl_safefree(passwd);
 
-  if(result)
-    return result;
-
-  state(conn, IMAP_LOGIN);
+  if(!result)
+    state(conn, IMAP_LOGIN);
 
   return CURLE_OK;
 }
@@ -686,10 +682,8 @@ static CURLcode imap_select(struct connectdata *conn)
     result = imap_sendf(conn, "SELECT %s", mailbox);
 
   Curl_safefree(mailbox);
-  if(result)
-    return result;
-
-  state(conn, IMAP_SELECT);
+  if(!result)
+    state(conn, IMAP_SELECT);
 
   return result;
 }
@@ -703,10 +697,8 @@ static CURLcode imap_fetch(struct connectdata *conn)
   result = imap_sendf(conn, "FETCH %s BODY[%s]",
                       imap->uid ? imap->uid : "1",
                       imap->section ? imap->section : "");
-  if(result)
-    return result;
-
-  state(conn, IMAP_FETCH);
+  if(!result)
+    state(conn, IMAP_FETCH);
 
   return result;
 }