From 4bff5aef6e63fb4d403d539f4c9d2d90492120b8 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 26 Nov 2021 16:53:31 +0100 Subject: xtables_globals: Embed variant name in .program_version Both are constant strings, so precompiler may concat them. Signed-off-by: Phil Sutter --- iptables/iptables.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'iptables/iptables.c') diff --git a/iptables/iptables.c b/iptables/iptables.c index 78fff9ef..191877ec 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -88,7 +88,7 @@ void iptables_exit_error(enum xtables_exittype status, const char *msg, ...) __a struct xtables_globals iptables_globals = { .option_offset = 0, - .program_version = PACKAGE_VERSION, + .program_version = PACKAGE_VERSION " (legacy)", .orig_opts = original_opts, .exit_err = iptables_exit_error, .compat_rev = xtables_compatible_revision, @@ -111,7 +111,7 @@ iptables_exit_error(enum xtables_exittype status, const char *msg, ...) va_list args; va_start(args, msg); - fprintf(stderr, "%s v%s (legacy): ", prog_name, prog_vers); + fprintf(stderr, "%s v%s: ", prog_name, prog_vers); vfprintf(stderr, msg, args); va_end(args); fprintf(stderr, "\n"); @@ -1032,7 +1032,7 @@ int do_command4(int argc, char *argv[], char **table, if (invert) printf("Not %s ;-)\n", prog_vers); else - printf("%s v%s (legacy)\n", + printf("%s v%s\n", prog_name, prog_vers); exit(0); -- cgit v1.2.3