security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Replace remaining old error code macros by GPG_ERR_.

Browse source 
* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
gpg_strerror.
(G10ERR_): Remove all macros and change all occurrences by their
GPG_ERR_ counterparts.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-01-22 12:06:11 +01:00
parent a23c30fb59
commit 11142e0ad7
32 changed files with 362 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

14
g10/keylist.c
View file

@ -456,7 +456,7 @@ list_all (int secret, int mark_secret)
if (rc)
{
if (gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
log_error ("keydb_search_first failed: %s\n", g10_errstr (rc));
log_error ("keydb_search_first failed: %s\n", gpg_strerror (rc));
goto leave;
}
@ -466,7 +466,7 @@ list_all (int secret, int mark_secret)
rc = keydb_get_keyblock (hd, &keyblock);
if (rc)
{
log_error ("keydb_get_keyblock failed: %s\n", g10_errstr (rc));
log_error ("keydb_get_keyblock failed: %s\n", gpg_strerror (rc));
goto leave;
}
@ -503,7 +503,7 @@ list_all (int secret, int mark_secret)
while (!(rc = keydb_search_next (hd)));
es_fflush (es_stdout);
if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
log_error ("keydb_search_next failed: %s\n", g10_errstr (rc));
log_error ("keydb_search_next failed: %s\n", gpg_strerror (rc));
if (keydb_get_skipped_counter (hd))
log_info (_("Warning: %lu key(s) skipped due to their large size\n"),
keydb_get_skipped_counter (hd));
@ -542,7 +542,7 @@ list_one (strlist_t names, int secret, int mark_secret)
rc = getkey_bynames (&ctx, NULL, names, secret, &keyblock);
if (rc)
{
log_error ("error reading key: %s\n", g10_errstr (rc));
log_error ("error reading key: %s\n", gpg_strerror (rc));
get_pubkey_end (ctx);
return;
}
@ -586,7 +586,7 @@ locate_one (ctrl_t ctrl, strlist_t names)
if (rc)
{
if (gpg_err_code (rc) != GPG_ERR_NO_PUBKEY)
log_error ("error reading key: %s\n", g10_errstr (rc));
log_error ("error reading key: %s\n", gpg_strerror (rc));
}
else
{
@ -1094,7 +1094,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr, void *opaque)
es_fprintf (es_stdout, " %s", expirestr_from_sig (sig));
es_fprintf (es_stdout, " ");
if (sigrc == '%')
es_fprintf (es_stdout, "[%s] ", g10_errstr (rc));
es_fprintf (es_stdout, "[%s] ", gpg_strerror (rc));
else if (sigrc == '?')
;
else if (!opt.fast_list_mode)
@ -1477,7 +1477,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr)
es_fprintf (es_stdout, ":");
if (sigrc == '%')
es_fprintf (es_stdout, "[%s] ", g10_errstr (rc));
es_fprintf (es_stdout, "[%s] ", gpg_strerror (rc));
else if (sigrc == '?')
;
else if (!opt.fast_list_mode)