[netfilter-cvslog] r4545 - trunk/iptables/extensions

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2005-11-18 19:00:25 +0100 (Fri, 18 Nov 2005)
New Revision: 4545

Modified:
   trunk/iptables/extensions/libipt_CLASSIFY.c
   trunk/iptables/extensions/libipt_CLUSTERIP.c
   trunk/iptables/extensions/libipt_string.c
   trunk/iptables/extensions/libipt_tos.c
Log:
Fix some gcc-4 warnings


Modified: trunk/iptables/extensions/libipt_CLASSIFY.c
===================================================================
--- trunk/iptables/extensions/libipt_CLASSIFY.c	2005-11-18 17:59:56 UTC (rev 4544)
+++ trunk/iptables/extensions/libipt_CLASSIFY.c	2005-11-18 18:00:25 UTC (rev 4545)
@@ -32,7 +32,7 @@
 {
 }
 
-int string_to_priority(const unsigned char *s, unsigned int *p)
+int string_to_priority(const char *s, unsigned int *p)
 {
 	unsigned int i, j;
 

Modified: trunk/iptables/extensions/libipt_CLUSTERIP.c
===================================================================
--- trunk/iptables/extensions/libipt_CLUSTERIP.c	2005-11-18 17:59:56 UTC (rev 4544)
+++ trunk/iptables/extensions/libipt_CLUSTERIP.c	2005-11-18 18:00:25 UTC (rev 4545)
@@ -120,7 +120,7 @@
 			exit_error(PARAMETER_PROBLEM, "Can only specify MAC combined with `--new'\n");
 		if (*flags & PARAM_MAC)
 			exit_error(PARAMETER_PROBLEM, "Can only specify MAC once\n");
-		parse_mac(optarg, cipinfo->clustermac);
+		parse_mac(optarg, (char *)cipinfo->clustermac);
 		if (!(cipinfo->clustermac[0] & 0x01))
 			exit_error(PARAMETER_PROBLEM, "MAC has to be a multicast ethernet address\n");
 		*flags |= PARAM_MAC;
@@ -169,7 +169,7 @@
 	if (flags == 0)
 		return;
 
-	if (flags & (PARAM_NEW|PARAM_HMODE|PARAM_MAC|PARAM_TOTALNODE|PARAM_LOCALNODE)
+	if ((flags & (PARAM_NEW|PARAM_HMODE|PARAM_MAC|PARAM_TOTALNODE|PARAM_LOCALNODE))
 		== (PARAM_NEW|PARAM_HMODE|PARAM_MAC|PARAM_TOTALNODE|PARAM_LOCALNODE))
 		return;
 

Modified: trunk/iptables/extensions/libipt_string.c
===================================================================
--- trunk/iptables/extensions/libipt_string.c	2005-11-18 17:59:56 UTC (rev 4544)
+++ trunk/iptables/extensions/libipt_string.c	2005-11-18 18:00:25 UTC (rev 4545)
@@ -63,7 +63,7 @@
 }
 
 static void
-parse_string(const unsigned char *s, struct ipt_string_info *info)
+parse_string(const char *s, struct ipt_string_info *info)
 {	
 	if (strlen(s) <= IPT_STRING_MAX_PATTERN_SIZE) {
 		strncpy(info->pattern, s, IPT_STRING_MAX_PATTERN_SIZE);
@@ -74,7 +74,7 @@
 }
 
 static void
-parse_algo(const unsigned char *s, struct ipt_string_info *info)
+parse_algo(const char *s, struct ipt_string_info *info)
 {
 	if (strlen(s) <= IPT_STRING_MAX_ALGO_NAME_SIZE) {
 		strncpy(info->algo, s, IPT_STRING_MAX_ALGO_NAME_SIZE);
@@ -84,7 +84,7 @@
 }
 
 static void
-parse_hex_string(const unsigned char *s, struct ipt_string_info *info)
+parse_hex_string(const char *s, struct ipt_string_info *info)
 {
 	int i=0, slen, sindex=0, schar;
 	short hex_f = 0, literal_f = 0;

Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c	2005-11-18 17:59:56 UTC (rev 4544)
+++ trunk/iptables/extensions/libipt_tos.c	2005-11-18 18:00:25 UTC (rev 4545)
@@ -51,7 +51,7 @@
 parse_tos(const char *s, struct ipt_tos_info *info)
 {
 	unsigned int i;
-	int tos;
+	unsigned int tos;
 
 	if (string_to_number(s, 0, 255, &tos) != -1) {
 		if (tos == IPTOS_LOWDELAY