diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2019-02-25 02:44:16 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2019-02-25 02:44:16 +0100 |
| commit | e140c6d4f581be1a60a34b67b16430452f3987e8 (patch) | |
| tree | 2908b96801849afcd6869499497188526a579076 /tests | |
| parent | scd: internal driver: Submit SET_INTERFACE control transfer. (diff) | |
| download | gnupg2-e140c6d4f581be1a60a34b67b16430452f3987e8.tar.xz gnupg2-e140c6d4f581be1a60a34b67b16430452f3987e8.zip | |
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 <gniibe@fsij.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gpgscm/scheme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c index feb313349..a8191657d 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; |