diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2010-01-22 13:06:50 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-01-22 13:06:50 +0000 |
| commit | a771fb0d41bf65a52a7e4fb5ca0ab3ca328587dd (patch) | |
| tree | 937c3dd8dd341a804e7e005525de99bcec7840d1 | |
| parent | c047fe8e9016b5b3a586c28d5094ff8bdb40bc9e (diff) | |
alphabetically sort the list of supported protocols
| -rw-r--r-- | lib/version.c | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/lib/version.c b/lib/version.c index 2b9ebf893..03131e988 100644 --- a/lib/version.c +++ b/lib/version.c @@ -116,70 +116,69 @@ char *curl_version(void) return version; } -/* data for curl_version_info */ +/* data for curl_version_info + + Keep the list sorted alphabetically. It is also written so that each + protocol line has its own #if line to make things easier on the eye. + */ static const char * const protocols[] = { -#ifndef CURL_DISABLE_TFTP - "tftp", -#endif -#ifndef CURL_DISABLE_FTP - "ftp", -#endif -#ifndef CURL_DISABLE_TELNET - "telnet", -#endif #ifndef CURL_DISABLE_DICT "dict", #endif -#ifndef CURL_DISABLE_LDAP - "ldap", -#ifdef HAVE_LDAP_SSL - "ldaps", -#endif -#endif -#ifndef CURL_DISABLE_HTTP - "http", -#endif #ifndef CURL_DISABLE_FILE "file", #endif -#ifndef CURL_DISABLE_RTSP - "rtsp", -#endif - -#ifdef USE_SSL -#ifndef CURL_DISABLE_HTTP - "https", -#endif #ifndef CURL_DISABLE_FTP + "ftp", +#endif +#if defined(USE_SSL) && !defined(CURL_DISABLE_FTP) "ftps", #endif +#ifndef CURL_DISABLE_HTTP + "http", #endif - -#ifdef USE_LIBSSH2 - "scp", - "sftp", +#if defined(USE_SSL) && !defined(CURL_DISABLE_HTTP) + "https", #endif - #ifndef CURL_DISABLE_IMAP "imap", -#ifdef USE_SSL +#endif +#if defined(USE_SSL) && !defined(CURL_DISABLE_IMAP) "imaps", #endif +#ifndef CURL_DISABLE_LDAP + "ldap", +#endif +#if defined(HAVE_LDAP_SSL) && !defined(CURL_DISABLE_LDAP) + "ldaps", #endif - #ifndef CURL_DISABLE_POP3 "pop3", -#ifdef USE_SSL +#endif +#if defined(USE_SSL) && !defined(CURL_DISABLE_POP3) "pop3s", #endif +#ifndef CURL_DISABLE_RTSP + "rtsp", +#endif +#ifdef USE_LIBSSH2 + "scp", +#endif +#ifdef USE_LIBSSH2 + "sftp", #endif - #ifndef CURL_DISABLE_SMTP "smtp", -#ifdef USE_SSL +#endif +#if defined(USE_SSL) && !defined(CURL_DISABLE_SMTP) "smtps", #endif +#ifndef CURL_DISABLE_TELNET + "telnet", +#endif +#ifndef CURL_DISABLE_TFTP + "tftp", #endif NULL |