From 91d4031f78382a4cd5cf8666c7f985e2728e8578 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Fri, 21 Aug 2009 16:03:50 +0200 Subject: New release again, to fix a mistyping of me and get rid of bool. --- Makefile | 2 +- kernel/ChangeLog | 4 ++++ kernel/ip_set_iptree.c | 2 +- kernel/ip_set_setlist.c | 9 ++------- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d663f92..1894679 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ ifndef V V=0 endif -IPSET_VERSION:=3.1 +IPSET_VERSION:=3.2 PREFIX:=/usr/local LIBDIR:=$(PREFIX)/lib diff --git a/kernel/ChangeLog b/kernel/ChangeLog index fd440ef..f0c3616 100644 --- a/kernel/ChangeLog +++ b/kernel/ChangeLog @@ -1,3 +1,7 @@ +3.2 + - Mixed up formats in ip_set_iptree.c (Rob Sterenborg) + - Don't use 'bool' for backward compatibility reasons (Rob Sterenborg) + 3.1 - Nonexistent sets were reported as existing sets when testing from userspace in setlist type of sets (bug reported by Victor A. diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c index f7d64b7..1ef8263 100644 --- a/kernel/ip_set_iptree.c +++ b/kernel/ip_set_iptree.c @@ -282,7 +282,7 @@ iptree_create(struct ip_set *set, const void *data, u_int32_t size) struct ip_set_iptree *map; if (size != sizeof(struct ip_set_req_iptree_create)) { - ip_set_printk("data length wrong (want %lu, have %zu)", + ip_set_printk("data length wrong (want %zu, have %lu)", sizeof(struct ip_set_req_iptree_create), (unsigned long)size); return -EINVAL; diff --git a/kernel/ip_set_setlist.c b/kernel/ip_set_setlist.c index 612f81f..2b1c6b6 100644 --- a/kernel/ip_set_setlist.c +++ b/kernel/ip_set_setlist.c @@ -16,17 +16,12 @@ #include #include -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) -typedef _Bool bool; -enum { false = 0, true = 1, }; -#endif - /* * before ==> index, ref * after ==> ref, index */ -static inline bool +static inline int next_index_eq(const struct ip_set_setlist *map, int i, ip_set_id_t index) { return i < map->size && map->index[i] == index; @@ -175,7 +170,7 @@ setlist_kadd(struct ip_set *set, return res; } -static inline bool +static inline int unshift_setlist(struct ip_set_setlist *map, int i) { int j; -- cgit v1.2.3