[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.13-7-g8161afb

[by NIIBE Yutaka]

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 "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  8161afb9dddaba839be92fbe9d85c05235eda825 (commit)
      from  14e5435afb50dc9a9243ff3e0aed5030beba2914 (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 8161afb9dddaba839be92fbe9d85c05235eda825
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Feb 25 10:44:16 2019 +0900

    gpgscm: Build well even if NDEBUG defined.
    
    * gpgscm/scheme.c (gc_reservation_failure): Fix adding ";".
    [!NDEBUG] (scheme_init_custom_alloc): Don't init seserved_lineno.
    
    --
    
    Cherry icked from master commit of:
    	e140c6d4f581be1a60a34b67b16430452f3987e8
    
    In some build environment, NDEBUG is defined (although it's
    bad practice).  This change supports such a situation.
    
    GnuPG-bug-id: 3959
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index b188e36..b4960b0 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -874,7 +874,7 @@ gc_reservation_failure(struct scheme *sc)
 {
 #ifdef NDEBUG
   fprintf(stderr,
-	  "insufficient reservation\n")
+	  "insufficient reservation\n");
 #else
   fprintf(stderr,
 	  "insufficient %s reservation in line %d\n",
@@ -5627,7 +5627,9 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
   sc->fcells = 0;
   sc->inhibit_gc = GC_ENABLED;
   sc->reserved_cells = 0;
+#ifndef NDEBUG
   sc->reserved_lineno = 0;
+#endif
   sc->no_memory=0;
   sc->inport=sc->NIL;
   sc->outport=sc->NIL;

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

Summary of changes:
 tests/gpgscm/scheme.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org