From 96d534cffc26081fb19131b2223e34a1bea61261 Mon Sep 17 00:00:00 2001
From: Frank Benkstein <frank-vlock@benkstein.net>
Date: Fri, 28 Sep 2007 23:40:16 +0200
Subject: [PATCH] move ensure_atexit back to vlock-main.c and simplify

---
 src/util.h       | 6 ------
 src/vlock-main.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util.h b/src/util.h
index d466aca..b9113d2 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,12 +28,6 @@ void fatal_error_free(char *errmsg)
 void fatal_perror(const char *errmsg)
   __attribute__((noreturn));
 
-#define ensure_atexit(func) \
-  do { \
-    if (atexit(func) != 0) \
-      fatal_error("vlock-main: Cannot register function '%s' with atexit().",  #func); \
-  } while (0)
-
 void *ensure_malloc(size_t);
 void *ensure_calloc(size_t, size_t);
 void *ensure_realloc(void *, size_t);
diff --git a/src/vlock-main.c b/src/vlock-main.c
index b63caf5..f19377e 100644
--- a/src/vlock-main.c
+++ b/src/vlock-main.c
@@ -35,6 +35,12 @@
 
 int vlock_debug = 0;
 
+#define ensure_atexit(func) \
+  do { \
+    if (atexit(func) != 0) \
+      fatal_perror("vlock-main: atexit() failed"); \
+  } while (0)
+
 static char *get_username(void)
 {
   uid_t uid = getuid();
-- 
2.11.4.GIT