dhcprelay: code shrink
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 8 Jan 2018 09:14:17 +0000 (10:14 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Mon, 8 Jan 2018 09:14:17 +0000 (10:14 +0100)
function                                             old     new   delta
dhcprelay_main                                       961     958      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/udhcp/dhcprelay.c

index 4d5644093fd5aab824c98c8e8de759a3ba8d0306..86dcb1af0802ee4935d7550fae5c25f130420b9f 100644 (file)
@@ -254,7 +254,7 @@ static void pass_to_client(struct dhcp_packet *p, int packet_len, int *fds)
 }
 
 int dhcprelay_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dhcprelay_main(int argc, char **argv)
+int dhcprelay_main(int argc UNUSED_PARAM, char **argv)
 {
        struct sockaddr_in server_addr;
        char **iface_list;
@@ -269,11 +269,11 @@ int dhcprelay_main(int argc, char **argv)
        server_addr.sin_port = htons(SERVER_PORT);
 
        /* dhcprelay CLIENT_IFACE1[,CLIENT_IFACE2...] SERVER_IFACE [SERVER_IP] */
-       if (argc == 4) {
+       if (!argv[1] || !argv[2])
+               bb_show_usage();
+       if (argv[3]) {
                if (!inet_aton(argv[3], &server_addr.sin_addr))
                        bb_perror_msg_and_die("bad server IP");
-       } else if (argc != 3) {
-               bb_show_usage();
        }
 
        iface_list = make_iface_list(argv + 1, &num_sockets);