From c9f9f601b828e0121d4e10b532789c704c8c0716 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 6 Mar 2013 20:10:53 +0000 Subject: imap: Tidied up the LIST response function Reworked comments as they referenced custom commands, removed unnecessary state change on failure and setting of result code on success. --- lib/imap.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/imap.c b/lib/imap.c index 90a2eb328..3130e1abb 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1323,23 +1323,16 @@ static CURLcode imap_state_list_resp(struct connectdata *conn, int imapcode, (void)instate; /* No use for this yet */ if(imapcode == '*') { - /* The client which asked for this custom command should know best - how to cope with the result, just send it as body. - Add back the LF character temporarily while saving. */ + /* Temporarily add the LF character back and send as body to the client */ line[len] = '\n'; result = Curl_client_write(conn, CLIENTWRITE_BODY, line, len + 1); line[len] = '\0'; } - else { - /* Final response. Stop and return the final status. */ - if(imapcode != 'O') - result = CURLE_QUOTE_ERROR; /* TODO: Fix error code */ - else - result = CURLE_OK; - + else if(imapcode != 'O') + result = CURLE_QUOTE_ERROR; /* TODO: Fix error code */ + else /* End of DO phase */ state(conn, IMAP_STOP); - } return result; } -- cgit v1.2.3