diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/command.c | 18 | ||||
| -rw-r--r-- | agent/findkey.c | 2 | ||||
| -rw-r--r-- | agent/protect-tool.c | 10 |
4 files changed, 19 insertions, 15 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index afaaf5c4b..573a13649 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2003-06-04 Werner Koch <[email protected]> + + Renamed error codes from INVALID to INV and removed _ERROR suffixes. + 2003-06-03 Werner Koch <[email protected]> Changed all error codes in all files to the new libgpg-error scheme. diff --git a/agent/command.c b/agent/command.c index 82d888e05..594b31fed 100644 --- a/agent/command.c +++ b/agent/command.c @@ -155,7 +155,7 @@ cmd_istrusted (ASSUAN_CONTEXT ctx, char *line) return ASSUAN_Not_Trusted; else { - log_error ("command is_trusted failed: %s\n", gnupg_strerror (rc)); + log_error ("command is_trusted failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } } @@ -168,7 +168,7 @@ cmd_listtrusted (ASSUAN_CONTEXT ctx, char *line) { int rc = agent_listtrusted (ctx); if (rc) - log_error ("command listtrusted failed: %s\n", gnupg_strerror (rc)); + log_error ("command listtrusted failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -210,7 +210,7 @@ cmd_marktrusted (ASSUAN_CONTEXT ctx, char *line) rc = agent_marktrusted (ctrl, p, fpr, flag); if (rc) - log_error ("command marktrusted failed: %s\n", gnupg_strerror (rc)); + log_error ("command marktrusted failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -316,7 +316,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line) rc = agent_pksign (ctrl, assuan_get_data_fp (ctx), ignore_cache); if (rc) - log_error ("command pksign failed: %s\n", gnupg_strerror (rc)); + log_error ("command pksign failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -341,7 +341,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line) rc = agent_pkdecrypt (ctrl, value, valuelen, assuan_get_data_fp (ctx)); xfree (value); if (rc) - log_error ("command pkdecrypt failed: %s\n", gnupg_strerror (rc)); + log_error ("command pkdecrypt failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -376,7 +376,7 @@ cmd_genkey (ASSUAN_CONTEXT ctx, char *line) rc = agent_genkey (ctrl, value, valuelen, assuan_get_data_fp (ctx)); xfree (value); if (rc) - log_error ("command genkey failed: %s\n", gnupg_strerror (rc)); + log_error ("command genkey failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -491,7 +491,7 @@ cmd_get_passphrase (ASSUAN_CONTEXT ctx, char *line) } if (rc) - log_error ("command get_passphrase failed: %s\n", gnupg_strerror (rc)); + log_error ("command get_passphrase failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -534,7 +534,7 @@ cmd_learn (ASSUAN_CONTEXT ctx, char *line) rc = agent_handle_learn (has_option (line, "--send")? ctx : NULL); if (rc) - log_error ("command learn failed: %s\n", gnupg_strerror (rc)); + log_error ("command learn failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } @@ -571,7 +571,7 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line) gcry_sexp_release (s_skey); xfree (shadow_info); if (rc) - log_error ("command passwd failed: %s\n", gnupg_strerror (rc)); + log_error ("command passwd failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } diff --git a/agent/findkey.c b/agent/findkey.c index b2ee68513..e6c4ad7f7 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -306,7 +306,7 @@ agent_key_from_file (CTRL ctrl, } } if (rc) - log_error ("get_shadow_info failed: %s\n", gnupg_strerror (rc)); + log_error ("get_shadow_info failed: %s\n", gpg_strerror (rc)); } rc = -1; /* ugly interface: we return an error but keep a value in shadow_info. */ diff --git a/agent/protect-tool.c b/agent/protect-tool.c index d501abd79..20e288779 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -300,7 +300,7 @@ read_and_protect (const char *fname) xfree (key); if (rc) { - log_error ("protecting the key failed: %s\n", gnupg_strerror (rc)); + log_error ("protecting the key failed: %s\n", gpg_strerror (rc)); return; } @@ -335,7 +335,7 @@ read_and_unprotect (const char *fname) xfree (key); if (rc) { - log_error ("unprotecting the key failed: %s\n", gnupg_strerror (rc)); + log_error ("unprotecting the key failed: %s\n", gpg_strerror (rc)); return; } @@ -371,7 +371,7 @@ read_and_shadow (const char *fname) xfree (key); if (rc) { - log_error ("shadowing the key failed: %s\n", gnupg_strerror (rc)); + log_error ("shadowing the key failed: %s\n", gpg_strerror (rc)); return; } resultlen = gcry_sexp_canon_len (result, 0, NULL,NULL); @@ -407,7 +407,7 @@ show_shadow_info (const char *fname) xfree (key); if (rc) { - log_error ("get_shadow_info failed: %s\n", gnupg_strerror (rc)); + log_error ("get_shadow_info failed: %s\n", gpg_strerror (rc)); return; } infolen = gcry_sexp_canon_len (info, 0, NULL,NULL); @@ -663,7 +663,7 @@ import_p12_file (const char *fname) xfree (key); if (rc) { - log_error ("protecting the key failed: %s\n", gnupg_strerror (rc)); + log_error ("protecting the key failed: %s\n", gpg_strerror (rc)); return; } |