X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39f8af06615c92f5dbfd2dd4695e7f9ffca59e70..4b90ce2abff77ca7898fd9292a122440df739916:/src/xbt/xbt_log_layout_format.cpp diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp index e07eca46dd..9a0e7fe72f 100644 --- a/src/xbt/xbt_log_layout_format.cpp +++ b/src/xbt/xbt_log_layout_format.cpp @@ -30,18 +30,19 @@ static constexpr const char* ERRMSG = } else \ return 0 -#define set_sz_from_precision() \ - if (1) { \ - sz = rem_size; \ - if (precision != -1) { \ - if (precision < sz) \ - sz = precision + 1; /* +1 for the final '\0' */ \ - precision = -1; \ - } \ - } else (void)0 +#define set_sz_from_precision() \ + if (true) { \ + sz = rem_size; \ + if (precision != -1) { \ + if (precision < sz) \ + sz = precision + 1; /* +1 for the final '\0' */ \ + precision = -1; \ + } \ + } else \ + (void)0 #define show_it(data, letter) \ - if (1) { \ + if (true) { \ int len; \ int wd; \ if (length == -1) { \ @@ -58,13 +59,14 @@ static constexpr const char* ERRMSG = } \ check_overflow(len); \ } else \ - (void)0 + (void)0 -#define show_string(data) \ - if (1) { \ - const char *show_string_data = (data); \ - show_it(show_string_data ? show_string_data : "(null)", "s"); \ - } else (void)0 +#define show_string(data) \ + if (true) { \ + const char* show_string_data = (data); \ + show_it(show_string_data ? show_string_data : "(null)", "s"); \ + } else \ + (void)0 #define show_int(data) show_it((data), "d") #define show_double(data) show_it((data), "f") @@ -165,7 +167,7 @@ static int xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_event xbt_abort(); } break; /* done, continue normally */ - } while (1); + } while (true); } else { *p = *q; check_overflow(1);