From cfa26bf15029fcb00666456faa10d3f6ab6940d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 15 Feb 2017 21:39:34 +0100 Subject: vis: use single function call to print version information This results in a slightly smaller binary while still avoiding #ifdefs. Close #494 --- main.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/main.c b/main.c index e5940c5..19d5b91 100644 --- a/main.c +++ b/main.c @@ -2240,18 +2240,12 @@ int main(int argc, char *argv[]) { } else if (strcmp(argv[i], "--") == 0) { break; } else if (strcmp(argv[i], "-v") == 0) { - fputs("vis " VERSION, stdout); - if (CONFIG_LUA) - fputs(" +lua", stdout); - if (CONFIG_LPEG) - fputs(" +lpeg", stdout); - if (CONFIG_TRE) - fputs(" +tre", stdout); - if (CONFIG_ACL) - fputs(" +acl", stdout); - if (CONFIG_SELINUX) - fputs(" +selinux", stdout); - fputs("\n", stdout); + printf("vis %s%s%s%s%s%s\n", VERSION, + CONFIG_LUA ? " +lua" : "", + CONFIG_LPEG ? " +lpeg" : "", + CONFIG_TRE ? " +tre" : "", + CONFIG_ACL ? " +acl" : "", + CONFIG_SELINUX ? " +selinux" : ""); return 0; } else { fprintf(stderr, "Unknown command option: %s\n", argv[i]); -- cgit v1.2.3