- set flags in a more reasonable manner. Thanks, vodz.

   text    data     bss     dec     hex filename
   3520       4      96    3620     e24 networking/arping.o.oorig
   3488       4      96    3588     e04 networking/arping.o


git-svn-id: svn://busybox.net/trunk/busybox@14734 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 16 deletions

diff --git a/networking/arping.c b/networking/arping.c
index 4f1a2e2c5..7618e9630 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -36,8 +36,8 @@ enum cfg_e {
         advert = 4,
         quiet = 8,
         quit_on_reply = 16,
-        unicasting = 32,
-        broadcast_only = 64
+        broadcast_only = 32,
+        unicasting = 64
 };
 static int cfg;
 
@@ -281,22 +281,11 @@ int arping_main(int argc, char **argv)
                 char *_count, *_timeout, *_device;
                 opt = bb_getopt_ulflags(argc, argv, "DUAqfbc:w:i:s:",
                                                 &_count, &_timeout, &_device);
-                if (opt & 1) { /* Dad */
-                        cfg |= dad;
+                cfg |= opt & 63; /* set respective flags */
+                if (opt & 1) /* Dad also sets quit_on_reply */
                         cfg |= quit_on_reply;
-                }
-                if (opt & 2) /* Unsolicited */
-                        cfg |= unsolicited;
-                if (opt & 4) { /* Advert */
-                        cfg |= advert;
+                if (opt & 4) /* Advert also sets unsolicited */
                         cfg |= unsolicited;
-                }
-                if (opt & 8) /* quiet */
-                        cfg |= quiet;
-                if (opt & 16) /* quit on reply */
-                        cfg |= quit_on_reply;
-                if (opt & 32) /* broadcast only */
-                        cfg |= broadcast_only;
                 if (opt & 64) /* count */
                         count = atoi(_count);
                 if (opt & 128) /* timeout */