[git] GnuPG - branch, master, updated. gnupg-2.2.7-388-ge140c6d

[email protected] (by NIIBE Yutaka) Mon, 25 Feb 2019 02:47:03 +0100
Newsgroups gmane.comp.encryption.gpg.cvs
Message-ID <[email protected]>
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, master has been updated
       via  e140c6d4f581be1a60a34b67b16430452f3987e8 (commit)
      from  611faf1579a56925994d53eb08e1290a4b3958cf (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 e140c6d4f581be1a60a34b67b16430452f3987e8
Author: NIIBE Yutaka <[email protected]>
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.
    
    --
    
    Picked from libgpg-error commit of:
    	8a9397896fd202dcfb3fb46259e43bc05a0ddd2e
    
    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 <[email protected]>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index feb3133..a819165 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -872,7 +872,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",
@@ -5614,7 +5614,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