From 5c89413b245f523478bf5e50d25eb84ecb3fddce Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 6 Mar 2013 20:31:53 +0000 Subject: [PATCH] imap: Tidied up the APPEND and final APPEND response functions Removed unnecessary state changes on failure and setting of result codes on success. --- lib/imap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/imap.c b/lib/imap.c index 894d044e4..186ff63f6 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1506,14 +1506,15 @@ static CURLcode imap_state_append_resp(struct connectdata *conn, int imapcode, result = CURLE_UPLOAD_FAILED; } else { + /* Set the progress upload size */ Curl_pgrsSetUploadSize(data, data->set.infilesize); /* IMAP upload */ Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL); - } - /* End of DO phase */ - state(conn, IMAP_STOP); + /* End of DO phase */ + state(conn, IMAP_STOP); + } return result; } @@ -1527,14 +1528,11 @@ static CURLcode imap_state_append_final_resp(struct connectdata *conn, (void)instate; /* No use for this yet */ - /* Final response, stop and return the final status */ - if(imapcode == 'O') - result = CURLE_OK; - else + if(imapcode != 'O') result = CURLE_UPLOAD_FAILED; - - /* End of DONE phase */ - state(conn, IMAP_STOP); + else + /* End of DONE phase */ + state(conn, IMAP_STOP); return result; }