[netfilter-cvslog] r4136 - in trunk/iptables: . extensions libipq
libiptc
laforge at netfilter.org
laforge at netfilter.org
Wed Jul 20 00:03:58 CEST 2005
Author: laforge at netfilter.org
Date: 2005-07-20 00:03:49 +0200 (Wed, 20 Jul 2005)
New Revision: 4136
Modified:
trunk/iptables/extensions/libip6t_length.c
trunk/iptables/extensions/libip6t_physdev.c
trunk/iptables/extensions/libipt_DSCP.c
trunk/iptables/extensions/libipt_TOS.c
trunk/iptables/extensions/libipt_comment.c
trunk/iptables/extensions/libipt_dscp.c
trunk/iptables/extensions/libipt_physdev.c
trunk/iptables/extensions/libipt_rpc.c
trunk/iptables/extensions/libipt_tos.c
trunk/iptables/extensions/libipt_ttl.c
trunk/iptables/ip6tables.c
trunk/iptables/iptables.c
trunk/iptables/libipq/libipq.c
trunk/iptables/libiptc/libiptc.c
Log:
get rid of numerous gcc-4 warnings
Modified: trunk/iptables/extensions/libip6t_length.c
===================================================================
--- trunk/iptables/extensions/libip6t_length.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libip6t_length.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -30,7 +30,7 @@
parse_length(const char *s)
{
- int len;
+ unsigned int len;
if (string_to_number(s, 0, 0xFFFF, &len) == -1)
exit_error(PARAMETER_PROBLEM, "length invalid: `%s'\n", s);
Modified: trunk/iptables/extensions/libip6t_physdev.c
===================================================================
--- trunk/iptables/extensions/libip6t_physdev.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libip6t_physdev.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -53,7 +53,8 @@
if (*flags & IP6T_PHYSDEV_OP_IN)
goto multiple_use;
check_inverse(optarg, &invert, &optind, 0);
- parse_interface(argv[optind-1], info->physindev, info->in_mask);
+ parse_interface(argv[optind-1], info->physindev,
+ (unsigned char *)info->in_mask);
if (invert)
info->invert |= IP6T_PHYSDEV_OP_IN;
info->bitmask |= IP6T_PHYSDEV_OP_IN;
@@ -65,7 +66,7 @@
goto multiple_use;
check_inverse(optarg, &invert, &optind, 0);
parse_interface(argv[optind-1], info->physoutdev,
- info->out_mask);
+ (unsigned char *)info->out_mask);
if (invert)
info->invert |= IP6T_PHYSDEV_OP_OUT;
info->bitmask |= IP6T_PHYSDEV_OP_OUT;
Modified: trunk/iptables/extensions/libipt_DSCP.c
===================================================================
--- trunk/iptables/extensions/libipt_DSCP.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_DSCP.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -49,7 +49,7 @@
};
static void
-parse_dscp(const unsigned char *s, struct ipt_DSCP_info *dinfo)
+parse_dscp(const char *s, struct ipt_DSCP_info *dinfo)
{
unsigned int dscp;
@@ -67,7 +67,7 @@
static void
-parse_class(const unsigned char *s, struct ipt_DSCP_info *dinfo)
+parse_class(const char *s, struct ipt_DSCP_info *dinfo)
{
unsigned int dscp = class_to_dscp(s);
Modified: trunk/iptables/extensions/libipt_TOS.c
===================================================================
--- trunk/iptables/extensions/libipt_TOS.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_TOS.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -59,7 +59,7 @@
}
static void
-parse_tos(const unsigned char *s, struct ipt_tos_target_info *info)
+parse_tos(const char *s, struct ipt_tos_target_info *info)
{
unsigned int i, tos;
Modified: trunk/iptables/extensions/libipt_comment.c
===================================================================
--- trunk/iptables/extensions/libipt_comment.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_comment.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -30,7 +30,7 @@
};
static void
-parse_comment(const unsigned char *s, struct ipt_comment_info *info)
+parse_comment(const char *s, struct ipt_comment_info *info)
{
int slen = strlen(s);
@@ -38,7 +38,7 @@
exit_error(PARAMETER_PROBLEM,
"COMMENT must be shorter than %i characters", IPT_MAX_COMMENT_LEN);
}
- strcpy(info->comment, s);
+ strcpy((char *)info->comment, s);
}
/* Function which parses command options; returns true if it
Modified: trunk/iptables/extensions/libipt_dscp.c
===================================================================
--- trunk/iptables/extensions/libipt_dscp.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_dscp.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -46,7 +46,7 @@
};
static void
-parse_dscp(const unsigned char *s, struct ipt_dscp_info *dinfo)
+parse_dscp(const char *s, struct ipt_dscp_info *dinfo)
{
unsigned int dscp;
Modified: trunk/iptables/extensions/libipt_physdev.c
===================================================================
--- trunk/iptables/extensions/libipt_physdev.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_physdev.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -53,7 +53,8 @@
if (*flags & IPT_PHYSDEV_OP_IN)
goto multiple_use;
check_inverse(optarg, &invert, &optind, 0);
- parse_interface(argv[optind-1], info->physindev, info->in_mask);
+ parse_interface(argv[optind-1], info->physindev,
+ (unsigned char *)info->in_mask);
if (invert)
info->invert |= IPT_PHYSDEV_OP_IN;
info->bitmask |= IPT_PHYSDEV_OP_IN;
@@ -65,7 +66,7 @@
goto multiple_use;
check_inverse(optarg, &invert, &optind, 0);
parse_interface(argv[optind-1], info->physoutdev,
- info->out_mask);
+ (unsigned char *)info->out_mask);
if (invert)
info->invert |= IPT_PHYSDEV_OP_OUT;
info->bitmask |= IPT_PHYSDEV_OP_OUT;
Modified: trunk/iptables/extensions/libipt_rpc.c
===================================================================
--- trunk/iptables/extensions/libipt_rpc.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_rpc.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -89,7 +89,7 @@
}
-static int k_atoi(signed char *string)
+static int k_atoi(char *string)
{
unsigned int result = 0;
int maxoctet = IPT_RPC_CHAR_LEN;
Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_tos.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -48,10 +48,10 @@
};
static void
-parse_tos(const unsigned char *s, struct ipt_tos_info *info)
+parse_tos(const char *s, struct ipt_tos_info *info)
{
unsigned int i;
- unsigned int tos;
+ int tos;
if (string_to_number(s, 0, 255, &tos) != -1) {
if (tos == IPTOS_LOWDELAY
Modified: trunk/iptables/extensions/libipt_ttl.c
===================================================================
--- trunk/iptables/extensions/libipt_ttl.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/extensions/libipt_ttl.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -29,7 +29,7 @@
struct ipt_entry_match **match)
{
struct ipt_ttl_info *info = (struct ipt_ttl_info *) (*match)->data;
- int value;
+ unsigned int value;
check_inverse(optarg, &invert, &optind, 0);
Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/ip6tables.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -430,7 +430,8 @@
}
static void
-add_command(int *cmd, const int newcmd, const int othercmds, int invert)
+add_command(unsigned int *cmd, const int newcmd, const int othercmds,
+ int invert)
{
if (invert)
exit_error(PARAMETER_PROBLEM, "unexpected ! flag");
Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/iptables.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -484,7 +484,8 @@
}
static void
-add_command(int *cmd, const int newcmd, const int othercmds, int invert)
+add_command(unsigned int *cmd, const int newcmd, const int othercmds,
+ int invert)
{
if (invert)
exit_error(PARAMETER_PROBLEM, "unexpected ! flag");
Modified: trunk/iptables/libipq/libipq.c
===================================================================
--- trunk/iptables/libipq/libipq.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/libipq/libipq.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -122,7 +122,8 @@
unsigned char *buf, size_t len,
int timeout)
{
- int addrlen, status;
+ unsigned int addrlen;
+ int status;
struct nlmsghdr *nlh;
if (len < sizeof(struct nlmsgerr)) {
Modified: trunk/iptables/libiptc/libiptc.c
===================================================================
--- trunk/iptables/libiptc/libiptc.c 2005-07-19 21:44:58 UTC (rev 4135)
+++ trunk/iptables/libiptc/libiptc.c 2005-07-19 22:03:49 UTC (rev 4136)
@@ -674,7 +674,7 @@
/* calculate offset and number for every rule in the cache */
static int iptcc_compile_chain_offsets(TC_HANDLE_T h, struct chain_head *c,
- int *offset, int *num)
+ unsigned int *offset, unsigned int *num)
{
struct rule_head *r;
@@ -798,7 +798,7 @@
{
TC_HANDLE_T h;
STRUCT_GETINFO info;
- int tmp;
+ unsigned int tmp;
socklen_t s;
iptc_fn = TC_INIT;
More information about the netfilter-cvslog
mailing list