Count MANY function args more reliably

* alloc.c (Fgc_status, purecopy, unbind_to, garbage_collect_1):
* buffer.c (Fbuffer_list, Fkill_buffer):
* callint.c (read_file_name, Fcall_interactively):
* charset.c (Fset_charset_priority, syms_of_charset):
* chartab.c (uniprop_encode_value_numeric):
* coding.c (syms_of_coding):
* composite.c (syms_of_composite):
* data.c (wrong_range):
* dbusbind.c (syms_of_dbusbind):
* dired.c (file_attributes):
* editfns.c (Fdecode_time, update_buffer_properties, format2):
* eval.c (run_hook_with_args_2, apply1, call1, call2, call3)
(call4, call5, call6, call7):
* fileio.c (Finsert_file_contents, choose_write_coding_system)
(Fcar_less_than_car, build_annotations, auto_save_error):
* filelock.c (get_boot_time):
* fns.c (internal_equal, nconc2, Fyes_or_no_p, Fwidget_apply):
(maybe_resize_hash_table, secure_hash):
* font.c (font_style_to_value, font_open_by_name, Flist_fonts):
* fontset.c (fontset_add, Fset_fontset_font):
* ftfont.c (ftfont_lookup_cache):
* gtkutil.c (xg_get_font):
* insdel.c (signal_before_change, signal_after_change):
* keymap.c (append_key):
* lread.c (load_warn_old_style_backquotes, Fload, init_lread):
* minibuf.c (Fread_buffer):
* print.c (print_preprocess):
* process.c (Fformat_network_address, Fmake_network_process)
(server_accept_connection):
* sound.c (Fplay_sound_internal):
* term.c (Fsuspend_tty, Fresume_tty):
* window.c (window_list):
* xdisp.c (run_redisplay_end_trigger_hook, add_to_log)
(message_with_string):
* xfaces.c (Fx_list_fonts):
* xfont.c (syms_of_xfont):
* xselect.c (x_handle_selection_request)
(x_handle_selection_clear, x_clear_frame_selections)
(x_clipboard_manager_error_1):
Prefer CALLMANY and CALLN to counting args by hand.
* doc.c (reread_doc_file): Remove unused code.
* fns.c (concat2, concat3): Redo to avoid need for local-var vector.
(cmpfn_user_defined, hashfn_user_defined, Fmaphash):
Prefer call1 and call2 to Ffuncall.
* keyboard.c (safe_run_hook_funcall, safe_run_hooks):
Use struct literal rather than a local var, for simplicity.
* keymap.c (where_is_internal): Use NULL rather than a pointer
to unused args.
* lisp.h (CALLMANY, CALLN): New macros.
* sound.c (Fplay_sound_internal): Coalesce duplicate code.
Fixes: bug#19634

1 files changed, 14 insertions, 14 deletions

diff --git a/src/process.c b/src/process.c
index 0789f20f1d2..1d935ba8a3e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1338,7 +1338,7 @@ Returns nil if format of ADDRESS is invalid.  */)
   if (CONSP (address))
     {
       AUTO_STRING (format, "<Family %d>");
-      return Fformat (2, (Lisp_Object []) {format, Fcar (address)});
+      return CALLN (Fformat, format, Fcar (address));
     }
 
   return Qnil;
@@ -3422,7 +3422,7 @@ usage: (make-network-process &rest ARGS)  */)
     struct gcpro gcpro1;
     /* Qt denotes we have not yet called Ffind_operation_coding_system.  */
     Lisp_Object coding_systems = Qt;
-    Lisp_Object fargs[5], val;
+    Lisp_Object val;
 
     if (!NILP (tem))
       {
@@ -3445,10 +3445,10 @@ usage: (make-network-process &rest ARGS)  */)
           coding_systems = Qnil;
         else
           {
-            fargs[0] = Qopen_network_stream, fargs[1] = name,
-              fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
             GCPRO1 (proc);
-            coding_systems = Ffind_operation_coding_system (5, fargs);
+            coding_systems = CALLN (Ffind_operation_coding_system,
+                                    Qopen_network_stream, name, buffer,
+                                    host, service);
             UNGCPRO;
           }
         if (CONSP (coding_systems))
@@ -3478,10 +3478,10 @@ usage: (make-network-process &rest ARGS)  */)
               coding_systems = Qnil;
             else
               {
-                fargs[0] = Qopen_network_stream, fargs[1] = name,
-                  fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
                 GCPRO1 (proc);
-                coding_systems = Ffind_operation_coding_system (5, fargs);
+                coding_systems = CALLN (Ffind_operation_coding_system,
+                                        Qopen_network_stream, name, buffer,
+                                        host, service);
                 UNGCPRO;
               }
           }
@@ -4064,12 +4064,12 @@ server_accept_connection (Lisp_Object server, int channel)
         unsigned char *ip = (unsigned char *)&saddr.in.sin_addr.s_addr;
 
         AUTO_STRING (ipv4_format, "%d.%d.%d.%d");
-        host = Fformat (5, ((Lisp_Object [])
-          { ipv4_format, make_number (ip[0]),
-            make_number (ip[1]), make_number (ip[2]), make_number (ip[3]) }));
+        host = CALLN (Fformat, ipv4_format,
+                      make_number (ip[0]), make_number (ip[1]),
+                      make_number (ip[2]), make_number (ip[3]));
         service = make_number (ntohs (saddr.in.sin_port));
         AUTO_STRING (caller_format, " <%s:%d>");
-        caller = Fformat (3, (Lisp_Object []) {caller_format, host, service});
+        caller = CALLN (Fformat, caller_format, host, service);
       }
       break;
 
@@ -4084,10 +4084,10 @@ server_accept_connection (Lisp_Object server, int channel)
         args[0] = ipv6_format;
         for (i = 0; i < 8; i++)
           args[i + 1] = make_number (ntohs (ip6[i]));
-        host = Fformat (9, args);
+        host = CALLMANY (Fformat, args);
         service = make_number (ntohs (saddr.in.sin_port));
         AUTO_STRING (caller_format, " <[%s]:%d>");
-        caller = Fformat (3, (Lisp_Object []) {caller_format, host, service});
+        caller = CALLN (Fformat, caller_format, host, service);
       }
       break;
 #endif