[Guile-commits] GNU Guile branch, master, updated. v2.1.0-196-g01e909d

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=01e909d90a130f4987b70edae2dbd5a2b33edae7

The branch, master has been updated
       via  01e909d90a130f4987b70edae2dbd5a2b33edae7 (commit)
      from  80be163f81e0dcc16e6805d4c2d1f2de3ca38c55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01e909d90a130f4987b70edae2dbd5a2b33edae7
Author: Andy Wingo <address@hidden>
Date:   Sun Mar 18 20:14:27 2012 +0100

    fix to procedure-arity in previous patch
    
    * libguile/procprop.c (scm_i_procedure_arity): Fix infinite loop.

-----------------------------------------------------------------------

Summary of changes:
 libguile/procprop.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libguile/procprop.c b/libguile/procprop.c
index 8e234ed..ff4648d 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -72,11 +72,15 @@ scm_i_procedure_arity (SCM proc, int *req, int *opt, int 
*rest)
         {
           if (!SCM_SMOB_APPLICABLE_P (proc))
             return 0;
-          if (scm_i_program_arity (SCM_SMOB_DESCRIPTOR (proc).apply_trampoline,
-                                   req, opt, rest))
-            /* The trampoline gets the smob too, which users don't
-               see.  */
-            *req -= 1;
+          if (!scm_i_program_arity (SCM_SMOB_DESCRIPTOR 
(proc).apply_trampoline,
+                                    req, opt, rest))
+            return 0;
+
+          /* The trampoline gets the smob too, which users don't
+             see.  */
+          *req -= 1;
+
+          return 1;
         }
       else
         return 0;


hooks/post-receive
-- 
GNU Guile