Fix: WARN() should print as WARN level, not ERR

[lttng-tools.git] / src / common / error.h

diff --git a/src/common/error.h b/src/common/error.h
index 3ab1d46e7126ebee9e358b6c30544919e2fe4132..9c9d2a7b15c0b39a5c1b64e4c4dd153d56817278 100644 (file)
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -75,18 +75,18 @@ extern int lttng_opt_mi;
  */
 #define __lttng_print(type, fmt, args...)                                          \
        do {                                                                       \
  */
 #define __lttng_print(type, fmt, args...)                                          \
        do {                                                                       \

-               if (!lttng_opt_quiet&& !lttng_opt_mi &&                            \
-                               type == PRINT_MSG) {                               \
+               if (!lttng_opt_quiet && !lttng_opt_mi &&                           \
+                               (type) == PRINT_MSG) {                             \

                        fprintf(stdout, fmt, ## args);                             \
                } else if (!lttng_opt_quiet && !lttng_opt_mi &&                    \
                        fprintf(stdout, fmt, ## args);                             \
                } else if (!lttng_opt_quiet && !lttng_opt_mi &&                    \

-                               (((type & PRINT_DBG) && lttng_opt_verbose == 1) || \
-                               ((type & (PRINT_DBG | PRINT_DBG2)) &&              \
+                               ((((type) & PRINT_DBG) && lttng_opt_verbose == 1) || \
+                               (((type) & (PRINT_DBG | PRINT_DBG2)) &&            \

                                        lttng_opt_verbose == 2) ||                 \
                                        lttng_opt_verbose == 2) ||                 \

-                               ((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) && \
+                               (((type) & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) && \

                                        lttng_opt_verbose == 3))) {                \
                        fprintf(stderr, fmt, ## args);                             \
                } else if (!lttng_opt_quiet &&                                     \
                                        lttng_opt_verbose == 3))) {                \
                        fprintf(stderr, fmt, ## args);                             \
                } else if (!lttng_opt_quiet &&                                     \

-                               (type & (PRINT_WARN | PRINT_ERR | PRINT_BUG))) {   \
+                               ((type) & (PRINT_WARN | PRINT_ERR | PRINT_BUG))) { \

                        fprintf(stderr, fmt, ## args);                             \
                }                                                                  \
        } while (0);
                        fprintf(stderr, fmt, ## args);                             \
                }                                                                  \
        } while (0);


@@ -103,7 +103,7 @@ extern int lttng_opt_mi;
 #define ERR(fmt, args...) \
        __lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) \
 #define ERR(fmt, args...) \
        __lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) \

-       __lttng_print(PRINT_ERR, "Warning: " fmt "\n", ## args)
+       __lttng_print(PRINT_WARN, "Warning: " fmt "\n", ## args)

 
 #define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
 
 
 #define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)