Merged, thanks! Jérémie
On Wed, May 18, 2016 at 2:04 PM, Mathieu Desnoyers <[email protected]> wrote: > Signed-off-by: Mathieu Desnoyers <[email protected]> > --- > src/common/error.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/common/error.h b/src/common/error.h > index 3ab1d46..ca5af86 100644 > --- 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 { > \ > - 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 && > \ > - (((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) || > \ > - ((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 && > \ > - (type & (PRINT_WARN | PRINT_ERR | > PRINT_BUG))) { \ > + ((type) & (PRINT_WARN | PRINT_ERR | > PRINT_BUG))) { \ > fprintf(stderr, fmt, ## args); > \ > } > \ > } while (0); > -- > 2.1.4 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
