Replace two-step initialization of args with macros.

* args.h (args_init_list, args_init): Return the
struct args * pointer.
(args_decl_list, args_decl): New macros.

* eval.c (apply, do_eval, expand_macro, op_dwim, op_catch,
(mapcarl, lazy_mapcarl): Switch to new macros.

* hash.c (hashl): Likewise.

* lib.c (generic_funcall, lazy_appendl, maxl, minl, funcall,
funcal1, funcall2, funcall3, funcall4, transpose, juxtv,
do_and, do_or, do_iff, unique): Likewise.

* match.c (h_fun, v_fun): Likewise.

* stream.c (vformat): Likewise.

* syslog.c (syslog_wrap): Likewise.

1 files changed, 2 insertions, 4 deletions

diff --git a/match.c b/match.c
index 4c08fbc6..62eeb50d 100644
--- a/match.c
+++ b/match.c
@@ -1101,8 +1101,7 @@ static val h_fun(match_line_ctx *c)
     }
 
     {
-      struct args *args = args_alloc(ARGS_MIN);
-      args_init_list(args, ARGS_MIN, bindings_cp);
+      args_decl_list(args, ARGS_MIN, bindings_cp);
       uw_block_begin(nil, result);
       uw_env_begin;
       debug_frame(sym, args, ub_p_a_pairs, c->bindings, c->dataline, c->data_lineno, c->pos);
@@ -3589,8 +3588,7 @@ static val v_fun(match_files_ctx *c)
     }
 
     {
-      struct args *args = args_alloc(ARGS_MIN);
-      args_init_list(args, ARGS_MIN, bindings_cp);
+      args_decl_list(args, ARGS_MIN, bindings_cp);
       uw_block_begin(nil, result);
       uw_env_begin;
       debug_frame(sym, args, ub_p_a_pairs, c->bindings, if2(consp(c->data), car(c->data)),