svn commit: trunk/busybox/networking/libiproute

aldot at busybox.net aldot at busybox.net
Sun Jan 28 00:20:47 UTC 2007


Author: aldot
Date: 2007-01-27 16:20:46 -0800 (Sat, 27 Jan 2007)
New Revision: 17566

Log:
- use uint32_t as suggested by vda.
- minor size- and readability tweaks while at it:
   text	   data	    bss	    dec	    hex	filename
   2631	      0	      0	   2631	    a47	networking/libiproute/iprule.o.orig
   2596	      0	      0	   2596	    a24	networking/libiproute/iprule.o


Modified:
   trunk/busybox/networking/libiproute/iprule.c


Changeset:
Modified: trunk/busybox/networking/libiproute/iprule.c
===================================================================
--- trunk/busybox/networking/libiproute/iprule.c	2007-01-27 23:18:58 UTC (rev 17565)
+++ trunk/busybox/networking/libiproute/iprule.c	2007-01-28 00:20:46 UTC (rev 17566)
@@ -13,6 +13,7 @@
  * Changes:
  *
  * Rani Assaf <rani at magic.metawire.com> 980929:	resolve addresses
+ * initially integrated into busybox by Bernhard Fischer
  */
 
 #include "libbb.h"
@@ -168,7 +169,8 @@
 		af = AF_INET;
 
 	if (argc > 0) {
-		bb_error_msg("\"rule show\" needs no arguments");
+		//bb_error_msg("\"rule show\" needs no arguments");
+		bb_warn_ignoring_args(argc);
 		return -1;
 	}
 
@@ -256,7 +258,7 @@
 			addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
 		} else if (matches(*argv, "table") == 0 ||
 			   strcmp(*argv, "lookup") == 0) {
-			unsigned int tid;
+			uint32_t tid;
 			NEXT_ARG();
 			if (rtnl_rttable_a2n(&tid, *argv))
 				invarg("table ID", *argv);
@@ -304,16 +306,16 @@
 
 int do_iprule(int argc, char **argv)
 {
-	static const char * const ip_rule_commands[] =
+	const char * const ip_rule_commands[] =
 		{"add", "delete", "list", "show", 0};
-	int command_num = 2;
-	int cmd;
+	int cmd = 2; /* list */
 
 	if (argc < 1)
 		return iprule_list(0, NULL);
 	if (*argv)
-		command_num = index_in_substr_array(ip_rule_commands, *argv);
-	switch (command_num) {
+		cmd = index_in_substr_array(ip_rule_commands, *argv);
+
+	switch (cmd) {
 		case 0: /* add */
 			cmd = RTM_NEWRULE;
 			break;




More information about the busybox-cvs mailing list