X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=ipaddr.c;h=7dd0476cdd86faf92b260a1a701e5565137a8a4f;hb=fe5e9cc422cd72526ccfceffbc7e5af8ac83b407;hp=1edc334e46fc28be2b20b0e41e16920509c06346;hpb=794f2398b8fe84bf398bb10d6eeca6fe6737f65f;p=secnet.git

diff --git a/ipaddr.c b/ipaddr.c
index 1edc334..7dd0476 100644
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -283,9 +283,9 @@ bool_t ipset_is_subset(struct ipset *super, struct ipset *sub)
 struct subnet_list *ipset_to_subnet_list(struct ipset *is)
 {
     struct subnet_list *r;
-    int64_t a,b;
+    int64_t a,b,lobit,himask,lomask;
+    int32_t bits;
     uint32_t i;
-    uint32_t lomask,lobit,himask,bits;
 
     r=subnet_list_new();
     for (i=0; i<is->l; i++) {
@@ -346,13 +346,13 @@ string_t subnet_to_string(struct subnet sn)
     return s;
 }
 
-static struct subnet string_item_to_subnet(item_t *i, string_t desc,
+static struct subnet string_item_to_subnet(item_t *i, cstring_t desc,
 					   bool_t *invert)
 {
     struct subnet s;
     uint32_t a, b, c, d, n;
     uint32_t match;
-    string_t in;
+    cstring_t in;
 
     *invert=False;
 
@@ -397,7 +397,7 @@ static struct subnet string_item_to_subnet(item_t *i, string_t desc,
     return s;
 }
 
-uint32_t string_item_to_ipaddr(item_t *i, string_t desc)
+uint32_t string_item_to_ipaddr(item_t *i, cstring_t desc)
 {
     uint32_t a, b, c, d;
     uint32_t match;
@@ -419,7 +419,7 @@ uint32_t string_item_to_ipaddr(item_t *i, string_t desc)
 }
 
 struct ipset *string_list_to_ipset(list_t *l, struct cloc loc,
-				   string_t module, string_t param)
+				   cstring_t module, cstring_t param)
 {
     struct ipset *r, *n, *isn;
     uint32_t e,i;