From 952f601f3501b0e40083f5d1a6ef166b8b62a813 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 7 Oct 2014 20:51:05 +0100
Subject: [PATCH] NEW etc.: Use NEW at non-formulaic call sites

Manually replace calls to safe_malloc with NEW.  Calls where
safe_malloc was used to allocate a byte array (or a string buffer) are
left alone.

Some simple calls to allocate a single object are replaced with NEW.
(in COMM_APPLY, init_log, resolve_request, transform_cbcmac_module,
TRANSFORM_CREATE_CORE).

Some calls which were allocating arrays are replaced with NEW_ARY
(in dict_keys, ipset_new).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 comm-common.h      | 2 +-
 conffile.c         | 2 +-
 ipaddr.c           | 2 +-
 log.c              | 2 +-
 resolver.c         | 2 +-
 transform-cbcmac.c | 2 +-
 transform-common.h | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/comm-common.h b/comm-common.h
index 6dad9ef..b1cd9c0 100644
--- a/comm-common.h
+++ b/comm-common.h
@@ -34,7 +34,7 @@ bool_t comm_notify(struct comm_notify_list *notify, struct buffer_if *buf,
 void comm_apply(struct commcommon *cc, void *st);
 
 #define COMM_APPLY(st,cc,prefix,desc,loc)		\
-    (st)=safe_malloc(sizeof(*(st)), desc "_apply");	\
+    NEW(st);						\
     (cc)->loc=loc;					\
     (cc)->cl.description=desc;				\
     (cc)->ops.sendmsg=prefix##sendmsg;			\
diff --git a/conffile.c b/conffile.c
index 84f4960..f5a10a1 100644
--- a/conffile.c
+++ b/conffile.c
@@ -545,7 +545,7 @@ cstring_t *dict_keys(dict_t *dict)
 {
     atom_t *r, *j;
     struct entry *i;
-    r=safe_malloc(sizeof(*r)*(dict->size+1),"dict_keys");
+    NEW_ARY(r,dict->size+1);
     for (i=dict->entries, j=r; i; i=i->next, j++) {
 	*j=i->key;
     }
diff --git a/ipaddr.c b/ipaddr.c
index aa770f8..4b5b48a 100644
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -58,7 +58,7 @@ struct ipset *ipset_new(void)
     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;
 }
 
diff --git a/log.c b/log.c
index a17032b..a2e24ae 100644
--- a/log.c
+++ b/log.c
@@ -274,7 +274,7 @@ struct log_if *init_log(list_t *ll)
     if (!l) {
 	fatal("init_log: no log");
     }
-    r=safe_malloc(sizeof(*r), "init_log");
+    NEW(r);
     r->st=l;
     r->vlogfn=log_vmulti;
     r->buff[0]=0;
diff --git a/resolver.c b/resolver.c
index e9f42f1..6f6588f 100644
--- a/resolver.c
+++ b/resolver.c
@@ -75,7 +75,7 @@ static bool_t resolve_request(void *sst, cstring_t name,
 	return True;
     }
 
-    q=safe_malloc(sizeof *q,"resolve_request");
+    NEW(q);
     q->cst=cst;
     q->comm=comm;
     q->port=port;
diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index ebf4702..f748792 100644
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -337,7 +337,7 @@ void transform_cbcmac_module(dict_t *dict)
 	const char *errmsg;
 	int i;
 
-	tr = safe_malloc(sizeof(struct transform),"test transform");
+	NEW(tr);
 	tr->max_seq_skew = 20;
 	ti = transform_create(tr);
 
diff --git a/transform-common.h b/transform-common.h
index eea03c6..af62738 100644
--- a/transform-common.h
+++ b/transform-common.h
@@ -80,7 +80,7 @@ typedef uint32_t recvbitmap_type;
 
 #define TRANSFORM_CREATE_CORE				\
 	struct transform_inst *ti;			\
-	ti=safe_malloc(sizeof(*ti),"transform_create");	\
+	NEW(ti);					\
 	/* mlock XXX */					\
 	ti->ops.st=ti;					\
 	ti->ops.setkey=transform_setkey;		\
-- 
2.30.2