Minor cleanups with cfg_allocz()
Also fixes some more failed asserts due to add_tail().
This commit is contained in:
parent
1678bc0746
commit
30b8468269
4 changed files with 5 additions and 10 deletions
|
@ -737,7 +737,7 @@ cf_lex_init(int is_cli, struct config *c)
|
||||||
void
|
void
|
||||||
cf_push_scope(struct symbol *sym)
|
cf_push_scope(struct symbol *sym)
|
||||||
{
|
{
|
||||||
struct sym_scope *s = cfg_alloc(sizeof(struct sym_scope));
|
struct sym_scope *s = cfg_allocz(sizeof(struct sym_scope));
|
||||||
|
|
||||||
s->next = conf_this_scope;
|
s->next = conf_this_scope;
|
||||||
conf_this_scope = s;
|
conf_this_scope = s;
|
||||||
|
|
|
@ -148,7 +148,7 @@ conf: definition ;
|
||||||
|
|
||||||
definition:
|
definition:
|
||||||
DEFINE symbol '=' term ';' {
|
DEFINE symbol '=' term ';' {
|
||||||
struct f_val *val = cfg_alloc(sizeof(struct f_val));
|
struct f_val *val = cfg_allocz(sizeof(struct f_val));
|
||||||
if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error");
|
if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error");
|
||||||
cf_define_symbol($2, SYM_CONSTANT | val->type, val, val);
|
cf_define_symbol($2, SYM_CONSTANT | val->type, val, val);
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,12 +103,7 @@ build_tree(struct f_tree *from)
|
||||||
struct f_tree *
|
struct f_tree *
|
||||||
f_new_tree(void)
|
f_new_tree(void)
|
||||||
{
|
{
|
||||||
struct f_tree * ret;
|
struct f_tree *ret = cfg_allocz(sizeof(struct f_tree));
|
||||||
ret = cfg_alloc(sizeof(struct f_tree));
|
|
||||||
ret->left = ret->right = NULL;
|
|
||||||
ret->from.type = ret->to.type = T_VOID;
|
|
||||||
ret->from.val.i = ret->to.val.i = 0;
|
|
||||||
ret->data = NULL;
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -479,11 +479,11 @@ password_item:
|
||||||
password_item_begin:
|
password_item_begin:
|
||||||
PASSWORD text {
|
PASSWORD text {
|
||||||
if (!this_p_list) {
|
if (!this_p_list) {
|
||||||
this_p_list = cfg_alloc(sizeof(list));
|
this_p_list = cfg_allocz(sizeof(list));
|
||||||
init_list(this_p_list);
|
init_list(this_p_list);
|
||||||
password_id = 1;
|
password_id = 1;
|
||||||
}
|
}
|
||||||
this_p_item = cfg_alloc(sizeof (struct password_item));
|
this_p_item = cfg_allocz(sizeof(struct password_item));
|
||||||
this_p_item->password = $2;
|
this_p_item->password = $2;
|
||||||
this_p_item->length = strlen($2);
|
this_p_item->length = strlen($2);
|
||||||
this_p_item->genfrom = 0;
|
this_p_item->genfrom = 0;
|
||||||
|
|
Loading…
Reference in a new issue