X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=93c947c0d92ce79cf88b6aa7952762b2e35ff85f;hb=481d6c57872d621707cf7055432e84a1f54e137b;hp=2ce6f57c287e4991ad28d284a861ca440569561e;hpb=db7586006bc1a2b9057a2c108bf1e7d20fd6903f;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index 2ce6f57c2..93c947c0d 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -20,6 +20,11 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
+
+#ifndef _GNU_SOURCE
+#error "lttng-tools error.h needs _GNU_SOURCE"
+#endif
 
 /* Stringify the expansion of a define */
 #define XSTR(d) STR(d)
@@ -39,21 +44,22 @@ extern int opt_verbose;
 /*
  * Macro for printing message depending on command line option and verbosity.
  */
-#define __lttng_print(type, fmt, args...)                                 \
-	do {                                                                  \
-		if (opt_quiet == 0) {                                             \
-			if (type == PRINT_MSG) {                                      \
-				fprintf(stdout, fmt, ## args);                            \
-			} else if (((type & PRINT_DBG) && opt_verbose == 1) ||        \
-					((type & (PRINT_DBG | PRINT_DBG2)) &&                 \
-						opt_verbose == 2) ||                              \
-					((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) &&    \
-						opt_verbose == 3)) {                              \
-				fprintf(stderr, fmt, ## args);                            \
-			} else if (type & (PRINT_ERR | PRINT_WARN | PRINT_BUG)) {     \
-				fprintf(stderr, fmt, ## args);                            \
-			}                                                             \
-		}                                                                 \
+#define __lttng_print(type, fmt, args...)					\
+	do {									\
+		if (opt_quiet == 0 && type == PRINT_MSG) {			\
+			fprintf(stdout, fmt, ## args);				\
+		} else if (opt_quiet == 0 &&					\
+				(((type & PRINT_DBG) && opt_verbose == 1) ||	\
+				((type & (PRINT_DBG | PRINT_DBG2)) &&		\
+					opt_verbose == 2) ||			\
+				((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) &&	\
+					opt_verbose == 3))) {			\
+			fprintf(stderr, fmt, ## args);				\
+		} else if (opt_quiet == 0 && (type & (PRINT_WARN))) {		\
+			fprintf(stderr, fmt, ## args);				\
+		} else if (type & (PRINT_ERR | PRINT_BUG)) {			\
+			fprintf(stderr, fmt, ## args);				\
+		}								\
 	} while (0);
 
 #define MSG(fmt, args...) \
@@ -74,10 +80,11 @@ extern int opt_verbose;
 		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
 
 #define _PERROR(fmt, args...) \
-	__lttng_print(PRINT_ERR, "perror " fmt "\n", ## args)
+	__lttng_print(PRINT_ERR, "PERROR: " fmt \
+		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
 
 #define PERROR(call, args...) \
-    do { \
+	do { \
 		char *buf; \
 		char tmp[200]; \
 		buf = strerror_r(errno, tmp, sizeof(tmp)); \