chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udp: Insist on only one successful default socket setup
[secnet.git]
/
conffile.c
diff --git
a/conffile.c
b/conffile.c
index 0bd4e33bb3d3f9e5ee4c709e3ca701485ab75377..f5a10a184a79566cd612da405ed9c69d333de596 100644
(file)
--- 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);
}
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;
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;
{
dict_t *d;
-
d=safe_malloc(sizeof(*d),"dict_new"
);
+
NEW(d
);
d->parent=parent;
d->search=NULL;
d->entries=NULL;
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;
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;
}
*r=*n;
return r;
}
@@
-250,7
+250,7
@@
static item_t *new_item(enum types type, struct cloc loc)
{
item_t *i;
{
item_t *i;
-
i=safe_malloc(sizeof(*i),"new_item"
);
+
NEW(i
);
i->type=type;
i->loc=loc;
return 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 */
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;
i->a=safe_strdup(s,"intern: alloc string");
i->next=atoms;
atoms=i;
@@
-545,7
+545,7
@@
cstring_t *dict_keys(dict_t *dict)
{
atom_t *r, *j;
struct entry *i;
{
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;
}
for (i=dict->entries, j=r; i; i=i->next, j++) {
*j=i->key;
}
@@
-577,7
+577,7
@@
static list_t *list_copy(list_t *a)
l=NULL;
r=NULL;
for (i=a; i; i=i->next) {
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;
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;
{
list_t *l;
-
l=safe_malloc(sizeof(*l),"list_append"
);
+
NEW(l
);
l->item=item;
l->next=NULL;
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;
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;
c->description=name;
c->type=CL_PURE;
c->apply=apply;
@@
-705,7
+705,7
@@
const char **dict_read_string_array(dict_t *dict, cstring_t key,
}
int32_t ll=list_length(l);
}
int32_t ll=list_length(l);
-
ra=safe_malloc_ary(sizeof(*ra), ll+1, "dict_read_string_array"
);
+
NEW_ARY(ra, ll+1
);
for (rap=ra; l; l=l->next,rap++) {
item_t *it=l->item;
if (it->type!=t_string)
for (rap=ra; l; l=l->next,rap++) {
item_t *it=l->item;
if (it->type!=t_string)