X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=e71fc3d3e87a861dea907b58bd85ad0994bdee6a;hb=221502324338a11028434e776230ea313522082f;hp=1ae1c8d3e5a7c6bb591a10612b01ed8256927875;hpb=beeba745e560344f29d589d8f27f872b320fd1df;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index 1ae1c8d3e..e71fc3d3e 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -68,22 +68,22 @@ extern int lttng_opt_mi;
  * want any nested msg to show up when printing mi to stdout(if it's the case).
  * All warnings and errors should be printed to stderr as normal.
  */
-#define __lttng_print(type, fmt, args...)                           \
-	do {                                                            \
-		if (lttng_opt_quiet == 0 && lttng_opt_mi == 0 &&            \
-				type == PRINT_MSG) {                                \
-			fprintf(stdout, fmt, ## args);                          \
-		} else if (lttng_opt_quiet == 0 && lttng_opt_mi == 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 | PRINT_ERR | PRINT_BUG))) {    \
-			fprintf(stderr, fmt, ## args);                          \
-		}                                                           \
+#define __lttng_print(type, fmt, args...)                                          \
+	do {                                                                       \
+		if (!lttng_opt_quiet && !lttng_opt_mi &&                           \
+				(type) == PRINT_MSG) {                             \
+			fprintf(stdout, fmt, ## args);                             \
+		} else if (!lttng_opt_quiet && !lttng_opt_mi &&                    \
+				((((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 &&                                     \
+				((type) & (PRINT_WARN | PRINT_ERR | PRINT_BUG))) { \
+			fprintf(stderr, fmt, ## args);                             \
+		}                                                                  \
 	} while (0);
 
 /* Three level of debug. Use -v, -vv or -vvv for the levels */