diff --git a/src/util-multivalue.h b/src/util-multivalue.h index c20b4eaa..87a9bacd 100644 --- a/src/util-multivalue.h +++ b/src/util-multivalue.h @@ -159,7 +159,7 @@ multivalue_as_str(const struct multivalue *v) xasprintf(&str, "%d", v->value.i); break; case 'b': - xasprintf(&str, "%s", v->value.b ? "true" : "false"); + xasprintf(&str, "%s", truefalse(v->value.b)); break; case 'c': xasprintf(&str, "%c", v->value.c); diff --git a/src/util-strings.h b/src/util-strings.h index ee463dc6..306b7db8 100644 --- a/src/util-strings.h +++ b/src/util-strings.h @@ -45,6 +45,11 @@ #include "util-macros.h" +#define yesno(b) ((b) ? "yes" : "no") +#define truefalse(b) ((b) ? "true" : "false") +#define YESNO(b) ((b) ? "YES" : "NO") +#define TRUEFALSE(b) ((b) ? "TRUE" : "FALSE") + static inline bool streq(const char *str1, const char *str2) { diff --git a/test/litest-selftest.c b/test/litest-selftest.c index a788ad7f..243922dc 100644 --- a/test/litest-selftest.c +++ b/test/litest-selftest.c @@ -491,7 +491,7 @@ START_TEST(parameter_permutations) ARRAY_FOR_EACH(permutations, p) { if (p->s == NULL) break; - ck_assert_msg(p->found, "For %d/%s/%s", p->i, p->s, p->b ? "true" : "false"); + ck_assert_msg(p->found, "For %d/%s/%s", p->i, p->s, truefalse(p->b)); } } END_TEST diff --git a/tools/libinput-record.c b/tools/libinput-record.c index 0c1dc9cf..4a9d3010 100644 --- a/tools/libinput-record.c +++ b/tools/libinput-record.c @@ -53,6 +53,7 @@ #include "util-time.h" #include "util-input-event.h" #include "util-macros.h" +#include "util-strings.h" static const int FILE_VERSION_NUMBER = 1; @@ -1067,7 +1068,7 @@ print_tablet_pad_button_event(struct record_device *dev, button, state == LIBINPUT_BUTTON_STATE_PRESSED ? "pressed" : "released", mode, - libinput_tablet_pad_mode_group_button_is_toggle(group, button) ? "true" : "false" + truefalse(libinput_tablet_pad_mode_group_button_is_toggle(group, button)) ); }