wget: fix compile warnings when WGET_FTP is not selected

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/networking/wget.c b/networking/wget.c
index 512bebfc2..ec3767793 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1178,7 +1178,9 @@ static void download_one_url(const char *url)
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-        if (use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/) {
+        if (!ENABLE_FEATURE_WGET_FTP
+         || use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/
+        ) {
                 /*
                  *  HTTP session
                  */
@@ -1447,14 +1449,15 @@ However, in real world it was observed that some web servers
 
                 /* For HTTP, data is pumped over the same connection */
                 dfp = sfp;
-        } else {
+        }
 #if ENABLE_FEATURE_WGET_FTP
+        else {
                 /*
                  *  FTP session
                  */
                 sfp = prepare_ftp_session(&dfp, &target, lsa);
-#endif
         }
+#endif
 
         free(lsa);
 
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e6f0043d0..c3fd0eb57 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -366,7 +366,7 @@ static void set_rtc_param(const char **pp_rtcname, char *rtc_param)
         /* handle param name */
         eq = strchr(rtc_param, '=');
         if (!eq)
-                bb_error_msg_and_die("expected <param>=<value>");
+                bb_simple_error_msg_and_die("expected <param>=<value>");
         *eq = '\0';
         param.param = resolve_rtc_param_alias(rtc_param);
         *eq = '=';