Fix: error.h: add missing parenthesis around macro parameter
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 18 May 2016 18:04:15 +0000 (14:04 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 20 May 2016 19:23:21 +0000 (15:23 -0400)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/common/error.h

index ce2e4e66e63138f840f02ef3d9888899bdade107..5632b40e37b89b22bbe319d5192d5b354c6b36e1 100644 (file)
@@ -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 */
This page took 0.026619 seconds and 4 git commands to generate.