wget: shrink code if https isn't supported

If FEATURE_WGET_OPENSSL and FEATURE_WGET_SSL_HELPER are both disabled
there's no point in checking for https URLs.

function                                             old     new   delta
P_HTTPS                                                6       -      -6
.rodata                                           155501  155469     -32
parse_url                                            476     423     -53
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/2 up/down: 0/-91)             Total: -91 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2015-10-12 10:51:25 +01:00 committed by Denys Vlasenko
parent ab3964db4e
commit 4d0c1ea478

View File

@ -147,7 +147,9 @@ struct host_info {
}; };
static const char P_FTP[] = "ftp"; static const char P_FTP[] = "ftp";
static const char P_HTTP[] = "http"; static const char P_HTTP[] = "http";
#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER
static const char P_HTTPS[] = "https"; static const char P_HTTPS[] = "https";
#endif
#if ENABLE_FEATURE_WGET_LONG_OPTIONS #if ENABLE_FEATURE_WGET_LONG_OPTIONS
/* User-specified headers prevent using our corresponding built-in headers. */ /* User-specified headers prevent using our corresponding built-in headers. */
@ -410,10 +412,12 @@ static void parse_url(const char *src_url, struct host_info *h)
if (strcmp(url, P_FTP) == 0) { if (strcmp(url, P_FTP) == 0) {
h->port = bb_lookup_port(P_FTP, "tcp", 21); h->port = bb_lookup_port(P_FTP, "tcp", 21);
} else } else
#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER
if (strcmp(url, P_HTTPS) == 0) { if (strcmp(url, P_HTTPS) == 0) {
h->port = bb_lookup_port(P_HTTPS, "tcp", 443); h->port = bb_lookup_port(P_HTTPS, "tcp", 443);
h->protocol = P_HTTPS; h->protocol = P_HTTPS;
} else } else
#endif
if (strcmp(url, P_HTTP) == 0) { if (strcmp(url, P_HTTP) == 0) {
http: http:
h->port = bb_lookup_port(P_HTTP, "tcp", 80); h->port = bb_lookup_port(P_HTTP, "tcp", 80);