Merge pull request #5871 from kmk3/improve-errexit

modif: improve errExit error messages

1 files changed, 11 insertions, 2 deletions

diff --git a/src/include/common.h b/src/include/common.h
index a0ad8c765..4a2b8c1bf 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -32,11 +32,20 @@
 #include <ctype.h>
 #include <assert.h>
 
+#if !defined(__func__) && defined(__FUNCTION__)
+#define __func__ __FUNCTION__
+#endif
+
 // dbus proxy path used by firejail and firemon
 #define XDG_DBUS_PROXY_PATH "/usr/bin/xdg-dbus-proxy"
 
-
-#define errExit(msg)    do { char msgout[500]; snprintf(msgout, 500, "Error %s: %s:%d %s", msg, __FILE__, __LINE__, __FUNCTION__); perror(msgout); exit(1);} while (0)
+#define errExit(msg) do { \
+        char msgout[500]; \
+        snprintf(msgout, 500, "Error %s/%s:%d %s(): %s", \
+                 MOD_DIR, __FILE__, __LINE__, __func__, msg); \
+        perror(msgout); \
+        exit(1); \
+} while (0)
 
 // macro to print ip addresses in a printf statement
 #define PRINT_IP(A) \