X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=5837d1cc33184b34398f94a29775224e0d38e469;hp=14b5e7c67ea1eda8f519f2cfe42a48cd32a3a7ca;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hpb=1d76b9222464f9e10128ae867cd56a9317da5d65

diff --git a/src/common/error.h b/src/common/error.h
index 14b5e7c67..5837d1cc3 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
- * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _ERROR_H
@@ -22,12 +22,16 @@
 #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
 
-extern int opt_quiet;
-extern int opt_verbose;
+extern int lttng_opt_quiet;
+extern int lttng_opt_verbose;
 
 #define PRINT_ERR   0x1
 #define PRINT_WARN  0x2
@@ -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 (lttng_opt_quiet == 0 && type == PRINT_MSG) {            \
+			fprintf(stdout, fmt, ## args);                          \
+		} else if (lttng_opt_quiet == 0 &&                          \
+				(((type & PRINT_DBG) && lttng_opt_verbose == 1) ||  \
+				((type & (PRINT_DBG | PRINT_DBG2)) &&               \
+					lttng_opt_verbose == 2) ||                      \
+				((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) &&  \
+					lttng_opt_verbose == 3))) {                     \
+			fprintf(stderr, fmt, ## args);                          \
+		} else if (lttng_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,9 +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__)
 
 #if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+
 /*
  * Version using XSI strerror_r.
  */