[BusyBox-cvs] busybox/networking Config.in,1.1,1.2 ifupdown.c,1.10,1.11

[Glenn McGrath]

Update of /var/cvs/busybox/networking
In directory winder:/tmp/cvs-serv26256

Modified Files:
	Config.in ifupdown.c 
Log Message:
Make mapping a config option again to save space, turn off file locking, do we really need it ?


Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/networking/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in	5 Dec 2002 08:40:53 -0000	1.1
+++ Config.in	6 Dec 2002 08:35:55 -0000	1.2
@@ -85,6 +85,14 @@
 	help
 	  Please submit a patch to add help text for this item.
 
+config CONFIG_FEATURE_IFUPDOWN_MAPPING
+	bool "  Enable mapping support"
+	default n
+	depends on CONFIG_IFUPDOWN
+	help
+	  This enables support for the "mapping" stanza, unless you have
+	  a weird network setup you dont need it.
+
 config CONFIG_IP
 	bool "ip"
 	default n

Index: ifupdown.c
===================================================================
RCS file: /var/cvs/busybox/networking/ifupdown.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ifupdown.c	6 Dec 2002 08:10:40 -0000	1.10
+++ ifupdown.c	6 Dec 2002 08:35:55 -0000	1.11
@@ -680,7 +680,9 @@
 {
 	interface_defn *currif = NULL;
 	interfaces_file *defn;
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
 	mapping_defn *currmap = NULL;
+#endif
 	FILE *f;
 	char firstword[80];
 	char *buf = NULL;
@@ -708,6 +710,7 @@
 		}
[...107 lines suppressed...]
 				}
 
-				switch (cmds(currif)) {
-				case -1:
+				if (cmds(currif) == -1) {
 					printf
 						("Don't seem to be have all the variables for %s/%s.\n",
 						 liface, currif->address_family->name);
-					break;
-				case 0:
-					/* this wasn't entirely successful, should it be added to
-					 *      the state file?
-					 */
-				case 1:
-					/* successful */
 				}
+
 				currif->iface = oldiface;
 			}
 		}