Compile fixes. Fixes warnings.

This commit is contained in:
nekral-guest 2009-03-08 23:30:25 +00:00
parent 27153ae92b
commit 1dc04372df
4 changed files with 10 additions and 10 deletions

View File

@ -546,7 +546,7 @@ static void check_grp_file (int *errors, bool *changed)
* Check for invalid user ID. * Check for invalid user ID.
*/ */
if (grp->gr_gid == (gid_t)-1) { if (grp->gr_gid == (gid_t)-1) {
printf (_("invalid user ID '%lu'\n"), grp->gr_gid); printf (_("invalid user ID '%lu'\n"), (long unsigned int)grp->gr_gid);
*errors += 1; *errors += 1;
} }

View File

@ -399,7 +399,7 @@ static void check_pw_file (int *errors, bool *changed)
* Check for invalid user ID. * Check for invalid user ID.
*/ */
if (pwd->pw_uid == (uid_t)-1) { if (pwd->pw_uid == (uid_t)-1) {
printf (_("invalid user ID '%lu'\n"), pwd->pw_uid); printf (_("invalid user ID '%lu'\n"), (long unsigned int)pwd->pw_uid);
*errors += 1; *errors += 1;
} }

View File

@ -271,7 +271,7 @@ static struct group *getgr_nam_gid (const char *grname)
char *endptr; char *endptr;
errno = 0; errno = 0;
gid = strtoll (grname, &errptr, 10); gid = strtoll (grname, &endptr, 10);
if ( ('\0' != *grname) if ( ('\0' != *grname)
&& ('\0' == *endptr) && ('\0' == *endptr)
&& (ERANGE != errno) && (ERANGE != errno)
@ -284,10 +284,10 @@ static struct group *getgr_nam_gid (const char *grname)
static long get_number (const char *numstr) static long get_number (const char *numstr)
{ {
long val; long val;
char *errptr; char *endptr;
val = strtol (numstr, &errptr, 10); val = strtol (numstr, &endptr, 10);
if (('\0' == *numstr) || ('\0' != *errptr) || (ERANGE == errno)) { if (('\0' == *numstr) || ('\0' != *endptr) || (ERANGE == errno)) {
fprintf (stderr, fprintf (stderr,
_("%s: invalid numeric argument '%s'\n"), _("%s: invalid numeric argument '%s'\n"),
Prog, numstr); Prog, numstr);

View File

@ -196,7 +196,7 @@ static struct group *getgr_nam_gid (const char *grname)
char *endptr; char *endptr;
errno = 0; errno = 0;
val = strtoll (grname, &errptr, 10); val = strtoll (grname, &endptr, 10);
if ( ('\0' != *grname) if ( ('\0' != *grname)
&& ('\0' == *endptr) && ('\0' == *endptr)
&& (ERANGE != errno) && (ERANGE != errno)
@ -787,10 +787,10 @@ static void grp_update (void)
static long get_number (const char *numstr) static long get_number (const char *numstr)
{ {
long val; long val;
char *errptr; char *endptr;
val = strtol (numstr, &errptr, 10); val = strtol (numstr, &endptr, 10);
if (('\0' != *errptr) || (ERANGE == errno)) { if (('\0' != *endptr) || (ERANGE == errno)) {
fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
numstr); numstr);
exit (E_BAD_ARG); exit (E_BAD_ARG);