chiark
/
gitweb
/
~ian
/
gnupg2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb8eb2a
)
g10: avoid warning when --disable-tofu
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 4 Jan 2017 13:31:06 +0000
(08:31 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Tue, 3 Jan 2017 20:39:52 +0000
(20:39 +0000)
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
g10/trustdb.c
patch
|
blob
|
history
diff --git
a/g10/trustdb.c
b/g10/trustdb.c
index d402cb2baa7b0d9b263799baaa4371d0ed997414..c113b7e9ddeb0f5e54e1b760c5da043554cf9202 100644
(file)
--- 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),