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@fsij.org>
(cherry picked from commit 8161afb9dddaba839be92fbe9d85c05235eda825)

Gbp-Pq: Topic from-2.2.14
Gbp-Pq: Name gpgscm-Build-well-even-if-NDEBUG-defined.patch

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index b188e36ce2a61a8169097c1de9e8f08a938b5e20..b4960b0a371e32eed3b2c0541b21af75287b0350 100644 (file)
--- 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;