mount: cleanup error() and die()

 * moves error() and die() to sundries.h
 * removes at_die
 * adds __attribute__ ((__format__ (__printf__ )))

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/mount/fstab.c b/mount/fstab.c
index a151df610bb1d8e5fcfe1efd931171722efef4ab..7baa68ee53db334878fbcf9c741b427390119d75 100644 (file)
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -813,7 +813,6 @@ update_mtab (const char *dir, struct my_mntent *instead) {
 
 /* dummy */
 int verbose;
-int mount_quiet;
 char *progname;
 
 const char *fsprobe_get_label_by_devname(const char *spec) { return NULL; }

diff --git a/mount/mount.c b/mount/mount.c
index ca1238f4859ee6de466a6adb51a389d45034f796..f7ff56e1bdbfb6ed8f61e8da152264d3964f4552 100644 (file)
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -50,9 +50,6 @@
 #include "setproctitle.h"
 #endif
 
-/* Quiet mode */
-int mount_quiet = 0;
-
 /* True for fake mount (-f).  */
 static int fake = 0;
 

diff --git a/mount/sundries.c b/mount/sundries.c
index 1669554c0ee8506f1ab45f7e185069ca3ec3cdb0..0c7c6e1e9ee7227530a5e2036d9afbb7fffd9a41 100644 (file)
--- a/mount/sundries.c
+++ b/mount/sundries.c
@@ -18,6 +18,8 @@
 #include "xmalloc.h"
 #include "nls.h"
 
+int mount_quiet;
+
 char *
 xstrndup (const char *s, int n) {
      char *t;
@@ -108,6 +110,19 @@ error (const char *fmt, ...) {
      fputc('\n', stderr);
 }
 
+/* Fatal error.  Print message and exit.  */
+void
+die(int err, const char *fmt, ...) {
+       va_list args;
+
+       va_start(args, fmt);
+       vfprintf(stderr, fmt, args);
+       fprintf(stderr, "\n");
+       va_end(args);
+
+       exit(err);
+}
+
 /* True if fstypes match.  Null *TYPES means match anything,
    except that swap types always return false. */
 /* Accept nonfs,proc,devpts and nonfs,noproc,nodevpts

diff --git a/mount/sundries.h b/mount/sundries.h
index 3d6a1bd22e774e92c00c0470d28e6ceac3196b72..010eece48898af38cf5faf3f760ae0e829086e88 100644 (file)
--- a/mount/sundries.h
+++ b/mount/sundries.h
@@ -22,9 +22,14 @@ extern int sloppy;
 
 #define streq(s, t)    (strcmp ((s), (t)) == 0)
 
-/* Functions in sundries.c that are used in mount.c and umount.c  */ 
+/* Functions in sundries.c that are used in mount.c and umount.c  */
 void block_signals (int how);
-void error (const char *fmt, ...);
+
+void error (const char *fmt, ...)
+       __attribute__ ((__format__ (__printf__, 1, 2)));
+void die(int err, const char *fmt, ...)
+       __attribute__ ((__format__ (__printf__, 2, 3)));
+
 int matching_type (const char *type, const char *types);
 int matching_opts (const char *options, const char *test_opts);
 void *xmalloc (size_t size);
@@ -35,8 +40,6 @@ char *xstrconcat4 (char *, const char *, const char *, const char *);
 
 int parse_spec(const char *spec, char **name, char **value);
 
-void die (int errcode, const char *fmt, ...);
-
 /* exit status - bits below are ORed */
 #define EX_USAGE       1       /* incorrect invocation or permission */
 #define EX_SYSERR      2       /* out of memory, cannot fork, ... */

diff --git a/mount/swapon.c b/mount/swapon.c
index 84b047da26adf093a5754d58fd5e912d0fcf40ac..5e8c6eb0ffac58a5a5cc53c29ad1dee98356a18f 100644 (file)
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -36,7 +36,6 @@
 int all = 0;
 int verbose = 0;
 int priority = -1;     /* non-prioritized swap by default */
-int mount_quiet = 0;
 
 /* If true, don't complain if the device/file doesn't exist */
 int ifexists = 0;

diff --git a/mount/umount.c b/mount/umount.c
index 18612543e04760ecd90d18cd4b8c5e3a599722fd..ab179c219c7f5cd8b3a306ef819f7f28649b7a1c 100644 (file)
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -400,8 +400,6 @@ usage (FILE *fp, int n)
   exit (n);
 }
 
-int mount_quiet = 0;
-
 /*
  * Look for an option in a comma-separated list
  */

diff --git a/mount/xmalloc.c b/mount/xmalloc.c
index c3f51e50cf93e5fa95bb0d9c7e8769bd02351abf..3fd09fdd511cc46f3098e96a71a59dff41b92c50 100644 (file)
--- a/mount/xmalloc.c
+++ b/mount/xmalloc.c
@@ -5,24 +5,6 @@
 #include "nls.h"       /* _() */
 #include "sundries.h"  /* EX_SYSERR */
 
-void (*at_die)(void) = NULL;
-
-/* Fatal error.  Print message and exit.  */
-void
-die(int err, const char *fmt, ...) {
-       va_list args;
-
-       va_start(args, fmt);
-       vfprintf(stderr, fmt, args);
-       fprintf(stderr, "\n");
-       va_end(args);
-
-       if (at_die)
-               (*at_die)();
-
-       exit(err);
-}
-
 static void
 die_if_null(void *t) {
        if (t == NULL)

diff --git a/mount/xmalloc.h b/mount/xmalloc.h
index 91d64c5a36d768d4122f88fb63e4656fcfec32eb..978e541a768d5425881480e78d87761a34cc87bd 100644 (file)
--- a/mount/xmalloc.h
+++ b/mount/xmalloc.h
@@ -1,8 +1,8 @@
-#include <sys/types.h>
-#include <stdarg.h>
+#ifndef MOUNT_XMALLOC_H
+#define MOUNT_XMALLOC_H
 
 extern void *xmalloc(size_t size);
 extern void *xrealloc(void *p, size_t size);
 extern char *xstrdup(const char *s);
-extern void die(int err, const char *fmt, ...);
-extern void (*at_die)(void);
+
+#endif  /* MOUNT_XMALLOC_H */