diff options
| -rw-r--r-- | sbin/mdconfig/mdconfig.c | 2 | ||||
| -rw-r--r-- | sbin/mdmfs/mdmfs.c | 8 | ||||
| -rw-r--r-- | usr.bin/chpass/field.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index 263a942..6296da7 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -164,7 +164,7 @@ main(int argc, char **argv) if (!strncmp(optarg, MD_NAME, sizeof(MD_NAME) - 1)) optarg += sizeof(MD_NAME) - 1; mdio.md_unit = strtoul(optarg, &p, 0); - if ((unsigned)mdio.md_unit == ULONG_MAX || *p != '\0') + if (mdio.md_unit == (unsigned)ULONG_MAX || *p != '\0') errx(1, "bad unit: %s", optarg); mdio.md_options &= ~MD_AUTOUNIT; break; diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index e741299..035f1fe 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -246,7 +246,7 @@ main(int argc, char **argv) unit = -1; } else { unit = strtoul(unitstr, &p, 10); - if ((unsigned)unit == ULONG_MAX || *p != '\0') + if (unit == (unsigned)ULONG_MAX || *p != '\0') errx(1, "bad device unit: %s", unitstr); } @@ -394,7 +394,7 @@ do_mdconfig_attach_au(const char *args, const enum md_types mdtype) strncpy(linebuf, linep + mdnamelen, linelen); linebuf[linelen] = '\0'; unit = strtoul(linebuf, &p, 10); - if ((unsigned)unit == ULONG_MAX || *p != '\n') + if (unit == (unsigned)ULONG_MAX || *p != '\n') errx(1, "unexpected output from mdconfig (attach)"); fclose(sfd); @@ -513,7 +513,7 @@ extract_ugid(const char *str, struct mtpt_info *mip) /* Derive uid. */ *uid = strtoul(user, &p, 10); - if ((unsigned)*uid == ULONG_MAX) + if (*uid == (uid_t)ULONG_MAX) usage(); if (*p != '\0') { pw = getpwnam(user); @@ -525,7 +525,7 @@ extract_ugid(const char *str, struct mtpt_info *mip) /* Derive gid. */ *gid = strtoul(group, &p, 10); - if ((unsigned)*gid == ULONG_MAX) + if (*gid == (gid_t)ULONG_MAX) usage(); if (*p != '\0') { gr = getgrnam(group); diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c index ffa79fa..fe5b30f 100644 --- a/usr.bin/chpass/field.c +++ b/usr.bin/chpass/field.c @@ -118,7 +118,7 @@ p_uid(char *p, struct passwd *pw, ENTRY *ep __unused) } errno = 0; id = strtoul(p, &np, 10); - if (*np || (id == ULONG_MAX && errno == ERANGE)) { + if (*np || (id == (uid_t)ULONG_MAX && errno == ERANGE)) { warnx("illegal uid"); return (-1); } @@ -148,7 +148,7 @@ p_gid(char *p, struct passwd *pw, ENTRY *ep __unused) } errno = 0; id = strtoul(p, &np, 10); - if (*np || (id == ULONG_MAX && errno == ERANGE)) { + if (*np || (id == (uid_t)ULONG_MAX && errno == ERANGE)) { warnx("illegal gid"); return (-1); } |
