Skip to content

Commit

Permalink
smtp: Updated the coding style for state changes after a send operation
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
captain-caveman2k committed Mar 3, 2013
1 parent 757aa7b commit 036366f
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions lib/smtp.c
Expand Up @@ -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;

state(conn, SMTP_EHLO);
if(!result)
state(conn, SMTP_EHLO);

return CURLE_OK;
return result;
}

static CURLcode smtp_state_helo(struct connectdata *conn)
Expand All @@ -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;

state(conn, SMTP_HELO);
if(!result)
state(conn, SMTP_HELO);

return CURLE_OK;
return result;
}

static CURLcode smtp_state_starttls(struct connectdata *conn)
Expand Down Expand Up @@ -996,10 +992,8 @@ static CURLcode smtp_mail(struct connectdata *conn)
Curl_safefree(auth);
Curl_safefree(size);

if(result)
return result;

state(conn, SMTP_MAIL);
if(!result)
state(conn, SMTP_MAIL);

return result;
}
Expand Down Expand Up @@ -1077,10 +1071,8 @@ 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;

state(conn, SMTP_DATA);
if(!result)
state(conn, SMTP_DATA);
}

return result;
Expand Down

0 comments on commit 036366f

Please sign in to comment.