projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 f2a31dfa1389bf5c176b3b9645be2c4600452d43..9c9d2a7b15c0b39a5c1b64e4c4dd153d56817278 100644
(file)
--- a/
src/common/error.h
+++ b/
src/common/error.h
@@
-57,13
+57,13
@@
extern int lttng_opt_verbose;
extern int lttng_opt_mi;
/* Error type. */
extern int lttng_opt_mi;
/* Error type. */
-#define PRINT_ERR
0x1
-#define PRINT_WARN
0x2
-#define PRINT_BUG
0x3
-#define PRINT_MSG
0x4
-#define PRINT_DBG
0x10
-#define PRINT_DBG2
0x20
-#define PRINT_DBG3
0x30
+#define PRINT_ERR
(1 << 0)
+#define PRINT_WARN
(1 << 1)
+#define PRINT_BUG
(1 << 2)
+#define PRINT_MSG
(1 << 3)
+#define PRINT_DBG
(1 << 4)
+#define PRINT_DBG2
(1 << 5)
+#define PRINT_DBG3
(1 << 6)
/*
* Macro for printing message depending on command line option and verbosity.
/*
* Macro for printing message depending on command line option and verbosity.
@@
-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)
This page took
0.025874 seconds
and
4
git commands to generate.