[Pkg-gnupg-commit] [gnupg2] 23/116: gpgscm: Fail if too many arguments are given.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit b0e14bd6ff8401b12b2b39f75aef94d3ad28017f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Dec 22 15:48:07 2016 +0100

    gpgscm: Fail if too many arguments are given.
    
    * tests/gpgscm/scheme.c (opexe_0): Enable check.
    * tests/gpgscm/tests.scm (test::report): Remove superfluous argument.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/gpgscm/scheme.c  | 8 +++-----
 tests/gpgscm/tests.scm | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 7cd5217..c4725db 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -3364,11 +3364,9 @@ static pointer opexe_0(scheme *sc, enum scheme_opcodes op) {
                     }
                }
                if (x == sc->NIL) {
-                    /*--
-                     * if (y != sc->NIL) {
-                     *   Error_0(sc,"too many arguments");
-                     * }
-                     */
+                    if (y != sc->NIL) {
+                      Error_0(sc, "too many arguments");
+                    }
                } else if (is_symbol(x))
                     new_slot_in_env(sc, x, y);
                else {
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 5954704..e5858d9 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -610,7 +610,7 @@
 		(seek logfd 0 SEEK_SET)
 		(splice logfd STDERR_FILENO)
 		(close logfd))
-	(echo (string-append (status retcode) ":") name))))))
+	(echo (string-append (status) ":") name))))))
 
 ;; Run the setup target to create an environment, then run all given
 ;; tests in parallel.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git