Commit 0636af61 authored by Steve Holme's avatar Steve Holme
Browse files

smtp.c: Re-factored the smtp_state_*_resp() functions 

Re-factored the smtp_state_*_resp() functions to 1) Match the constants
that were refactored in commit 00fddba6, 2) To be more readable and
3) To match their counterparties in pop3.c.
parent 7352ac40

lib/smtp.c

+24 −24
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static CURLcode smtp_state_helo_resp(struct connectdata *conn, 
}



/* For AUTH PLAIN (without initial response) responses */

static CURLcode smtp_state_authplain_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_plain_resp(struct connectdata *conn,

                                           int smtpcode,

                                           smtpstate instate)

{
@@ -612,7 +612,7 @@ static CURLcode smtp_state_authplain_resp(struct connectdata *conn, 
}



/* For AUTH LOGIN (without initial response) responses */

static CURLcode smtp_state_authlogin_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_login_resp(struct connectdata *conn,

                                           int smtpcode,

                                           smtpstate instate)

{
@@ -648,7 +648,7 @@ static CURLcode smtp_state_authlogin_resp(struct connectdata *conn, 
}



/* For responses to user entry of AUTH LOGIN */

static CURLcode smtp_state_authpasswd_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_passwd_resp(struct connectdata *conn,

                                            int smtpcode,

                                            smtpstate instate)

{
@@ -685,7 +685,7 @@ static CURLcode smtp_state_authpasswd_resp(struct connectdata *conn, 


#ifndef CURL_DISABLE_CRYPTO_AUTH

/* For AUTH CRAM-MD5 responses */

static CURLcode smtp_state_authcram_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_cram_resp(struct connectdata *conn,

                                          int smtpcode,

                                          smtpstate instate)

{
@@ -737,7 +737,7 @@ static CURLcode smtp_state_authcram_resp(struct connectdata *conn, 
}



/* For AUTH DIGEST-MD5 challenge responses */

static CURLcode smtp_state_authdigest_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_digest_resp(struct connectdata *conn,

                                            int smtpcode,

                                            smtpstate instate)

{
@@ -779,7 +779,7 @@ static CURLcode smtp_state_authdigest_resp(struct connectdata *conn, 
}



/* For AUTH DIGEST-MD5 challenge-response responses */

static CURLcode smtp_state_authdigest_resp_resp(struct connectdata *conn,

static CURLcode smtp_state_auth_digest_resp_resp(struct connectdata *conn,

                                                 int smtpcode,

                                                 smtpstate instate)

{
@@ -1152,28 +1152,28 @@ static CURLcode smtp_statemach_act(struct connectdata *conn) 
      break;



    case SMTP_AUTH_PLAIN:

      result = smtp_state_authplain_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_plain_resp(conn, smtpcode, smtpc->state);

      break;



    case SMTP_AUTH_LOGIN:

      result = smtp_state_authlogin_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_login_resp(conn, smtpcode, smtpc->state);

      break;



    case SMTP_AUTH_PASSWD:

      result = smtp_state_authpasswd_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_passwd_resp(conn, smtpcode, smtpc->state);

      break;



#ifndef CURL_DISABLE_CRYPTO_AUTH

    case SMTP_AUTH_CRAMMD5:

      result = smtp_state_authcram_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_cram_resp(conn, smtpcode, smtpc->state);

      break;



    case SMTP_AUTH_DIGESTMD5:

      result = smtp_state_authdigest_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_digest_resp(conn, smtpcode, smtpc->state);

      break;



    case SMTP_AUTH_DIGESTMD5_RESP:

      result = smtp_state_authdigest_resp_resp(conn, smtpcode, smtpc->state);

      result = smtp_state_auth_digest_resp_resp(conn, smtpcode, smtpc->state);

      break;

#endif