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/imap.c | |
| parent | 8831000bc07de463d277975a3ddfb6a31dcf14b4 (diff) | |
| download | curl-13b64d75589647f8d151e035bd2c5d340a1c37ee.tar.gz | |
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/imap.c')
| -rw-r--r-- | lib/imap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/imap.c b/lib/imap.c index 12af79553..6ba665770 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -128,7 +128,7 @@ const struct Curl_handler Curl_handler_imap = { ZERO_NULL, /* perform_getsock */ imap_disconnect, /* disconnect */ PORT_IMAP, /* defport */ - PROT_IMAP, /* protocol */ + CURLPROTO_IMAP, /* protocol */ PROTOPT_CLOSEACTION /* flags */ }; @@ -152,7 +152,7 @@ const struct Curl_handler Curl_handler_imaps = { ZERO_NULL, /* perform_getsock */ imap_disconnect, /* disconnect */ PORT_IMAPS, /* defport */ - PROT_IMAP | PROT_IMAPS, /* protocol */ + CURLPROTO_IMAP | CURLPROTO_IMAPS, /* protocol */ PROTOPT_CLOSEACTION | PROTOPT_SSL /* flags */ }; #endif @@ -176,7 +176,7 @@ static const struct Curl_handler Curl_handler_imap_proxy = { ZERO_NULL, /* perform_getsock */ ZERO_NULL, /* disconnect */ PORT_IMAP, /* defport */ - PROT_HTTP, /* protocol */ + CURLPROTO_HTTP, /* protocol */ PROTOPT_NONE /* flags */ }; @@ -200,7 +200,7 @@ static const struct Curl_handler Curl_handler_imaps_proxy = { ZERO_NULL, /* perform_getsock */ ZERO_NULL, /* disconnect */ PORT_IMAPS, /* defport */ - PROT_HTTP, /* protocol */ + CURLPROTO_HTTP, /* protocol */ PROTOPT_NONE /* flags */ }; #endif @@ -621,7 +621,7 @@ static CURLcode imap_multi_statemach(struct connectdata *conn, struct imap_conn *imapc = &conn->proto.imapc; CURLcode result; - if((conn->handler->protocol & PROT_IMAPS) && !imapc->ssldone) { + if((conn->handler->protocol & CURLPROTO_IMAPS) && !imapc->ssldone) { result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone); } else { @@ -738,7 +738,7 @@ static CURLcode imap_connect(struct connectdata *conn, } #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ - if((conn->handler->protocol & PROT_IMAPS) && + if((conn->handler->protocol & CURLPROTO_IMAPS) && data->state.used_interface != Curl_if_multi) { /* BLOCKING */ /* IMAPS is simply imap with SSL for the control channel */ |