[netfilter-cvslog] r4048 - in trunk/patch-o-matic-ng/patchlets/set:
linux/net/ipv4/netfilter linux-2.6/net/ipv4/netfilter
laforge at netfilter.org
laforge at netfilter.org
Mon Jun 27 16:37:44 CEST 2005
Author: laforge at netfilter.org
Date: 2005-06-27 16:37:42 +0200 (Mon, 27 Jun 2005)
New Revision: 4048
Modified:
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipmap.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iptree.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_portmap.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipmap.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iptree.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_macipmap.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c
trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_portmap.c
Log:
use correct format char modifieers to avoid literally hundreds of compiler warnings
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -1384,13 +1384,13 @@
if (optval != SO_IP_SET)
return -EBADF;
if (len <= sizeof(unsigned)) {
- ip_set_printk("short userdata (want >%d, got %d)",
+ ip_set_printk("short userdata (want >%zu, got %u)",
sizeof(unsigned), len);
return -EINVAL;
}
data = vmalloc(len);
if (!data) {
- DP("out of mem for %d bytes", len);
+ DP("out of mem for %u bytes", len);
return -ENOMEM;
}
if (copy_from_user(data, user, len) != 0) {
@@ -1421,7 +1421,7 @@
= (struct ip_set_req_create *) data;
if (len <= sizeof(struct ip_set_req_create)) {
- ip_set_printk("short CREATE data (want >%d, got %d)",
+ ip_set_printk("short CREATE data (want >%zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1440,7 +1440,7 @@
= (struct ip_set_req_std *) data;
if (len != sizeof(struct ip_set_req_std)) {
- ip_set_printk("invalid DESTROY data (want %d, got %d)",
+ ip_set_printk("invalid DESTROY data (want %zu, got %u)",
sizeof(struct ip_set_req_std), len);
res = -EINVAL;
goto done;
@@ -1466,7 +1466,7 @@
(struct ip_set_req_std *) data;
if (len != sizeof(struct ip_set_req_std)) {
- ip_set_printk("invalid FLUSH data (want %d, got %d)",
+ ip_set_printk("invalid FLUSH data (want %zu, got %u)",
sizeof(struct ip_set_req_std), len);
res = -EINVAL;
goto done;
@@ -1491,7 +1491,7 @@
= (struct ip_set_req_create *) data;
if (len != sizeof(struct ip_set_req_create)) {
- ip_set_printk("invalid RENAME data (want %d, got %d)",
+ ip_set_printk("invalid RENAME data (want %zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1514,7 +1514,7 @@
ip_set_id_t to_index;
if (len != sizeof(struct ip_set_req_create)) {
- ip_set_printk("invalid SWAP data (want %d, got %d)",
+ ip_set_printk("invalid SWAP data (want %zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1548,7 +1548,7 @@
adtfn = adtfn_table[*op - IP_SET_OP_ADD_IP].fn;
if (len < sizeof(struct ip_set_req_adt)) {
- ip_set_printk("short data in adt request (want >=%d, got %d)",
+ ip_set_printk("short data in adt request (want >=%zu, got %u)",
sizeof(struct ip_set_req_adt), len);
res = -EINVAL;
goto done;
@@ -1590,7 +1590,7 @@
if (optval != SO_IP_SET)
return -EBADF;
if (*len < sizeof(unsigned)) {
- ip_set_printk("short userdata (want >=%d, got %d)",
+ ip_set_printk("short userdata (want >=%zu, got %d)",
sizeof(unsigned), *len);
return -EINVAL;
}
@@ -1627,7 +1627,7 @@
(struct ip_set_req_version *) data;
if (*len != sizeof(struct ip_set_req_version)) {
- ip_set_printk("invalid VERSION (want %d, got %d)",
+ ip_set_printk("invalid VERSION (want %zu, got %d)",
sizeof(struct ip_set_req_version),
*len);
res = -EINVAL;
@@ -1644,7 +1644,7 @@
= (struct ip_set_req_get_set *) data;
if (*len != sizeof(struct ip_set_req_get_set)) {
- ip_set_printk("invalid GET_BYNAME (want %d, got %d)",
+ ip_set_printk("invalid GET_BYNAME (want %zu, got %d)",
sizeof(struct ip_set_req_get_set), *len);
res = -EINVAL;
goto done;
@@ -1659,7 +1659,7 @@
= (struct ip_set_req_get_set *) data;
if (*len != sizeof(struct ip_set_req_get_set)) {
- ip_set_printk("invalid GET_BYINDEX (want %d, got %d)",
+ ip_set_printk("invalid GET_BYINDEX (want %zu, got %d)",
sizeof(struct ip_set_req_get_set), *len);
res = -EINVAL;
goto done;
@@ -1676,7 +1676,7 @@
= (struct ip_set_req_adt_get *) data;
if (*len != sizeof(struct ip_set_req_adt_get)) {
- ip_set_printk("invalid ADT_GET (want %d, got %d)",
+ ip_set_printk("invalid ADT_GET (want %zu, got %d)",
sizeof(struct ip_set_req_adt_get), *len);
res = -EINVAL;
goto done;
@@ -1700,7 +1700,7 @@
ip_set_id_t i;
if (*len != sizeof(struct ip_set_req_max_sets)) {
- ip_set_printk("invalid MAX_SETS (want %d, got %d)",
+ ip_set_printk("invalid MAX_SETS (want %zu, got %d)",
sizeof(struct ip_set_req_max_sets), *len);
res = -EINVAL;
goto done;
@@ -1735,7 +1735,7 @@
int used;
if (*len < sizeof(struct ip_set_req_setnames)) {
- ip_set_printk("short LIST_SIZE (want >=%d, got %d)",
+ ip_set_printk("short LIST_SIZE (want >=%zu, got %d)",
sizeof(struct ip_set_req_setnames), *len);
res = -EINVAL;
goto done;
@@ -1804,7 +1804,7 @@
int used;
if (*len < sizeof(struct ip_set_req_list)) {
- ip_set_printk("short LIST (want >=%d, got %d)",
+ ip_set_printk("short LIST (want >=%zu, got %d)",
sizeof(struct ip_set_req_list), *len);
res = -EINVAL;
goto done;
@@ -1841,7 +1841,7 @@
int used;
if (*len < sizeof(struct ip_set_req_list)) {
- ip_set_printk("short SAVE (want >=%d, got %d)",
+ ip_set_printk("short SAVE (want >=%zu, got %d)",
sizeof(struct ip_set_req_list), *len);
res = -EINVAL;
goto done;
@@ -1881,7 +1881,7 @@
if (*len < sizeof(struct ip_set_req_setnames)
|| *len != req_restore->size) {
- ip_set_printk("invalid RESTORE (want =%d, got %d)",
+ ip_set_printk("invalid RESTORE (want =%zu, got %d)",
req_restore->size, *len);
res = -EINVAL;
goto done;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -77,7 +77,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -126,7 +126,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -233,7 +233,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -259,7 +259,7 @@
struct ip_set_iphash *map;
if (size != sizeof(struct ip_set_req_iphash_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -50,7 +50,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -102,7 +102,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -145,7 +145,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -171,7 +171,7 @@
struct ip_set_ipmap *map;
if (size != sizeof(struct ip_set_req_ipmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iptree.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iptree.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -72,7 +72,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -149,7 +149,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -210,7 +210,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -312,7 +312,7 @@
struct ip_set_iptree *map;
if (size != sizeof(struct ip_set_req_iptree_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_macipmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_macipmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -34,7 +34,7 @@
struct ip_set_req_macipmap *req = (struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -122,7 +122,7 @@
(struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -173,7 +173,7 @@
(struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -204,7 +204,7 @@
struct ip_set_macipmap *map;
if (size != sizeof(struct ip_set_req_macipmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -99,7 +99,7 @@
(struct ip_set_req_nethash *) data;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -178,7 +178,7 @@
int ret;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -297,7 +297,7 @@
(struct ip_set_req_nethash *) data;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -330,7 +330,7 @@
struct ip_set_nethash *map;
if (size != sizeof(struct ip_set_req_nethash_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_portmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_portmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -80,7 +80,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -127,7 +127,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -170,7 +170,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -198,7 +198,7 @@
struct ip_set_portmap *map;
if (size != sizeof(struct ip_set_req_portmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -1371,13 +1371,13 @@
if (optval != SO_IP_SET)
return -EBADF;
if (len <= sizeof(unsigned)) {
- ip_set_printk("short userdata (want >%d, got %d)",
+ ip_set_printk("short userdata (want >%zu, got %u)",
sizeof(unsigned), len);
return -EINVAL;
}
data = vmalloc(len);
if (!data) {
- DP("out of mem for %d bytes", len);
+ DP("out of mem for %u bytes", len);
return -ENOMEM;
}
if (copy_from_user(data, user, len) != 0) {
@@ -1408,7 +1408,7 @@
= (struct ip_set_req_create *) data;
if (len <= sizeof(struct ip_set_req_create)) {
- ip_set_printk("short CREATE data (want >%d, got %d)",
+ ip_set_printk("short CREATE data (want >%zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1427,7 +1427,7 @@
= (struct ip_set_req_std *) data;
if (len != sizeof(struct ip_set_req_std)) {
- ip_set_printk("invalid DESTROY data (want %d, got %d)",
+ ip_set_printk("invalid DESTROY data (want %zu, got %u)",
sizeof(struct ip_set_req_std), len);
res = -EINVAL;
goto done;
@@ -1453,7 +1453,7 @@
(struct ip_set_req_std *) data;
if (len != sizeof(struct ip_set_req_std)) {
- ip_set_printk("invalid FLUSH data (want %d, got %d)",
+ ip_set_printk("invalid FLUSH data (want %zu, got %u)",
sizeof(struct ip_set_req_std), len);
res = -EINVAL;
goto done;
@@ -1478,7 +1478,7 @@
= (struct ip_set_req_create *) data;
if (len != sizeof(struct ip_set_req_create)) {
- ip_set_printk("invalid RENAME data (want %d, got %d)",
+ ip_set_printk("invalid RENAME data (want %zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1501,7 +1501,7 @@
ip_set_id_t to_index;
if (len != sizeof(struct ip_set_req_create)) {
- ip_set_printk("invalid SWAP data (want %d, got %d)",
+ ip_set_printk("invalid SWAP data (want %zu, got %u)",
sizeof(struct ip_set_req_create), len);
res = -EINVAL;
goto done;
@@ -1535,7 +1535,7 @@
adtfn = adtfn_table[*op - IP_SET_OP_ADD_IP].fn;
if (len < sizeof(struct ip_set_req_adt)) {
- ip_set_printk("short data in adt request (want >=%d, got %d)",
+ ip_set_printk("short data in adt request (want >=%zu, got %u)",
sizeof(struct ip_set_req_adt), len);
res = -EINVAL;
goto done;
@@ -1577,7 +1577,7 @@
if (optval != SO_IP_SET)
return -EBADF;
if (*len < sizeof(unsigned)) {
- ip_set_printk("short userdata (want >=%d, got %d)",
+ ip_set_printk("short userdata (want >=%zu, got %d)",
sizeof(unsigned), *len);
return -EINVAL;
}
@@ -1614,7 +1614,7 @@
(struct ip_set_req_version *) data;
if (*len != sizeof(struct ip_set_req_version)) {
- ip_set_printk("invalid VERSION (want %d, got %d)",
+ ip_set_printk("invalid VERSION (want %zu, got %d)",
sizeof(struct ip_set_req_version),
*len);
res = -EINVAL;
@@ -1631,7 +1631,7 @@
= (struct ip_set_req_get_set *) data;
if (*len != sizeof(struct ip_set_req_get_set)) {
- ip_set_printk("invalid GET_BYNAME (want %d, got %d)",
+ ip_set_printk("invalid GET_BYNAME (want %zu, got %d)",
sizeof(struct ip_set_req_get_set), *len);
res = -EINVAL;
goto done;
@@ -1646,7 +1646,7 @@
= (struct ip_set_req_get_set *) data;
if (*len != sizeof(struct ip_set_req_get_set)) {
- ip_set_printk("invalid GET_BYINDEX (want %d, got %d)",
+ ip_set_printk("invalid GET_BYINDEX (want %zu, got %d)",
sizeof(struct ip_set_req_get_set), *len);
res = -EINVAL;
goto done;
@@ -1663,7 +1663,7 @@
= (struct ip_set_req_adt_get *) data;
if (*len != sizeof(struct ip_set_req_adt_get)) {
- ip_set_printk("invalid ADT_GET (want %d, got %d)",
+ ip_set_printk("invalid ADT_GET (want %zu, got %d)",
sizeof(struct ip_set_req_adt_get), *len);
res = -EINVAL;
goto done;
@@ -1687,7 +1687,7 @@
ip_set_id_t i;
if (*len != sizeof(struct ip_set_req_max_sets)) {
- ip_set_printk("invalid MAX_SETS (want %d, got %d)",
+ ip_set_printk("invalid MAX_SETS (want %zu, got %d)",
sizeof(struct ip_set_req_max_sets), *len);
res = -EINVAL;
goto done;
@@ -1722,7 +1722,7 @@
int used;
if (*len < sizeof(struct ip_set_req_setnames)) {
- ip_set_printk("short LIST_SIZE (want >=%d, got %d)",
+ ip_set_printk("short LIST_SIZE (want >=%zu, got %d)",
sizeof(struct ip_set_req_setnames), *len);
res = -EINVAL;
goto done;
@@ -1791,7 +1791,7 @@
int used;
if (*len < sizeof(struct ip_set_req_list)) {
- ip_set_printk("short LIST (want >=%d, got %d)",
+ ip_set_printk("short LIST (want >=%zu, got %d)",
sizeof(struct ip_set_req_list), *len);
res = -EINVAL;
goto done;
@@ -1828,7 +1828,7 @@
int used;
if (*len < sizeof(struct ip_set_req_list)) {
- ip_set_printk("short SAVE (want >=%d, got %d)",
+ ip_set_printk("short SAVE (want >=%zu, got %d)",
sizeof(struct ip_set_req_list), *len);
res = -EINVAL;
goto done;
@@ -1868,7 +1868,7 @@
if (*len < sizeof(struct ip_set_req_setnames)
|| *len != req_restore->size) {
- ip_set_printk("invalid RESTORE (want =%d, got %d)",
+ ip_set_printk("invalid RESTORE (want =%zu, got %d)",
req_restore->size, *len);
res = -EINVAL;
goto done;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -76,7 +76,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -125,7 +125,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -232,7 +232,7 @@
(struct ip_set_req_iphash *) data;
if (size != sizeof(struct ip_set_req_iphash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash),
size);
return -EINVAL;
@@ -258,7 +258,7 @@
struct ip_set_iphash *map;
if (size != sizeof(struct ip_set_req_iphash_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iphash_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -49,7 +49,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -101,7 +101,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -144,7 +144,7 @@
(struct ip_set_req_ipmap *) data;
if (size != sizeof(struct ip_set_req_ipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap),
size);
return -EINVAL;
@@ -170,7 +170,7 @@
struct ip_set_ipmap *map;
if (size != sizeof(struct ip_set_req_ipmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_ipmap_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iptree.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iptree.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -72,7 +72,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -149,7 +149,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -210,7 +210,7 @@
(struct ip_set_req_iptree *) data;
if (size != sizeof(struct ip_set_req_iptree)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree),
size);
return -EINVAL;
@@ -312,7 +312,7 @@
struct ip_set_iptree *map;
if (size != sizeof(struct ip_set_req_iptree_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_iptree_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -33,7 +33,7 @@
struct ip_set_req_macipmap *req = (struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -122,7 +122,7 @@
(struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -173,7 +173,7 @@
(struct ip_set_req_macipmap *) data;
if (size != sizeof(struct ip_set_req_macipmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap),
size);
return -EINVAL;
@@ -204,7 +204,7 @@
struct ip_set_macipmap *map;
if (size != sizeof(struct ip_set_req_macipmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_macipmap_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -98,7 +98,7 @@
(struct ip_set_req_nethash *) data;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -177,7 +177,7 @@
int ret;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -296,7 +296,7 @@
(struct ip_set_req_nethash *) data;
if (size != sizeof(struct ip_set_req_nethash)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash),
size);
return -EINVAL;
@@ -329,7 +329,7 @@
struct ip_set_nethash *map;
if (size != sizeof(struct ip_set_req_nethash_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_nethash_create),
size);
return -EINVAL;
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_portmap.c 2005-06-27 14:26:34 UTC (rev 4047)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_portmap.c 2005-06-27 14:37:42 UTC (rev 4048)
@@ -84,7 +84,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -131,7 +131,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -174,7 +174,7 @@
(struct ip_set_req_portmap *) data;
if (size != sizeof(struct ip_set_req_portmap)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap),
size);
return -EINVAL;
@@ -202,7 +202,7 @@
struct ip_set_portmap *map;
if (size != sizeof(struct ip_set_req_portmap_create)) {
- ip_set_printk("data length wrong (want %d, have %d)",
+ ip_set_printk("data length wrong (want %zu, have %zu)",
sizeof(struct ip_set_req_portmap_create),
size);
return -EINVAL;
More information about the netfilter-cvslog
mailing list