[netfilter-cvslog] r6775 - in trunk/iptables: . include

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2007-03-20 16:51:41 +0100 (Tue, 20 Mar 2007)
New Revision: 6775

Modified:
   trunk/iptables/include/ip6tables.h
   trunk/iptables/include/iptables_common.h
   trunk/iptables/ip6tables.c
   trunk/iptables/iptables.c
Log:
Fixes typos in the argument of ip[6]tables_insmod: quit -> quiet



Modified: trunk/iptables/include/ip6tables.h
===================================================================
--- trunk/iptables/include/ip6tables.h	2007-03-17 11:52:57 UTC (rev 6774)
+++ trunk/iptables/include/ip6tables.h	2007-03-20 15:51:41 UTC (rev 6775)
@@ -174,7 +174,8 @@
 extern int for_each_chain(int (*fn)(const ip6t_chainlabel, int, ip6tc_handle_t *), int verbose, int builtinstoo, ip6tc_handle_t *handle);
 extern int flush_entries(const ip6t_chainlabel chain, int verbose, ip6tc_handle_t *handle);
 extern int delete_chain(const ip6t_chainlabel chain, int verbose, ip6tc_handle_t *handle);
-extern int ip6tables_insmod(const char *modname, const char *modprobe, int quit);
-extern int load_ip6tables_ko(const char *modprobe, int quit);
+extern int
+ip6tables_insmod(const char *modname, const char *modprobe, int quiet);
+extern int load_ip6tables_ko(const char *modprobe, int quiet);
 
 #endif /*_IP6TABLES_USER_H*/

Modified: trunk/iptables/include/iptables_common.h
===================================================================
--- trunk/iptables/include/iptables_common.h	2007-03-17 11:52:57 UTC (rev 6774)
+++ trunk/iptables/include/iptables_common.h	2007-03-20 15:51:41 UTC (rev 6775)
@@ -27,8 +27,9 @@
 			    unsigned long long int, 
 			    unsigned long long int,
 			    unsigned long long *);
-extern int iptables_insmod(const char *modname, const char *modprobe, int quit);
-extern int load_iptables_ko(const char *modprobe, int quit);
+extern int
+iptables_insmod(const char *modname, const char *modprobe, int quiet);
+extern int load_iptables_ko(const char *modprobe, int quiet);
 void exit_error(enum exittype, char *, ...)__attribute__((noreturn,
 							  format(printf,2,3)));
 extern const char *program_name, *program_version;

Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2007-03-17 11:52:57 UTC (rev 6774)
+++ trunk/iptables/ip6tables.c	2007-03-20 15:51:41 UTC (rev 6775)
@@ -1751,7 +1751,7 @@
 	return NULL;
 }
 
-int ip6tables_insmod(const char *modname, const char *modprobe, int quit)
+int ip6tables_insmod(const char *modname, const char *modprobe, int quiet)
 {
 	char *buf = NULL;
 	char *argv[4];
@@ -1769,7 +1769,7 @@
 	case 0:
 		argv[0] = (char *)modprobe;
 		argv[1] = (char *)modname;
-		if (quit) {
+		if (quiet) {
 			argv[2] = "-q";
 			argv[3] = NULL;
 		} else {
@@ -1793,13 +1793,13 @@
 	return -1;
 }
 
-int load_ip6tables_ko(const char *modprobe, int quit)
+int load_ip6tables_ko(const char *modprobe, int quiet)
 {
 	static int loaded = 0;
 	static int ret = -1;
 
 	if (!loaded) {
-		ret = ip6tables_insmod("ip6_tables", modprobe, quit);
+		ret = ip6tables_insmod("ip6_tables", modprobe, quiet);
 		loaded = (ret == 0);
 	}
 

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2007-03-17 11:52:57 UTC (rev 6774)
+++ trunk/iptables/iptables.c	2007-03-20 15:51:41 UTC (rev 6775)
@@ -1813,7 +1813,7 @@
 	return NULL;
 }
 
-int iptables_insmod(const char *modname, const char *modprobe, int quit)
+int iptables_insmod(const char *modname, const char *modprobe, int quiet)
 {
 	char *buf = NULL;
 	char *argv[4];
@@ -1831,7 +1831,7 @@
 	case 0:
 		argv[0] = (char *)modprobe;
 		argv[1] = (char *)modname;
-		if (quit) {
+		if (quiet) {
 			argv[2] = "-q";
 			argv[3] = NULL;
 		} else {
@@ -1855,13 +1855,13 @@
 	return -1;
 }
 
-int load_iptables_ko(const char *modprobe, int quit)
+int load_iptables_ko(const char *modprobe, int quiet)
 {
 	static int loaded = 0;
 	static int ret = -1;
 
 	if (!loaded) {
-		ret = iptables_insmod("ip_tables", NULL, quit);
+		ret = iptables_insmod("ip_tables", NULL, quiet);
 		loaded = (ret == 0);
 	}