[Emacs-diffs] emacs-25 39d1320: Fix module test to use ptrdiff_t nargs too

[Paul Eggert]

branch: emacs-25
commit 39d13206f3b37261bf4a2ebadfc1103414f4fd3e
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix module test to use ptrdiff_t nargs too
    
    * modules/mod-test/mod-test.c (Fmod_test_return_t)
    (Fmod_test_sum, Fmod_test_signal, Fmod_test_throw)
    (Fmod_test_non_local_exit_funcall, Fmod_test_globref_make)
    (Fmod_test_string_a_to_b, Fmod_test_userptr_make)
    (Fmod_test_userptr_get, Fmod_test_vector_fill)
    (Fmod_test_vector_eq): Arg counts are ptrdiff_t, not int.
    (finalizer): Remove; no longer used.
---
 modules/mod-test/mod-test.c |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c
index bae1967..44a14dc 100644
--- a/modules/mod-test/mod-test.c
+++ b/modules/mod-test/mod-test.c
@@ -26,7 +26,8 @@ int plugin_is_GPL_compatible;
 
 /* Always return symbol 't'.  */
 static emacs_value
-Fmod_test_return_t (emacs_env *env, int nargs, emacs_value args[], void *data)
+Fmod_test_return_t (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                   void *data)
 {
   return env->intern (env, "t");
 }
@@ -39,7 +40,7 @@ sum (intmax_t a, intmax_t b)
 }
 
 static emacs_value
-Fmod_test_sum (emacs_env *env, int nargs, emacs_value args[], void *data)
+Fmod_test_sum (emacs_env *env, ptrdiff_t nargs, emacs_value args[], void *data)
 {
   intmax_t a = env->extract_integer (env, args[0]);
   intmax_t b = env->extract_integer (env, args[1]);
@@ -52,7 +53,8 @@ Fmod_test_sum (emacs_env *env, int nargs, emacs_value args[], 
void *data)
 
 /* Signal '(error 56).  */
 static emacs_value
-Fmod_test_signal (emacs_env *env, int nargs, emacs_value args[], void *data)
+Fmod_test_signal (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                 void *data)
 {
   assert (env->non_local_exit_check (env) == emacs_funcall_exit_return);
   env->non_local_exit_signal (env, env->intern (env, "error"),
@@ -63,7 +65,8 @@ Fmod_test_signal (emacs_env *env, int nargs, emacs_value 
args[], void *data)
 
 /* Throw '(tag 65).  */
 static emacs_value
-Fmod_test_throw (emacs_env *env, int nargs, emacs_value args[], void *data)
+Fmod_test_throw (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                void *data)
 {
   assert (env->non_local_exit_check (env) == emacs_funcall_exit_return);
   env->non_local_exit_throw (env, env->intern (env, "tag"),
@@ -75,8 +78,8 @@ Fmod_test_throw (emacs_env *env, int nargs, emacs_value 
args[], void *data)
 /* Call argument function, catch all non-local exists and return
    either normal result or a list describing the non-local exit.  */
 static emacs_value
-Fmod_test_non_local_exit_funcall (emacs_env *env, int nargs, emacs_value 
args[],
-                                 void *data)
+Fmod_test_non_local_exit_funcall (emacs_env *env, ptrdiff_t nargs,
+                                 emacs_value args[], void *data)
 {
   assert (nargs == 1);
   emacs_value result = env->funcall (env, args[0], 0, NULL);
@@ -113,7 +116,7 @@ Fmod_test_non_local_exit_funcall (emacs_env *env, int 
nargs, emacs_value args[],
 
 /* Return a global referrence.  */
 static emacs_value
-Fmod_test_globref_make (emacs_env *env, int nargs, emacs_value args[],
+Fmod_test_globref_make (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
                        void *data)
 {
   /* Make a big string and make it global.  */
@@ -130,7 +133,7 @@ Fmod_test_globref_make (emacs_env *env, int nargs, 
emacs_value args[],
 /* Return a copy of the argument string where every 'a' is replaced
    with 'b'.  */
 static emacs_value
-Fmod_test_string_a_to_b (emacs_env *env, int nargs, emacs_value args[],
+Fmod_test_string_a_to_b (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
                         void *data)
 {
   emacs_value lisp_str = args[0];
@@ -158,18 +161,10 @@ struct super_struct
   char large_unused_buffer[512];
 };
 
-/* Associated finalizer.  */
-static void
-finalizer (void *p)
-{
-  if (p)
-    free (p);
-}
-
 /* Return a new user-pointer to a super_struct, with amazing_int set
    to the passed parameter.  */
 static emacs_value
-Fmod_test_userptr_make (emacs_env *env, int nargs, emacs_value args[],
+Fmod_test_userptr_make (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
                        void *data)
 {
   struct super_struct *p = calloc (1, sizeof *p);
@@ -179,7 +174,8 @@ Fmod_test_userptr_make (emacs_env *env, int nargs, 
emacs_value args[],
 
 /* Return the amazing_int of a passed 'user-pointer to a super_struct'.  */
 static emacs_value
-Fmod_test_userptr_get (emacs_env *env, int nargs, emacs_value args[], void 
*data)
+Fmod_test_userptr_get (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                      void *data)
 {
   struct super_struct *p = env->get_user_ptr (env, args[0]);
   return env->make_integer (env, p->amazing_int);
@@ -188,7 +184,8 @@ Fmod_test_userptr_get (emacs_env *env, int nargs, 
emacs_value args[], void *data
 
 /* Fill vector in args[0] with value in args[1].  */
 static emacs_value
-Fmod_test_vector_fill (emacs_env *env, int nargs, emacs_value args[], void 
*data)
+Fmod_test_vector_fill (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                      void *data)
 {
   emacs_value vec = args[0];
   emacs_value val = args[1];
@@ -202,7 +199,8 @@ Fmod_test_vector_fill (emacs_env *env, int nargs, 
emacs_value args[], void *data
 /* Return whether all elements of vector in args[0] are 'eq' to value
    in args[1].  */
 static emacs_value
-Fmod_test_vector_eq (emacs_env *env, int nargs, emacs_value args[], void *data)
+Fmod_test_vector_eq (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                    void *data)
 {
   emacs_value vec = args[0];
   emacs_value val = args[1];