X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=93c947c0d92ce79cf88b6aa7952762b2e35ff85f;hb=531d29f9e514ad5a4880600d5c7e373f2f254ead;hp=14b5e7c67ea1eda8f519f2cfe42a48cd32a3a7ca;hpb=e672cc585c3d67ee80278e29b538a3aed65df825;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index 14b5e7c67..93c947c0d 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -22,6 +22,10 @@
 #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)
 #define STR(s) #s
@@ -40,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...) \
@@ -75,22 +80,9 @@ 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__)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
-/*
- * Version using XSI strerror_r.
- */
-#define PERROR(call, args...) \
-	do { \
-		char buf[200]; \
-		strerror_r(errno, buf, sizeof(buf)); \
-		_PERROR(call ": %s", ## args, buf); \
-	} while(0);
-#else
-/*
- * Version using GNU strerror_r, for linux with appropriate defines.
- */
 #define PERROR(call, args...) \
 	do { \
 		char *buf; \
@@ -98,6 +90,5 @@ extern int opt_verbose;
 		buf = strerror_r(errno, tmp, sizeof(tmp)); \
 		_PERROR(call ": %s", ## args, buf); \
 	} while(0);
-#endif
 
 #endif /* _ERROR_H */