moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Steve Holme 2013-03-03 13:48:22 +00:00
parent 757aa7b09d
commit 036366f1ef
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/smtp.c
View File

@ -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);
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);
state(conn, SMTP_HELO);
return CURLE_OK;
return result;
}
static CURLcode smtp_state_starttls(struct connectdata *conn)
@ -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;
}
@ -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;