diff options
| author | Werner Koch <[email protected]> | 2014-11-02 15:31:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-11-02 15:31:30 +0000 |
| commit | 440e8f517008107a9fe1b72cb659b97b7d840de6 (patch) | |
| tree | b3e8e900f8aa2496907199923a0c03bc3bdc4a98 /g10/keydb.c | |
| parent | gpg: Do not show an useless passphrase prompt in batch mode. (diff) | |
| download | gnupg-440e8f517008107a9fe1b72cb659b97b7d840de6.tar.gz gnupg-440e8f517008107a9fe1b72cb659b97b7d840de6.zip | |
gpg: Minor cleanup for key listing related code.
* g10/getkey.c (get_pubkey_next): Divert to getkey_next.
(get_pubkey_end): Move code to getkey_end.
* g10/keydb.c (keydb_search_reset): Add a debug statement.
(dump_search_desc): Add arg HD and print the handle.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keydb.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index a2cab18e2..bafae18a1 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -603,8 +603,8 @@ keydb_release (KEYDB_HANDLE hd) /* Set a flag on handle to not use cached results. This is required - for updating a keyring. Fixme: Using a new parameter for keydb_new - might be a better solution. */ + for updating a keyring and for key listins. Fixme: Using a new + parameter for keydb_new might be a better solution. */ void keydb_disable_caching (KEYDB_HANDLE hd) { @@ -1328,6 +1328,9 @@ keydb_search_reset (KEYDB_HANDLE hd) if (DBG_CLOCK) log_clock ("keydb_search_reset"); + if (DBG_CACHE) + log_debug ("keydb_search: reset (hd=%p)", hd); + hd->skipped_long_blobs = 0; hd->current = 0; hd->found = -1; @@ -1351,7 +1354,8 @@ keydb_search_reset (KEYDB_HANDLE hd) static void -dump_search_desc (const char *text, KEYDB_SEARCH_DESC *desc, size_t ndesc) +dump_search_desc (KEYDB_HANDLE hd, const char *text, + KEYDB_SEARCH_DESC *desc, size_t ndesc) { int n; const char *s; @@ -1382,7 +1386,7 @@ dump_search_desc (const char *text, KEYDB_SEARCH_DESC *desc, size_t ndesc) default: s = "?"; break; } if (!n) - log_debug ("%s: mode=%s", text, s); + log_debug ("%s: mode=%s (hd=%p)", text, s, hd); else log_debug ("%*s mode=%s", (int)strlen (text), "", s); if (desc[n].mode == KEYDB_SEARCH_MODE_LONG_KID) @@ -1418,7 +1422,7 @@ keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc, log_clock ("keydb_search enter"); if (DBG_CACHE) - dump_search_desc ("keydb_search", desc, ndesc); + dump_search_desc (hd, "keydb_search", desc, ndesc); if (!hd->no_caching && ndesc == 1 |