From c354105d3578e3dd1ec825a57005fe60c095f7cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 18 Nov 2008 12:26:26 +0100 Subject: src: reuse the global modprobe_program variable Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy --- ip6tables-restore.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ip6tables-restore.c') diff --git a/ip6tables-restore.c b/ip6tables-restore.c index 0daae5f0..01bccf77 100644 --- a/ip6tables-restore.c +++ b/ip6tables-restore.c @@ -56,8 +56,7 @@ static void print_usage(const char *name, const char *version) exit(1); } -static struct ip6tc_handle *create_handle(const char *tablename, - const char *modprobe) +static struct ip6tc_handle *create_handle(const char *tablename) { struct ip6tc_handle *handle; @@ -65,7 +64,7 @@ static struct ip6tc_handle *create_handle(const char *tablename, if (!handle) { /* try to insmod the module if iptc_init failed */ - load_xtables_ko(modprobe, 0); + load_xtables_ko(modprobe_program, 0); handle = ip6tc_init(tablename); } @@ -124,7 +123,6 @@ int main(int argc, char *argv[]) int c; char curtable[IP6T_TABLE_MAXNAMELEN + 1]; FILE *in; - const char *modprobe = NULL; int in_table = 0, testing = 0; program_name = "ip6tables-restore"; @@ -166,7 +164,7 @@ int main(int argc, char *argv[]) noflush = 1; break; case 'M': - modprobe = optarg; + modprobe_program = optarg; break; } } @@ -225,7 +223,7 @@ int main(int argc, char *argv[]) if (handle) ip6tc_free(handle); - handle = create_handle(table, modprobe); + handle = create_handle(table); if (noflush == 0) { DEBUGP("Cleaning all chains of table '%s'\n", table); -- cgit v1.2.3