summaryrefslogtreecommitdiffstats
path: root/g10/gpgv.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-01-22 12:06:11 +0100
committerWerner Koch <wk@gnupg.org>2015-01-22 12:06:11 +0100
commit11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993 (patch)
tree0dd1a333374407a96a3258b4cb46a5e634e683ae /g10/gpgv.c
parentgpg: Remove an unused variable. (diff)
downloadgnupg2-11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993.tar.xz
gnupg2-11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993.zip
gpg: Replace remaining old error code macros by GPG_ERR_.
* 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>
Diffstat (limited to 'g10/gpgv.c')
-rw-r--r--g10/gpgv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 7bba53501..f09b5da87 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -214,7 +214,7 @@ main( int argc, char **argv )
ctrl = xcalloc (1, sizeof *ctrl);
if ((rc = verify_signatures (ctrl, argc, argv)))
- log_error("verify signatures failed: %s\n", g10_errstr(rc) );
+ log_error("verify signatures failed: %s\n", gpg_strerror (rc) );
xfree (ctrl);
@@ -378,7 +378,7 @@ get_session_key (PKT_pubkey_enc *k, DEK *dek)
{
(void)k;
(void)dek;
- return G10ERR_GENERAL;
+ return GPG_ERR_GENERAL;
}
/* Stub: */
@@ -387,7 +387,7 @@ get_override_session_key (DEK *dek, const char *string)
{
(void)dek;
(void)string;
- return G10ERR_GENERAL;
+ return GPG_ERR_GENERAL;
}
/* Stub: */
@@ -398,7 +398,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
(void)procctx;
(void)ed;
(void)dek;
- return G10ERR_GENERAL;
+ return GPG_ERR_GENERAL;
}
@@ -419,7 +419,7 @@ check_secret_key (PKT_public_key *pk, int n)
{
(void)pk;
(void)n;
- return G10ERR_GENERAL;
+ return GPG_ERR_GENERAL;
}
/* Stub: