diff options
| author | Werner Koch <[email protected]> | 2011-04-29 13:10:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-04-29 13:10:36 +0000 |
| commit | c36deeea8bb06ed62b33cfd23f57ea3bba8eddde (patch) | |
| tree | da8728c09089706dab6e44cf5c72bf9d00e05585 /g10/keylist.c | |
| parent | Fix import stat counter and abort secret key import on merge-only error case. (diff) | |
| parent | Re-indentation of keydb.c and error code changes. (diff) | |
| download | gnupg-c36deeea8bb06ed62b33cfd23f57ea3bba8eddde.tar.gz gnupg-c36deeea8bb06ed62b33cfd23f57ea3bba8eddde.zip | |
Merge branch 'wk-gpg-keybox'
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index db7467d3d..f6b8cffb2 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -434,12 +434,12 @@ list_all (int secret) hd = keydb_new (); if (!hd) - rc = G10ERR_GENERAL; + rc = gpg_error (GPG_ERR_GENERAL); else rc = keydb_search_first (hd); if (rc) { - if (rc != -1) + if (gpg_err_code (rc) != GPG_ERR_NOT_FOUND) log_error ("keydb_search_first failed: %s\n", g10_errstr (rc)); goto leave; } @@ -479,7 +479,7 @@ list_all (int secret) keyblock = NULL; } while (!(rc = keydb_search_next (hd))); - if (rc && rc != -1) + if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND) log_error ("keydb_search_next failed: %s\n", g10_errstr (rc)); if (opt.check_sigs && !opt.with_colons) |