diff options
author | Jim Meyering <meyering@redhat.com> | 2008-01-28 00:08:32 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-02-14 11:31:57 +0100 |
commit | cc8b73b1d9cb63c89a76db8ece8a699fb98fff1a (patch) | |
tree | 4dd2caba8f28bf2016bcd662654e90ae44240ee5 | |
parent | 167b8025aca487de001da2448c1aebc2747bc1d3 (diff) | |
download | coreutils-cc8b73b1d9cb63c89a76db8ece8a699fb98fff1a.tar.xz |
groups: don't test printf and putchar calls for failure
They are unnecessary, since we use gnulib's closeout module.
* src/group-list.c (print_group): Remove explicit error tests.
* src/groups.c (main): Likewise.
(write_error): Remove function.
-rw-r--r-- | src/group-list.c | 16 | ||||
-rw-r--r-- | src/groups.c | 25 |
2 files changed, 5 insertions, 36 deletions
diff --git a/src/group-list.c b/src/group-list.c index e788f8e87..ace4908b1 100644 --- a/src/group-list.c +++ b/src/group-list.c @@ -109,21 +109,9 @@ print_group (gid_t gid, bool use_name) } if (grp == NULL) - { - if (printf ("%lu", (unsigned long int) gid) < 0) - { - error (0, errno, _("write error")); - ok = false; - } - } + printf ("%lu", (unsigned long int) gid); else - { - if (printf ("%s", grp->gr_name) < 0) - { - error (0, errno, _("write error")); - ok = false; - } - } + printf ("%s", grp->gr_name); return ok; } diff --git a/src/groups.c b/src/groups.c index 8a4673ced..baac7b931 100644 --- a/src/groups.c +++ b/src/groups.c @@ -65,13 +65,6 @@ the current process (which is different if the groups database has changed).\n") exit (status); } -static void -write_error (void) -{ - error (0, errno, _("write error")); -} - - int main (int argc, char **argv) { @@ -111,11 +104,7 @@ main (int argc, char **argv) if (!print_group_list (NULL, ruid, rgid, egid, true)) ok = false; - if (EOF == putchar ('\n')) - { - write_error (); - ok = false; - } + putchar ('\n'); } else { @@ -128,18 +117,10 @@ main (int argc, char **argv) ruid = pwd->pw_uid; rgid = egid = pwd->pw_gid; - if (printf ("%s : ", argv[optind]) < 0) - { - write_error (); - ok = false; - } + printf ("%s : ", argv[optind]); if (!print_group_list (argv[optind++], ruid, rgid, egid, true)) ok = false; - if (EOF == putchar ('\n')) - { - write_error (); - ok = false; - } + putchar ('\n'); } } |