From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 4 Jan 2017 13:31:06 +0000 (-0500)
Subject: g10: avoid warning when --disable-tofu
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=gnupg2.git;a=commitdiff_plain;h=60161fbb21e1aa29c47ef6aba12373920bbba0d5

g10: avoid warning when --disable-tofu

If configured with --disable-tofu, we see compiler warnings about an
unused variable.  This should remove those warnings.

(cherry picked from commit 38671cfe5a2a40bb991619f4cb992c42b5f1e8cd)

Gbp-Pq: Name 0022-g10-avoid-warning-when-disable-tofu.patch
---

diff --git a/g10/trustdb.c b/g10/trustdb.c
index d402cb2..c113b7e 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1002,9 +1002,9 @@ tdb_get_validity_core (ctrl_t ctrl,
   ulong recno;
 #ifdef USE_TOFU
   unsigned int tofu_validity = TRUST_UNKNOWN;
+  int free_kb = 0;
 #endif
   unsigned int validity = TRUST_UNKNOWN;
-  int free_kb = 0;
 
   if (kb && pk)
     log_assert (keyid_cmp (pk_main_keyid (pk),