From 51a2b436f429f3055d3fc4982917588e8dfd3cdb Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 5 Aug 2014 15:15:15 +0200
Subject: [PATCH] logging: move exit call from LOG_Message to LOG_FATAL

---
 logging.c | 3 ---
 logging.h | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/logging.c b/logging.c
index f8ae760..3ba71fc 100644
--- a/logging.c
+++ b/logging.c
@@ -187,9 +187,6 @@ void LOG_Message(LOG_Severity severity, LOG_Facility facility,
           log_message(1, severity, buf);
         }
       }
-
-      exit(1);
-
       break;
     default:
       assert(0);
diff --git a/logging.h b/logging.h
index 2c8a78f..898cde9 100644
--- a/logging.h
+++ b/logging.h
@@ -49,7 +49,11 @@ extern int log_debug_enabled;
       LOG_Message(LOGS_DEBUG, facility, __LINE__, __FILE__, FUNCTION_NAME, __VA_ARGS__); \
   } while (0)
 #define LOG(severity, facility, ...) LOG_Message(severity, facility, __LINE__, __FILE__, FUNCTION_NAME, __VA_ARGS__)
-#define LOG_FATAL(facility, ...) LOG_Message(LOGS_FATAL, facility, __LINE__, __FILE__, FUNCTION_NAME, __VA_ARGS__)
+#define LOG_FATAL(facility, ...) \
+  do { \
+    LOG_Message(LOGS_FATAL, facility, __LINE__, __FILE__, FUNCTION_NAME, __VA_ARGS__); \
+    exit(1); \
+  } while (0)
 
 /* Definition of severity */
 typedef enum {