From c021c3ce7b1583eb5dd71b10ac3d8ab3cd36beaa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 15:10:05 +0100 Subject: libxtables: prefix/order - modprobe and xtables.ko loading This change affects: load_xtables_ko -> xtables_load_ko modprobe_program -> xtables_modprobe_program Now uses bool for the "quiet" flag. Signed-off-by: Jan Engelhardt --- xtables.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xtables.c') diff --git a/xtables.c b/xtables.c index 564b27e9..c9721b63 100644 --- a/xtables.c +++ b/xtables.c @@ -47,7 +47,7 @@ char *lib_dir; /* the path to command to load kernel module */ -const char *modprobe_program = NULL; +const char *xtables_modprobe_program; /* Keeping track of external matches and targets: linked lists. */ struct xtables_match *xtables_matches; @@ -108,7 +108,7 @@ static char *get_modprobe(void) return NULL; } -int xtables_insmod(const char *modname, const char *modprobe, int quiet) +int xtables_insmod(const char *modname, const char *modprobe, bool quiet) { char *buf = NULL; char *argv[4]; @@ -150,9 +150,9 @@ int xtables_insmod(const char *modname, const char *modprobe, int quiet) return -1; } -int load_xtables_ko(const char *modprobe, int quiet) +int xtables_load_ko(const char *modprobe, bool quiet) { - static int loaded = 0; + static bool loaded = false; static int ret = -1; if (!loaded) { @@ -502,7 +502,7 @@ static int compatible_revision(const char *name, u_int8_t revision, int opt) exit(1); } - load_xtables_ko(modprobe_program, 1); + xtables_load_ko(xtables_modprobe_program, true); strcpy(rev.name, name); rev.revision = revision; -- cgit v1.2.3