svn commit: trunk/busybox: e2fsprogs networking shell

vda at busybox.net vda at busybox.net
Mon Nov 27 16:59:17 UTC 2006


Author: vda
Date: 2006-11-27 08:59:15 -0800 (Mon, 27 Nov 2006)
New Revision: 16692

Log:
fix remaining survivors of the return(a) cleanup


Modified:
   trunk/busybox/e2fsprogs/e2fsck.c
   trunk/busybox/networking/ifupdown.c
   trunk/busybox/shell/ash.c
   trunk/busybox/shell/lash.c


Changeset:
Modified: trunk/busybox/e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/e2fsck.c	2006-11-27 16:49:55 UTC (rev 16691)
+++ trunk/busybox/e2fsprogs/e2fsck.c	2006-11-27 16:59:15 UTC (rev 16692)
@@ -12520,7 +12520,7 @@
 	if (io)
 		io_channel_close(io);
 	ext2fs_free_mem(&buf);
-	return (ret_sb);
+	return ret_sb;
 }
 
 

Modified: trunk/busybox/networking/ifupdown.c
===================================================================
--- trunk/busybox/networking/ifupdown.c	2006-11-27 16:49:55 UTC (rev 16691)
+++ trunk/busybox/networking/ifupdown.c	2006-11-27 16:59:15 UTC (rev 16692)
@@ -34,7 +34,7 @@
 /* Forward declaration */
 struct interface_defn_t;
 
-typedef int (execfn)(char *command);
+typedef int execfn(char *command);
 
 struct method_t
 {
@@ -111,17 +111,17 @@
 
 #ifdef CONFIG_FEATURE_IFUPDOWN_IP
 
-static unsigned int count_bits(unsigned int a)
+static unsigned count_bits(unsigned a)
 {
-	unsigned int result;
+	unsigned result;
 	result = (a & 0x55) + ((a >> 1) & 0x55);
 	result = (result & 0x33) + ((result >> 2) & 0x33);
-	return ((result & 0x0F) + ((result >> 4) & 0x0F));
+	return (result & 0x0F) + ((result >> 4) & 0x0F);
 }
 
 static int count_netmask_bits(char *dotted_quad)
 {
-	unsigned int result, a, b, c, d;
+	unsigned result, a, b, c, d;
 	/* Found a netmask...  Check if it is dotted quad */
 	if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
 		return -1;

Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2006-11-27 16:49:55 UTC (rev 16691)
+++ trunk/busybox/shell/ash.c	2006-11-27 16:59:15 UTC (rev 16692)
@@ -4804,9 +4804,9 @@
 	while ((c = *++p) != '\0') {
 		switch(c) {
 		case CTLESC:
-			return (startp);
+			return startp;
 		case CTLQUOTEMARK:
-			return (startp);
+			return startp;
 		case ':':
 			if (flag & EXP_VARTILDE)
 				goto done;

Modified: trunk/busybox/shell/lash.c
===================================================================
--- trunk/busybox/shell/lash.c	2006-11-27 16:49:55 UTC (rev 16691)
+++ trunk/busybox/shell/lash.c	2006-11-27 16:59:15 UTC (rev 16692)
@@ -380,7 +380,7 @@
 		setlocale(LC_CTYPE, getenv("LC_CTYPE"));
 #endif
 
-	return (res);
+	return res;
 }
 
 /* built-in 'read VAR' handler */
@@ -414,7 +414,7 @@
 	else
 		fgets(string, sizeof(string), stdin);
 
-	return (res);
+	return res;
 }
 
 /* Built-in '.' handler (read-in and execute commands from file) */
@@ -433,7 +433,7 @@
 	status = busy_loop(input);
 	fclose(input);
 	llist_pop(&close_me_list);
-	return (status);
+	return status;
 }
 
 /* built-in 'unset VAR' handler */




More information about the busybox-cvs mailing list