From f2d5f883b327692465b0eb77da48790d03253814 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 7 Oct 2014 20:31:26 +0100
Subject: [PATCH] NEW etc.: Use NEW in all obvious places

Entirely automatic conversion, using the following Perl rune:

  perl -i~ -pe 's#^(\s+)(\w+)=safe_malloc\(sizeof\(\*\2\),"[^"]+"\);$#$1NEW($2);#' *.c conffile.fl conffile.y

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 comm-common.c      |  2 +-
 conffile.c         | 16 ++++++++--------
 conffile.fl        |  2 +-
 conffile.y         |  2 +-
 dh.c               |  2 +-
 ipaddr.c           |  4 ++--
 log.c              |  8 ++++----
 md5.c              |  4 ++--
 netlink.c          |  4 ++--
 process.c          |  6 +++---
 random.c           |  2 +-
 resolver.c         |  2 +-
 rsa.c              |  4 ++--
 secnet.c           |  2 +-
 sha1.c             |  4 ++--
 site.c             |  2 +-
 slip.c             |  2 +-
 transform-cbcmac.c |  2 +-
 transform-eax.c    |  2 +-
 tun.c              |  2 +-
 util.c             |  4 ++--
 21 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/comm-common.c b/comm-common.c
index d880055..7528e92 100644
--- a/comm-common.c
+++ b/comm-common.c
@@ -7,7 +7,7 @@ void comm_request_notify(void *commst, void *nst, comm_notify_fn *fn)
     struct commcommon *st=commst;
     struct comm_notify_entry *n;
     
-    n=safe_malloc(sizeof(*n),"comm_request_notify");
+    NEW(n);
     n->fn=fn;
     n->state=nst;
     LIST_INSERT_HEAD(&st->notify, n, entry);
diff --git a/conffile.c b/conffile.c
index 0bd4e33..3ffbd9f 100644
--- a/conffile.c
+++ b/conffile.c
@@ -75,7 +75,7 @@ static void dict_iadd(dict_t *dict, atom_t key, list_t *val)
     if (dict_ilookup_primitive(dict, key)) {
 	fatal("duplicate key \"%s\" in dictionary",key);
     }
-    e=safe_malloc(sizeof(*e),"dict_add");
+    NEW(e);
     e->next=dict->entries;
     e->key=key;
     e->val=val;
@@ -89,7 +89,7 @@ static dict_t *dict_new(dict_t *parent)
 {
     dict_t *d;
 
-    d=safe_malloc(sizeof(*d),"dict_new");
+    NEW(d);
     d->parent=parent;
     d->search=NULL;
     d->entries=NULL;
@@ -100,7 +100,7 @@ static dict_t *dict_new(dict_t *parent)
 static struct p_node *node_copy(struct p_node *n)
 {
     struct p_node *r;
-    r=safe_malloc(sizeof(*r),"node_copy");
+    NEW(r);
     *r=*n;
     return r;
 }
@@ -250,7 +250,7 @@ static item_t *new_item(enum types type, struct cloc loc)
 {
     item_t *i;
 
-    i=safe_malloc(sizeof(*i),"new_item");
+    NEW(i);
     i->type=type;
     i->loc=loc;
     return i;
@@ -518,7 +518,7 @@ atom_t intern(cstring_t s)
 
     if (!i) {
 	/* Did't find it; create a new one */
-	i=safe_malloc(sizeof(*i),"intern: alloc list entry");
+	NEW(i);
 	i->a=safe_strdup(s,"intern: alloc string");
 	i->next=atoms;
 	atoms=i;
@@ -577,7 +577,7 @@ static list_t *list_copy(list_t *a)
     l=NULL;
     r=NULL;
     for (i=a; i; i=i->next) {
-	b=safe_malloc(sizeof(*b),"list_copy");
+	NEW(b);
 	if (l) l->next=b; else r=b;
 	l=b;
 	b->item=i->item;
@@ -601,7 +601,7 @@ list_t *list_append(list_t *list, item_t *item)
 {
     list_t *l;
 
-    l=safe_malloc(sizeof(*l),"list_append");
+    NEW(l);
     l->item=item;
     l->next=NULL;
 
@@ -627,7 +627,7 @@ list_t *new_closure(closure_t *cl)
 void add_closure(dict_t *dict, cstring_t name, apply_fn apply)
 {
     closure_t *c;
-    c=safe_malloc(sizeof(*c),"add_closure");
+    NEW(c);
     c->description=name;
     c->type=CL_PURE;
     c->apply=apply;
diff --git a/conffile.fl b/conffile.fl
index 7228c9e..b72bc05 100644
--- a/conffile.fl
+++ b/conffile.fl
@@ -42,7 +42,7 @@ static struct p_node *leafnode(uint32_t type)
 {
 	struct p_node *r;
 
-	r=safe_malloc(sizeof(*r),"leafnode");
+	NEW(r);
 	r->type=type;
 	r->loc.file=config_file;
 	r->loc.line=config_lineno;
diff --git a/conffile.y b/conffile.y
index 7837abe..9f32cfd 100644
--- a/conffile.y
+++ b/conffile.y
@@ -103,7 +103,7 @@ static struct p_node *node(uint32_t type, struct p_node *l, struct p_node *r)
 {
 	struct p_node *rv;
 
-	rv=safe_malloc(sizeof(*rv),"p_node");
+	NEW(rv);
 	rv->type=type;
 	rv->loc.file=config_file;
 	rv->loc.line=config_lineno;
diff --git a/dh.c b/dh.c
index c37b538..54d3102 100644
--- a/dh.c
+++ b/dh.c
@@ -63,7 +63,7 @@ static list_t *dh_apply(closure_t *self, struct cloc loc, dict_t *context,
     string_t p,g;
     item_t *i;
 
-    st=safe_malloc(sizeof(*st),"dh_apply");
+    NEW(st);
     st->cl.description="dh";
     st->cl.type=CL_DH;
     st->cl.apply=NULL;
diff --git a/ipaddr.c b/ipaddr.c
index 899581f..b3cd0a7 100644
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -15,7 +15,7 @@
 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");
@@ -57,7 +57,7 @@ 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");
diff --git a/log.c b/log.c
index d8b5151..a17032b 100644
--- a/log.c
+++ b/log.c
@@ -266,7 +266,7 @@ struct log_if *init_log(list_t *ll)
 	if (cl->type!=CL_LOG) {
 	    cfgfatal(item->loc,"init_log","closure is not a logger");
 	}
-	n=safe_malloc(sizeof(*n),"init_log");
+	NEW(n);
 	n->l=cl->interface;
 	n->next=l;
 	l=n;
@@ -402,7 +402,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
        phase.  We should defer writing into the logfile until after we
        become a daemon. */
     
-    st=safe_malloc(sizeof(*st),"logfile_apply");
+    NEW(st);
     st->cl.description="logfile";
     st->cl.type=CL_LOG;
     st->cl.apply=NULL;
@@ -517,7 +517,7 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     string_t facstr;
 
-    st=safe_malloc(sizeof(*st),"syslog_apply");
+    NEW(st);
     st->cl.description="syslog";
     st->cl.type=CL_LOG;
     st->cl.apply=NULL;
@@ -613,7 +613,7 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
 {
     struct fdlog *st;
 
-    st=safe_malloc(sizeof(*st),"log_from_fd");
+    NEW(st);
     st->log=log;
     st->fd=fd;
     st->prefix=prefix;
diff --git a/md5.c b/md5.c
index 343ad8f..6915891 100644
--- a/md5.c
+++ b/md5.c
@@ -241,7 +241,7 @@ static void *md5_init(void)
 {
     struct MD5Context *ctx;
 
-    ctx=safe_malloc(sizeof(*ctx),"md5_init");
+    NEW(ctx);
     MD5Init(ctx);
 
     return ctx;
@@ -278,7 +278,7 @@ void md5_module(dict_t *dict)
     uint8_t digest[16];
     int i;
 
-    st=safe_malloc(sizeof(*st),"md5_module");
+    NEW(st);
     st->cl.description="md5";
     st->cl.type=CL_HASH;
     st->cl.apply=NULL;
diff --git a/netlink.c b/netlink.c
index 6016864..e180b1d 100644
--- a/netlink.c
+++ b/netlink.c
@@ -1138,7 +1138,7 @@ static closure_t *netlink_inst_create(struct netlink *st,
 	return NULL;
     }
 
-    c=safe_malloc(sizeof(*c),"netlink_inst_create");
+    NEW(c);
     c->cl.description=name;
     c->cl.type=CL_NETLINK;
     c->cl.apply=NULL;
@@ -1307,7 +1307,7 @@ static list_t *null_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     dict_t *dict;
 
-    st=safe_malloc(sizeof(*st),"null_apply");
+    NEW(st);
 
     item=list_elem(args,0);
     if (!item || item->type!=t_dict)
diff --git a/process.c b/process.c
index c14dd69..f836258 100644
--- a/process.c
+++ b/process.c
@@ -45,7 +45,7 @@ pid_t makesubproc(process_entry_fn *entry, process_callback_fn *cb,
     struct child *c;
     pid_t p;
 
-    c=safe_malloc(sizeof(*c),"makesubproc");
+    NEW(c);
     c->desc=desc;
     c->cb=cb;
     c->cst=cst;
@@ -92,7 +92,7 @@ static void sigchld_handler(void *st, int signum)
 	if (rv==i->pid) {
 	    i->finished=True;
 	    
-	    nw=safe_malloc(sizeof(*nw),"sigchld_handler");
+	    NEW(nw);
 	    nw->pid=i->pid;
 	    nw->cb=i->cb;
 	    nw->cst=i->cst;
@@ -291,7 +291,7 @@ void request_signal_notification(int signum, signal_notify_fn *notify,
     struct signotify *s;
     sigset_t old;
 
-    s=safe_malloc(sizeof(*s),"request_signal_notification");
+    NEW(s);
     s->signum=signum;
     s->notify=notify;
     s->cst=cst;
diff --git a/random.c b/random.c
index 39a9cb0..0c0f947 100644
--- a/random.c
+++ b/random.c
@@ -51,7 +51,7 @@ static list_t *random_apply(closure_t *self, struct cloc loc,
     item_t *arg1, *arg2;
     string_t filename=NULL;
 
-    st=safe_malloc(sizeof(*st),"random_apply");
+    NEW(st);
 
     st->cl.description="randomsource";
     st->cl.type=CL_RANDOMSRC;
diff --git a/resolver.c b/resolver.c
index a39e9fc..e9f42f1 100644
--- a/resolver.c
+++ b/resolver.c
@@ -173,7 +173,7 @@ static list_t *adnsresolver_apply(closure_t *self, struct cloc loc,
     item_t *i;
     string_t conf;
 
-    st=safe_malloc(sizeof(*st),"adnsresolver_apply");
+    NEW(st);
     st->cl.description="adns";
     st->cl.type=CL_RESOLVER;
     st->cl.apply=NULL;
diff --git a/rsa.c b/rsa.c
index f7dd69d..bdacfe9 100644
--- a/rsa.c
+++ b/rsa.c
@@ -177,7 +177,7 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *i;
     string_t e,n;
 
-    st=safe_malloc(sizeof(*st),"rsapub_apply");
+    NEW(st);
     st->cl.description="rsapub";
     st->cl.type=CL_RSAPUBKEY;
     st->cl.apply=NULL;
@@ -255,7 +255,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     MP_INT e,d,iqmp,tmp,tmp2,tmp3;
     bool_t valid;
 
-    st=safe_malloc(sizeof(*st),"rsapriv_apply");
+    NEW(st);
     st->cl.description="rsapriv";
     st->cl.type=CL_RSAPRIVKEY;
     st->cl.apply=NULL;
diff --git a/secnet.c b/secnet.c
index 30db8e1..7aaaef5 100644
--- a/secnet.c
+++ b/secnet.c
@@ -235,7 +235,7 @@ struct poll_interest *register_for_poll(void *st, beforepoll_fn *before,
 {
     struct poll_interest *i;
 
-    i=safe_malloc(sizeof(*i),"register_for_poll");
+    NEW(i);
     i->before=before;
     i->after=after;
     i->state=st;
diff --git a/sha1.c b/sha1.c
index a0f26e8..0202ed3 100644
--- a/sha1.c
+++ b/sha1.c
@@ -288,7 +288,7 @@ static void *sha1_init(void)
 {
     SHA1_CTX *ctx;
 
-    ctx=safe_malloc(sizeof(*ctx),"sha1_init");
+    NEW(ctx);
     SHA1Init(ctx);
 
     return ctx;
@@ -329,7 +329,7 @@ void sha1_module(dict_t *dict)
     uint8_t digest[20];
     int i;
 
-    st=safe_malloc(sizeof(*st),"sha1_module");
+    NEW(st);
     st->cl.description="sha1";
     st->cl.type=CL_HASH;
     st->cl.apply=NULL;
diff --git a/site.c b/site.c
index 1c57a8a..94da06c 100644
--- a/site.c
+++ b/site.c
@@ -1927,7 +1927,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     dict_t *dict;
     int i;
 
-    st=safe_malloc(sizeof(*st),"site_apply");
+    NEW(st);
 
     st->cl.description="site";
     st->cl.type=CL_SITE;
diff --git a/slip.c b/slip.c
index fad0a7e..a236752 100644
--- a/slip.c
+++ b/slip.c
@@ -419,7 +419,7 @@ static list_t *userv_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     dict_t *dict;
 
-    st=safe_malloc(sizeof(*st),"userv_apply");
+    NEW(st);
 
     /* First parameter must be a dict */
     item=list_elem(args,0);
diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index 02cbd4c..ebf4702 100644
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -256,7 +256,7 @@ static list_t *transform_apply(closure_t *self, struct cloc loc,
     item_t *item;
     dict_t *dict;
 
-    st=safe_malloc(sizeof(*st),"serpent");
+    NEW(st);
     st->cl.description="serpent-cbc256";
     st->cl.type=CL_TRANSFORM;
     st->cl.apply=NULL;
diff --git a/transform-eax.c b/transform-eax.c
index d1ff1be..906d2b3 100644
--- a/transform-eax.c
+++ b/transform-eax.c
@@ -258,7 +258,7 @@ static list_t *transform_apply(closure_t *self, struct cloc loc,
     item_t *item;
     dict_t *dict;
 
-    st=safe_malloc(sizeof(*st),"eax-serpent");
+    NEW(st);
     st->cl.description="eax-serpent";
     st->cl.type=CL_TRANSFORM;
     st->cl.apply=NULL;
diff --git a/tun.c b/tun.c
index b3c69a2..d5e0e9e 100644
--- a/tun.c
+++ b/tun.c
@@ -456,7 +456,7 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,
     dict_t *dict;
     string_t flavour,type;
 
-    st=safe_malloc(sizeof(*st),"tun_apply");
+    NEW(st);
 
     /* First parameter must be a dict */
     item=list_elem(args,0);
diff --git a/util.c b/util.c
index 803098c..1d05822 100644
--- a/util.c
+++ b/util.c
@@ -240,7 +240,7 @@ bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
 {
     struct phase_hook *h;
 
-    h=safe_malloc(sizeof(*h),"add_hook");
+    NEW(h);
     h->fn=fn;
     h->state=state;
     LIST_INSERT_HEAD(&hooks[phase],h,entry);
@@ -398,7 +398,7 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
     bool_t lockdown=False;
     uint32_t len=DEFAULT_BUFFER_SIZE;
     
-    st=safe_malloc(sizeof(*st),"buffer_apply");
+    NEW(st);
     st->cl.description="buffer";
     st->cl.type=CL_BUFFER;
     st->cl.apply=NULL;
-- 
2.30.2