diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2009-02-13 10:42:24 -0500 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-02-13 17:10:18 +0100 |
| commit | 5dd19de34380c91ad07bbe79a34726e59891cf54 (patch) | |
| tree | 03561c2d4a42da2ac8bd9d5e7e3625c1eff071ee /ip6tables.c | |
| parent | 7e4db2f50133007f549f222468bde4f3adcf41ac (diff) | |
libxtables: general follow-up cleanup
Kill program_name, program_version and xtables_program_name.
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Diffstat (limited to 'ip6tables.c')
| -rw-r--r-- | ip6tables.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ip6tables.c b/ip6tables.c index dca484f0..06c0a608 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -194,9 +194,8 @@ static int inverse_for_options[NUMBER_OF_OPT] = /* -c */ 0, }; -const char *program_version; -const char *program_name; - +#define prog_name ip6tables_globals.program_name +#define prog_vers ip6tables_globals.program_version /* A few hardcoded protocols for 'all' and in case the user has no /etc/protocols */ struct pprot { @@ -228,7 +227,7 @@ exit_tryhelp(int status) if (line != -1) fprintf(stderr, "Error occurred at line: %d\n", line); fprintf(stderr, "Try `%s -h' or '%s --help' for more information.\n", - program_name, program_name ); + prog_name, prog_name); xtables_free_opts(1); exit(status); } @@ -249,9 +248,9 @@ exit_printhelp(struct xtables_rule_match *matches) " %s -E old-chain-name new-chain-name\n" " %s -P chain target [options]\n" " %s -h (print this help information)\n\n", - program_name, program_version, program_name, program_name, - program_name, program_name, program_name, program_name, - program_name, program_name, program_name); + prog_name, prog_vers, prog_name, prog_name, + prog_name, prog_name, prog_name, prog_name, + prog_name, prog_name, prog_name); printf( "Commands:\n" @@ -329,7 +328,7 @@ ip6tables_exit_error(enum xtables_exittype status, const char *msg, ...) va_list args; va_start(args, msg); - fprintf(stderr, "%s v%s: ", program_name, program_version); + fprintf(stderr, "%s v%s: ", prog_name, prog_vers); vfprintf(stderr, msg, args); va_end(args); fprintf(stderr, "\n"); @@ -1629,10 +1628,10 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand case 'V': if (invert) - printf("Not %s ;-)\n", program_version); + printf("Not %s ;-)\n", prog_vers); else printf("%s v%s\n", - program_name, program_version); + prog_name, prog_vers); exit(0); case '0': |