Commit 757aa7b0 authored by Steve Holme's avatar Steve Holme
Browse files

pop3: 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.
parent b1ebf4bd

lib/pop3.c

+10 −18
Original line number Diff line number Diff line
@@ -389,12 +389,10 @@ static CURLcode pop3_state_capa(struct connectdata *conn) 
  /* Send the CAPA command */

  result = Curl_pp_sendf(&pop3c->pp, "CAPA");



  if(result)

    return result;



  if(!result)

    state(conn, POP3_CAPA);



  return CURLE_OK;

  return result;

}



static CURLcode pop3_state_starttls(struct connectdata *conn)
@@ -446,12 +444,10 @@ static CURLcode pop3_state_user(struct connectdata *conn) 
  /* Send the USER command */

  result = Curl_pp_sendf(&conn->proto.pop3c.pp, "USER %s",

                         conn->user ? conn->user : "");

  if(result)

    return result;



  if(!result)

    state(conn, POP3_USER);



  return CURLE_OK;

  return result;

}



#ifndef CURL_DISABLE_CRYPTO_AUTH
@@ -1021,9 +1017,7 @@ static CURLcode pop3_state_user_resp(struct connectdata *conn, int pop3code, 
    /* Send the PASS command */

    result = Curl_pp_sendf(&conn->proto.pop3c.pp, "PASS %s",

                           conn->passwd ? conn->passwd : "");

  if(result)

    return result;



  if(!result)

    state(conn, POP3_PASS);



  return result;
@@ -1078,9 +1072,7 @@ static CURLcode pop3_command(struct connectdata *conn) 
                           (pop3->custom && pop3->custom[0] != '\0' ?

                            pop3->custom : command));



  if(result)

    return result;



  if(!result)

    state(conn, POP3_COMMAND);



  return result;