aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-01-24 22:49:15 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-01-24 22:49:15 +0000
commita5549c961739fb0d354f3c41cb5fb0d64c8da4ec (patch)
tree124661cc0161a21e3e9eb8ca43411b7cf6b1ac02
parent680b86afbb8ba466176ad6866409496225660009 (diff)
downloadbusybox-w32-a5549c961739fb0d354f3c41cb5fb0d64c8da4ec.tar.gz
busybox-w32-a5549c961739fb0d354f3c41cb5fb0d64c8da4ec.tar.bz2
busybox-w32-a5549c961739fb0d354f3c41cb5fb0d64c8da4ec.zip
fdisk: fix a case where break was reached only for DOS labels
-rw-r--r--libbb/inet_common.c4
-rw-r--r--util-linux/fdisk.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 7e799b5e1..9c4f49649 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -97,7 +97,6 @@ char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
97 uint32_t ad, host_ad; 97 uint32_t ad, host_ad;
98 int host = 0; 98 int host = 0;
99 99
100 /* Grmpf. -FvK */
101 if (s_in->sin_family != AF_INET) { 100 if (s_in->sin_family != AF_INET) {
102#ifdef DEBUG 101#ifdef DEBUG
103 bb_error_msg("rresolve: unsupported address family %d!", 102 bb_error_msg("rresolve: unsupported address family %d!",
@@ -195,7 +194,6 @@ char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
195 char name[128]; 194 char name[128];
196 int s; 195 int s;
197 196
198 /* Grmpf. -FvK */
199 if (sin6->sin6_family != AF_INET6) { 197 if (sin6->sin6_family != AF_INET6) {
200#ifdef DEBUG 198#ifdef DEBUG
201 bb_error_msg("rresolve: unsupport address family %d!", 199 bb_error_msg("rresolve: unsupport address family %d!",
@@ -223,4 +221,4 @@ char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
223 return xstrdup(name); 221 return xstrdup(name);
224} 222}
225 223
226#endif /* CONFIG_FEATURE_IPV6 */ 224#endif /* CONFIG_FEATURE_IPV6 */
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 8271f60f2..00b856684 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1734,9 +1734,8 @@ change_sysid(void)
1734 "to %x (%s)\n", i + 1, sys, 1734 "to %x (%s)\n", i + 1, sys,
1735 partition_type(sys)); 1735 partition_type(sys));
1736 ptes[i].changed = 1; 1736 ptes[i].changed = 1;
1737 if (is_dos_partition(origsys) || 1737 //if (is_dos_partition(origsys) || is_dos_partition(sys))
1738 is_dos_partition(sys)) 1738 // dos_changed = 1;
1739 //dos_changed = 1;
1740 break; 1739 break;
1741 } 1740 }
1742 } 1741 }