Revert "Make vfprintf_{fail,diag} wrappers"

This reverts commit fbbedc1d43af9c4fbc92611db19c617378dce2e8.

Undo as variadic macros are not allowed in C89.

diff --git a/colorize.c b/colorize.c
index 6cd51f773db27fe494f6f1ed4aefaed206799258..da444e4085ec220e654a45a30bbfb3c92144d027 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -43,9 +43,6 @@
 
 #define streq(s1, s2) (strcmp (s1, s2) == 0)
 
-#define vfprintf_fail(fmt, ...) vfprintf_name(true,  fmt, __VA_ARGS__)
-#define vfprintf_diag(fmt, ...) vfprintf_name(false, fmt, __VA_ARGS__)
-
 #if DEBUG
 # define xmalloc(size)        malloc_wrap_debug(size,        __FILE__, __LINE__)
 # define xcalloc(nmemb, size) calloc_wrap_debug(nmemb, size, __FILE__, __LINE__)
@@ -199,7 +196,7 @@ static void *realloc_wrap_debug (void *, size_t, const char *, unsigned int);
 static void free_wrap (void **);
 static char *strdup_wrap (const char *);
 static char *str_concat (const char *, const char *);
-static void vfprintf_name (bool, const char *, ...);
+static void vfprintf_fail (const char *, ...);
 static void stack_var (void ***, unsigned int *, unsigned int, void *);
 static void release_var (void **, unsigned int, void **);
 
@@ -975,7 +972,7 @@ str_concat (const char *str1, const char *str2)
 }
 
 static void
-vfprintf_name (bool fatal, const char *fmt, ...)
+vfprintf_fail (const char *fmt, ...)
 {
     va_list ap;
     fprintf (stderr, "%s: ", program_name);
@@ -983,8 +980,7 @@ vfprintf_name (bool fatal, const char *fmt, ...)
     vfprintf (stderr, fmt, ap);
     va_end (ap);
     fprintf (stderr, "\n");
-    if (fatal)
-      exit (EXIT_FAILURE);
+    exit (EXIT_FAILURE);
 }
 
 static void