hwclock: fix sizeof bug (used it on pointer, not array); make --systohc exact

[oweals/busybox.git] / networking / ip.c

diff --git a/networking/ip.c b/networking/ip.c
index 182813d4e3ce80dfb693cc36d3e4a71408f4adbb..7a0f308f0caf5f3f43053954809e4d61c4a8dedf 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -10,7 +10,7 @@
  * Changes:
  *
  * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
- * Bernhard Fischer rewrote to use index_in_substr_array
+ * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
 #include "libbb.h"
@@ -24,73 +24,73 @@
  || ENABLE_FEATURE_IP_TUNNEL \
  || ENABLE_FEATURE_IP_RULE
 
-static int ATTRIBUTE_NORETURN ip_print_help(char ATTRIBUTE_UNUSED **argv)
+static int NORETURN ip_print_help(char **argv UNUSED_PARAM)
 {
        bb_show_usage();
 }
 
 static int ip_do(int (*ip_func)(char **argv), char **argv)
 {
-       argv = ip_parse_common_args(argv);
+       argv = ip_parse_common_args(argv + 1);
        return ip_func(argv);
 }
 
 #if ENABLE_FEATURE_IP_ADDRESS
 int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ipaddr_main(int argc, char **argv)
+int ipaddr_main(int argc UNUSED_PARAM, char **argv)
 {
-    return ip_do(do_ipaddr, argv);
+       return ip_do(do_ipaddr, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_LINK
 int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int iplink_main(int argc, char **argv)
+int iplink_main(int argc UNUSED_PARAM, char **argv)
 {
-    return ip_do(do_iplink, argv);
+       return ip_do(do_iplink, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_ROUTE
 int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int iproute_main(int argc, char **argv)
+int iproute_main(int argc UNUSED_PARAM, char **argv)
 {
-    return ip_do(do_iproute, argv);
+       return ip_do(do_iproute, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_RULE
 int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int iprule_main(int argc, char **argv)
+int iprule_main(int argc UNUSED_PARAM, char **argv)
 {
-    return ip_do(do_iprule, argv);
+       return ip_do(do_iprule, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_TUNNEL
 int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int iptunnel_main(int argc, char **argv)
+int iptunnel_main(int argc UNUSED_PARAM, char **argv)
 {
-    return ip_do(do_iptunnel, argv);
+       return ip_do(do_iptunnel, argv);
 }
 #endif
 
 
 int ip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ip_main(int argc, char **argv)
+int ip_main(int argc UNUSED_PARAM, char **argv)
 {
        static const char keywords[] ALIGN1 =
-               USE_FEATURE_IP_ADDRESS("address\0")
-               USE_FEATURE_IP_ROUTE("route\0")
-               USE_FEATURE_IP_LINK("link\0")
-               USE_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0")
-               USE_FEATURE_IP_RULE("rule\0")
+               IF_FEATURE_IP_ADDRESS("address\0")
+               IF_FEATURE_IP_ROUTE("route\0")
+               IF_FEATURE_IP_LINK("link\0")
+               IF_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0")
+               IF_FEATURE_IP_RULE("rule\0")
                ;
        enum {
-               USE_FEATURE_IP_ADDRESS(IP_addr,)
-               USE_FEATURE_IP_ROUTE(IP_route,)
-               USE_FEATURE_IP_LINK(IP_link,)
-               USE_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
-               USE_FEATURE_IP_RULE(IP_rule,)
+               IF_FEATURE_IP_ADDRESS(IP_addr,)
+               IF_FEATURE_IP_ROUTE(IP_route,)
+               IF_FEATURE_IP_LINK(IP_link,)
+               IF_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
+               IF_FEATURE_IP_RULE(IP_rule,)
                IP_none
        };
-       int (*ip_func)(char **argv) = ip_print_help;
+       int (*ip_func)(char**) = ip_print_help;
 
        argv = ip_parse_common_args(argv + 1);
        if (*argv) {