Make die() just a simple macro

3 files changed, 5 insertions, 14 deletions

diff --git a/src/dbg.h b/src/dbg.h
index 6e52ed4..875e5b4 100644
--- a/src/dbg.h
+++ b/src/dbg.h
@@ -35,7 +35,11 @@ extern int DBG_LVL;
 #define log_err(...) fprintf(stderr, PREFIX(__VA_ARGS__))
 #define log_warn(...) do { if (DBG_LVL > 2) log_err(__VA_ARGS__); } while (0)
 #define log_info(...) do { if (DBG_LVL > 1) log_err(__VA_ARGS__); } while (0)
-#define die(...) die_(PREFIX(__VA_ARGS__))
+#define die(...)                                                               \
+	do {                                                                   \
+		log_err(__VA_ARGS__);                                          \
+		exit(EXIT_FAILURE);                                            \
+	} while (0)
 #define fatal(...) die(SUFFIX(": %s\n", __VA_ARGS__, strerror(errno)))
 
 #ifdef NDEBUG
diff --git a/src/util.c b/src/util.c
index d99e952..f43fc78 100644
--- a/src/util.c
+++ b/src/util.c
@@ -21,18 +21,6 @@
 #include "dbg.h"
 
 
-/* Print a given formated error message and die. */
-extern void __attribute__((noreturn)) die_(const char *err, ...) {
-	assert(err);
-	va_list ap;
-	va_start(ap, err);
-
-	vfprintf(stderr, err, ap);
-
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
-
 void *xmalloc(size_t size) {
 	assert(size > 0);
 	void *ptr = malloc(size);
diff --git a/src/util.h b/src/util.h
index 278d809..e257e27 100644
--- a/src/util.h
+++ b/src/util.h
@@ -13,7 +13,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-extern void __attribute__((noreturn)) die_(const char *err, ...);
 extern void *xmalloc(size_t size);
 extern void *xrealloc(void *ptr, size_t size);
 extern char *xstrdup(const char *str);