From 4624994d43dc4727e42ab30cacfeb4a5b17e3b06 Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Fri, 1 Nov 2019 11:02:28 -0400 Subject: simplify print_id() a bit --- id.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/id.c b/id.c index 60824ce..97bd6f2 100644 --- a/id.c +++ b/id.c @@ -55,19 +55,15 @@ static char *get_name(enum type type, id_t id) static void print_id(const char *prefix, const char *name, id_t id, enum display mode) { printf("%s", prefix); - if (mode == NAMES) { - if (name) { - printf("%s", name); - } else { - printf("%ju", (uintmax_t)id); - } - } else if (mode == NUMBERS) { + if (mode == FULL || mode == NUMBERS || name == NULL) { printf("%ju", (uintmax_t)id); - } else { - if (name) { - printf("%ju(%s)", (uintmax_t)id, name); - } else { - printf("%ju", (uintmax_t)id); + } + + if (name != NULL) { + if (mode == FULL) { + printf("(%s)", name); + } else if (mode == NAMES) { + printf("%s", name); } } } -- cgit v1.2.1