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

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 7e799b5e1b9b17cf19d4fad5d1e8f1833f08d00b..9c4f49649d689a60da1260a3423bdaa81792e530 100644 (file)
--- 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)
        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 *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
        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 @@ char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
        return xstrdup(name);
 }
 
-#endif                                                 /* CONFIG_FEATURE_IPV6 */
+#endif         /* CONFIG_FEATURE_IPV6 */

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 8271f60f263dfd43e0017731640e820bfe94fd12..00b856684da5faf90a6fcb16463a9f1733ed6b1b 100644 (file)
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1734,9 +1734,8 @@ change_sysid(void)
                                "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;
                }
        }