Commit 036366f1 authored by Steve Holme's avatar Steve Holme
Browse files

smtp: 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 757aa7b0

lib/smtp.c

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

  result = Curl_pp_sendf(&smtpc->pp, "EHLO %s", smtpc->domain);



  if(result)

    return result;



  if(!result)

    state(conn, SMTP_EHLO);



  return CURLE_OK;

  return result;

}



static CURLcode smtp_state_helo(struct connectdata *conn)
@@ -362,12 +360,10 @@ static CURLcode smtp_state_helo(struct connectdata *conn) 
  /* Send the HELO command */

  result = Curl_pp_sendf(&smtpc->pp, "HELO %s", smtpc->domain);



  if(result)

    return result;



  if(!result)

    state(conn, SMTP_HELO);



  return CURLE_OK;

  return result;

}



static CURLcode smtp_state_starttls(struct connectdata *conn)
@@ -996,9 +992,7 @@ static CURLcode smtp_mail(struct connectdata *conn) 
  Curl_safefree(auth);

  Curl_safefree(size);



  if(result)

    return result;



  if(!result)

    state(conn, SMTP_MAIL);



  return result;
@@ -1077,9 +1071,7 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode, 
    /* Send the DATA command */

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "DATA");



    if(result)

      return result;



    if(!result)

      state(conn, SMTP_DATA);

  }