Commit 30b84682 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Minor cleanups with cfg_allocz() 

Also fixes some more failed asserts due to add_tail().
parent 1678bc07

conf/cf-lex.l

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ cf_lex_init(int is_cli, struct config *c) 
void

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;

  conf_this_scope = s;

conf/confbase.Y

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ conf: definition ; 


definition:

   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");

     cf_define_symbol($2, SYM_CONSTANT | val->type, val, val);

   }

filter/tree.c

+1 −6
Original line number Diff line number Diff line
@@ -103,12 +103,7 @@ build_tree(struct f_tree *from) 
struct f_tree *

f_new_tree(void)

{

  struct f_tree * ret;

  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;

  struct f_tree *ret = cfg_allocz(sizeof(struct f_tree));

  return ret;

}

nest/config.Y

+2 −2
Original line number Diff line number Diff line
@@ -479,11 +479,11 @@ password_item: 
password_item_begin:

   PASSWORD text {

     if (!this_p_list) {

	this_p_list = cfg_alloc(sizeof(list));

	this_p_list = cfg_allocz(sizeof(list));

	init_list(this_p_list);

	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->length = strlen($2);

     this_p_item->genfrom = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE