diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-03-14 22:52:14 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-03-14 22:52:14 +0100 |
| commit | 13b64d75589647f8d151e035bd2c5d340a1c37ee (patch) | |
| tree | 9c34a261f8803232da1b93836d2fa7b4e33db4b4 /lib/smtp.c | |
| parent | 8831000bc07de463d277975a3ddfb6a31dcf14b4 (diff) | |
protocols: use CURLPROTO_ internally
The PROT_* set of internal defines for the protocols is no longer
used. We now use the same bits internally as we have defined in the
public header using the CURLPROTO_ prefix. This is for simplicity and
because the PROT_* prefix was already used duplicated internally for a
set of KRB4 values.
The PROTOPT_* defines were moved up to just below the struct definition
within which they are used.
Diffstat (limited to 'lib/smtp.c')
| -rw-r--r-- | lib/smtp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index cfd4d981c..ff0d288c7 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -135,7 +135,7 @@ const struct Curl_handler Curl_handler_smtp = { ZERO_NULL, /* perform_getsock */ smtp_disconnect, /* disconnect */ PORT_SMTP, /* defport */ - PROT_SMTP, /* protocol */ + CURLPROTO_SMTP, /* protocol */ PROTOPT_CLOSEACTION /* flags */ }; @@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_smtps = { ZERO_NULL, /* perform_getsock */ smtp_disconnect, /* disconnect */ PORT_SMTPS, /* defport */ - PROT_SMTP | PROT_SMTPS, /* protocol */ + CURLPROTO_SMTP | CURLPROTO_SMTPS, /* protocol */ PROTOPT_CLOSEACTION | PROTOPT_SSL /* flags */ }; #endif @@ -183,7 +183,7 @@ static const struct Curl_handler Curl_handler_smtp_proxy = { ZERO_NULL, /* perform_getsock */ ZERO_NULL, /* disconnect */ PORT_SMTP, /* defport */ - PROT_HTTP, /* protocol */ + CURLPROTO_HTTP, /* protocol */ PROTOPT_NONE /* flags */ }; @@ -207,7 +207,7 @@ static const struct Curl_handler Curl_handler_smtps_proxy = { ZERO_NULL, /* perform_getsock */ ZERO_NULL, /* disconnect */ PORT_SMTPS, /* defport */ - PROT_HTTP, /* protocol */ + CURLPROTO_HTTP, /* protocol */ PROTOPT_NONE /* flags */ }; #endif @@ -1105,7 +1105,7 @@ static CURLcode smtp_connect(struct connectdata *conn, } #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ - if(conn->handler->protocol & PROT_SMTPS) { + if(conn->handler->protocol & CURLPROTO_SMTPS) { /* BLOCKING */ /* SMTPS is simply smtp with SSL for the control channel */ /* now, perform the SSL initialization for this socket */ |