summaryrefslogtreecommitdiff
path: root/src/global.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2015-10-14 11:52:40 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2015-10-14 11:52:40 +0900
commit813565a07ca575c87e1252c6ed26018653ecd338 (patch)
tree6be01a85707031937e9967babfcde92b988d4918 /src/global.c
parentfa94b6111948a614ebdcb67f7942eced8b84c579 (diff)
downloadlibgcrypt-813565a07ca575c87e1252c6ed26018653ecd338.tar.gz
Fix gpg_error_t and gpg_err_code_t confusion.
* src/gcrypt-int.h (_gcry_sexp_extract_param): Revert the change. * cipher/dsa.c (dsa_check_secret_key): Ditto. * src/sexp.c (_gcry_sexp_extract_param): Return gpg_err_code_t. * src/gcrypt-int.h (_gcry_err_make_from_errno) (_gcry_error_from_errno): Return gpg_error_t. * cipher/cipher.c (_gcry_cipher_open_internal) (_gcry_cipher_ctl, _gcry_cipher_ctl): Don't use gcry_error. * src/global.c (_gcry_vcontrol): Likewise. * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_genkey): Use gpg_err_code_from_syserror. * cipher/mac.c (mac_reset, mac_setkey, mac_setiv, mac_write) (mac_read, mac_verify): Return gcry_err_code_t. * cipher/rsa-common.c (mgf1): Use gcry_err_code_t for ERR. * src/visibility.c (gcry_error_from_errno): Return gpg_error_t. -- Reverting a part of 73374fdd and fix _gcry_sexp_extract_param return type, instead. Fix similar coding mistakes, throughout.
Diffstat (limited to 'src/global.c')
-rw-r--r--src/global.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/global.c b/src/global.c
index 4e8df86d..22903930 100644
--- a/src/global.c
+++ b/src/global.c
@@ -490,7 +490,7 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr)
_gcry_set_preferred_rng_type (0);
rc = _gcry_rndegd_set_socket_name (va_arg (arg_ptr, const char *));
#else
- rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
+ rc = GPG_ERR_NOT_SUPPORTED;
#endif
break;