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>
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; \
{
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;
}
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;
}
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;
return True;
}
- q=safe_malloc(sizeof *q,"resolve_request");
+ NEW(q);
q->cst=cst;
q->comm=comm;
q->port=port;
const char *errmsg;
int i;
- tr = safe_malloc(sizeof(struct transform),"test transform");
+ NEW(tr);
tr->max_seq_skew = 20;
ti = transform_create(tr);
#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; \