diff options
| author | Neal H. Walfield <neal@g10code.com> | 2016-09-01 13:17:06 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@g10code.com> | 2016-09-01 13:17:06 +0200 |
| commit | 00c2850393ecc320f591f511c3534286964780c2 (patch) | |
| tree | 2cf095cee43fb4933a40e175e1cd57d87e1c4c25 /g10 | |
| parent | gpg: Copy the correct digest for use by TOFU. (diff) | |
| download | gnupg2-00c2850393ecc320f591f511c3534286964780c2.tar.xz gnupg2-00c2850393ecc320f591f511c3534286964780c2.zip | |
g10: Remove unused parameter.
* g10/tofu.c (show_statistics): Remove unused parameter sig_exclude.
Update callers.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/tofu.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index de685a60c..14d361b0c 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -2108,7 +2108,7 @@ write_stats_status (estream_t fp, long messages, enum tofu_policy policy, static void show_statistics (tofu_dbs_t dbs, const char *fingerprint, const char *email, const char *user_id, - const char *sig_exclude, estream_t outfp) + estream_t outfp) { char *fingerprint_pp; int rc; @@ -2122,13 +2122,8 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint, "select count (*), min (signatures.time), max (signatures.time)\n" " from signatures\n" " left join bindings on signatures.binding = bindings.oid\n" - " where fingerprint = %Q and email = %Q and sig_digest %s%s%s;", - fingerprint, email, - /* We want either: sig_digest != 'SIG_EXCLUDE' or sig_digest is - not NULL. */ - sig_exclude ? "!= '" : "is not NULL", - sig_exclude ? sig_exclude : "", - sig_exclude ? "'" : ""); + " where fingerprint = %Q and email = %Q;", + fingerprint, email); if (rc) { log_error (_("error reading TOFU database: %s\n"), err); @@ -2598,7 +2593,7 @@ tofu_write_tfs_record (ctrl_t ctrl, estream_t fp, fingerprint = hexfingerprint (pk, NULL, 0); email = email_from_user_id (user_id); - show_statistics (dbs, fingerprint, email, user_id, NULL, fp); + show_statistics (dbs, fingerprint, email, user_id, fp); xfree (email); xfree (fingerprint); @@ -2669,7 +2664,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list, bindings_valid ++; if (may_ask && tl != TRUST_ULTIMATE && tl != TRUST_EXPIRED) - show_statistics (dbs, fingerprint, email, user_id->d, NULL, NULL); + show_statistics (dbs, fingerprint, email, user_id->d, NULL); if (tl == TRUST_NEVER) trust_level = TRUST_NEVER; |