svn commit: trunk/busybox: libbb util-linux

[vda at busybox.net]

Author: vda
Date: 2008-01-24 14:49:15 -0800 (Thu, 24 Jan 2008)
New Revision: 20897

Log:
fdisk: fix a case where break was reached only for DOS labels



Modified:
   trunk/busybox/libbb/inet_common.c
   trunk/busybox/util-linux/fdisk.c


Changeset:
Modified: trunk/busybox/libbb/inet_common.c
===================================================================
--- trunk/busybox/libbb/inet_common.c	2008-01-24 03:35:48 UTC (rev 20896)
+++ trunk/busybox/libbb/inet_common.c	2008-01-24 22:49:15 UTC (rev 20897)
@@ -97,7 +97,6 @@
 	uint32_t ad, host_ad;
 	int host = 0;
 
-	/* Grmpf. -FvK */
 	if (s_in->sin_family != AF_INET) {
 #ifdef DEBUG
 		bb_error_msg("rresolve: unsupported address family %d!",
@@ -195,7 +194,6 @@
 	char name[128];
 	int s;
 
-	/* Grmpf. -FvK */
 	if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
 		bb_error_msg("rresolve: unsupport address family %d!",
@@ -223,4 +221,4 @@
 	return xstrdup(name);
 }
 
-#endif							/* CONFIG_FEATURE_IPV6 */
+#endif		/* CONFIG_FEATURE_IPV6 */

Modified: trunk/busybox/util-linux/fdisk.c
===================================================================
--- trunk/busybox/util-linux/fdisk.c	2008-01-24 03:35:48 UTC (rev 20896)
+++ trunk/busybox/util-linux/fdisk.c	2008-01-24 22:49:15 UTC (rev 20897)
@@ -1734,9 +1734,8 @@
 				"to %x (%s)\n", i + 1, sys,
 				partition_type(sys));
 			ptes[i].changed = 1;
-			if (is_dos_partition(origsys) ||
-				is_dos_partition(sys))
-				//dos_changed = 1;
+			//if (is_dos_partition(origsys) || is_dos_partition(sys))
+			//	dos_changed = 1;
 			break;
 		}
 	}