From c73a7f9ba0079e03c1376409184d416b0e36ea49 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 20 Jan 2001 21:41:11 +0000 Subject: [PATCH] lean up a potential error, thanks to Vladimir N. Oleynik . --- utility.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/utility.c b/utility.c index 3d5620ec5..27613b177 100644 --- a/utility.c +++ b/utility.c @@ -79,8 +79,7 @@ const char mtab_file[] = "/dev/mtab"; extern void usage(const char *usage) { - fprintf(stderr, "%s\n\n", full_version); - fprintf(stderr, "Usage: %s\n", usage); + fprintf(stderr, "%s\n\nUsage: %s\n", full_version, usage); exit(EXIT_FAILURE); } @@ -89,7 +88,6 @@ static void verror_msg(const char *s, va_list p) fflush(stdout); fprintf(stderr, "%s: ", applet_name); vfprintf(stderr, s, p); - fflush(stderr); } extern void error_msg(const char *s, ...) @@ -113,14 +111,11 @@ extern void error_msg_and_die(const char *s, ...) static void vperror_msg(const char *s, va_list p) { - fflush(stdout); - fprintf(stderr, "%s: ", applet_name); - if (s && *s) { - vfprintf(stderr, s, p); - fputs(": ", stderr); - } - fprintf(stderr, "%s\n", strerror(errno)); - fflush(stderr); + int err=errno; + if(s == 0) s = ""; + verror_msg(s, p); + if (*s) s = ": "; + fprintf(stderr, "%s%s\n", s, strerror(err)); } extern void perror_msg(const char *s, ...) -- 2.25.1