emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Vlasenko 2008-01-24 22:49:15 +00:00
parent 680b86afbb
commit a5549c9617
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/inet_common.c
View File

@ -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 */

5
util-linux/fdisk.c
View File

@ -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;
}
}