More code cleanup

This commit is contained in:
Pierre Pronchery 2007-05-14 18:25:31 +00:00
parent c8655f7c76
commit a8f6d8366f

View File

@ -55,10 +55,10 @@ static int _id_G(char * user, int flagn)
(unsigned)getgid()); (unsigned)getgid());
else else
{ {
printf("%s", gr->gr_name); puts(gr->gr_name);
if((gr = getgrgid(getgid())) == NULL) if((gr = getgrgid(getgid())) == NULL)
{ {
printf("\n"); putc('\n', stdout);
return _id_error("getgrgid", 1); return _id_error("getgrgid", 1);
} }
printf(" %s", gr->gr_name); printf(" %s", gr->gr_name);
@ -69,7 +69,7 @@ static int _id_G(char * user, int flagn)
if(flagn == 0) if(flagn == 0)
printf("%u", (unsigned)getgid()); printf("%u", (unsigned)getgid());
else else
printf("%s", gr->gr_name); puts(gr->gr_name);
} }
} }
else else
@ -79,7 +79,7 @@ static int _id_G(char * user, int flagn)
if(flagn == 0) if(flagn == 0)
printf("%u", (unsigned)gr->gr_gid); printf("%u", (unsigned)gr->gr_gid);
else else
printf("%s", gr->gr_name); puts(gr->gr_name);
} }
if((user = strdup(gr->gr_name)) == NULL) if((user = strdup(gr->gr_name)) == NULL)
{ {
@ -244,8 +244,8 @@ static struct group * _print_gid(gid_t gid)
if((gr = getgrgid(gid)) == NULL) if((gr = getgrgid(gid)) == NULL)
{ {
printf("\n"); putc('\n', stdout);
perror("getgrgid"); _id_error("getgrgid", 0);
} }
else else
printf("gid=%u(%s)", gr->gr_gid, gr->gr_name); printf("gid=%u(%s)", gr->gr_gid, gr->gr_name);