X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=ipaddr.c;h=4b5b48aa43d0cf3b6f889ebd049cced818638557;hp=899581f0e0a11bae619c03b8ad1d01fb32b010af;hb=656df7e2c9b688150ebe991d79a64ac096bb5f8e;hpb=c9c047dcc6d21b98144fb15f654e4d8f4f10f2de;ds=sidebyside

diff --git a/ipaddr.c b/ipaddr.c
index 899581f..4b5b48a 100644
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -15,10 +15,10 @@
 struct subnet_list *subnet_list_new(void)
 {
     struct subnet_list *r;
-    r=safe_malloc(sizeof(*r),"subnet_list_new:list");
+    NEW(r);
     r->entries=0;
     r->alloc=DEFAULT_ALLOC;
-    r->list=safe_malloc_ary(sizeof(*r->list),r->alloc,"subnet_list_new:data");
+    NEW_ARY(r->list,r->alloc);
     return r;
 }
 
@@ -30,15 +30,13 @@ void subnet_list_free(struct subnet_list *a)
 
 static void subnet_list_set_len(struct subnet_list *a, int32_t l)
 {
-    struct subnet *nd;
     int32_t na;
 
     if (l>a->alloc) {
-	assert(a->alloc < (int)(INT_MAX/sizeof(*nd))-EXTEND_ALLOC_BY);
+	assert(a->alloc < INT_MAX-EXTEND_ALLOC_BY);
 	na=a->alloc+EXTEND_ALLOC_BY;
-	nd=safe_realloc_ary(a->list,sizeof(*nd),na,"subnet_list_set_len");
+	REALLOC_ARY(a->list,na);
 	a->alloc=na;
-	a->list=nd;
     }
     a->entries=l;
 }
@@ -57,10 +55,10 @@ void subnet_list_append(struct subnet_list *a, uint32_t prefix, int len)
 struct ipset *ipset_new(void)
 {
     struct ipset *r;
-    r=safe_malloc(sizeof(*r),"ipset_new:set");
+    NEW(r);
     r->l=0;
     r->a=DEFAULT_ALLOC;
-    r->d=safe_malloc(sizeof(*r->d)*r->a,"ipset_new:data");
+    NEW_ARY(r->d,r->a);
     return r;
 }
 
@@ -112,15 +110,13 @@ struct ipset *ipset_from_subnet_list(struct subnet_list *l)
 
 static void ipset_set_len(struct ipset *a, int32_t l)
 {
-    struct iprange *nd;
     int32_t na;
 
     if (l>a->a) {
 	assert(a->a < INT_MAX-EXTEND_ALLOC_BY);
 	na=a->a+EXTEND_ALLOC_BY;
-	nd=safe_realloc_ary(a->d,sizeof(*nd),na,"ipset_set_len");
+	REALLOC_ARY(a->d,na);
 	a->a=na;
-	a->d=nd;
     }
     a->l=l;
 }