summaryrefslogtreecommitdiffstats
path: root/xtables.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-01-27 15:10:05 +0100
committerJan Engelhardt <jengelh@medozas.de>2009-01-27 23:14:29 +0100
commitc021c3ce7b1583eb5dd71b10ac3d8ab3cd36beaa (patch)
treea2fad6766de8283406b42764a2be671f8850cd78 /xtables.c
parent630ef48037f3602333addfdb53789c9c6a4bb4c8 (diff)
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 <jengelh@medozas.de>
Diffstat (limited to 'xtables.c')
-rw-r--r--xtables.c10
1 files changed, 5 insertions, 5 deletions
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;