diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2015-10-13 12:28:00 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2015-10-13 12:28:00 +0900 |
| commit | 73374fdd27c7ba28b19f9672c68a6f5b72252fe5 (patch) | |
| tree | 677590debae3a5ece5af31640c9f407b33675536 | |
| parent | 3a3d5410cc83f7069c7cb1ab384905f382292d32 (diff) | |
| download | libgcrypt-73374fdd27c7ba28b19f9672c68a6f5b72252fe5.tar.gz | |
Fix declaration of return type.
* src/gcrypt-int.h (_gcry_sexp_extract_param): Return gpg_error_t.
* cipher/dsa.c (dsa_generate): Fix call to _gcry_sexp_extract_param.
* src/g10lib.h (_gcry_vcontrol): Return gcry_err_code_t.
* src/visibility.c (gcry_mpi_snatch): Fix call to _gcry_mpi_snatch.
--
GnuPG-bug-id: 2074
| -rw-r--r-- | cipher/dsa.c | 8 | ||||
| -rw-r--r-- | src/g10lib.h | 2 | ||||
| -rw-r--r-- | src/gcrypt-int.h | 8 | ||||
| -rw-r--r-- | src/visibility.c | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/cipher/dsa.c b/cipher/dsa.c index 09cd9693..723f6909 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -968,12 +968,14 @@ dsa_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) static gcry_err_code_t dsa_check_secret_key (gcry_sexp_t keyparms) { + gcry_error_t err; gcry_err_code_t rc; DSA_secret_key sk = {NULL, NULL, NULL, NULL, NULL}; - rc = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", - &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, - NULL); + err = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", + &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, + NULL); + rc = gpg_err_code (err); if (rc) goto leave; diff --git a/src/g10lib.h b/src/g10lib.h index 50a08ec8..d1f94268 100644 --- a/src/g10lib.h +++ b/src/g10lib.h @@ -92,7 +92,7 @@ /*-- src/global.c -*/ int _gcry_global_is_operational (void); -gcry_error_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr); +gcry_err_code_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr); void _gcry_check_heap (const void *a); int _gcry_get_debug_flag (unsigned int mask); diff --git a/src/gcrypt-int.h b/src/gcrypt-int.h index 29d4fd3b..ea3c8d53 100644 --- a/src/gcrypt-int.h +++ b/src/gcrypt-int.h @@ -329,10 +329,10 @@ void *_gcry_sexp_nth_buffer (const gcry_sexp_t list, int number, size_t *rlength); char *_gcry_sexp_nth_string (gcry_sexp_t list, int number); gcry_mpi_t _gcry_sexp_nth_mpi (gcry_sexp_t list, int number, int mpifmt); -gpg_err_code_t _gcry_sexp_extract_param (gcry_sexp_t sexp, - const char *path, - const char *list, - ...) _GCRY_GCC_ATTR_SENTINEL(0); +gpg_error_t _gcry_sexp_extract_param (gcry_sexp_t sexp, + const char *path, + const char *list, + ...) _GCRY_GCC_ATTR_SENTINEL(0); #define sexp_new(a, b, c, d) _gcry_sexp_new ((a), (b), (c), (d)) #define sexp_create(a, b, c, d, e) _gcry_sexp_create ((a), (b), (c), (d), (e)) diff --git a/src/visibility.c b/src/visibility.c index fa23e53c..3e1f28bd 100644 --- a/src/visibility.c +++ b/src/visibility.c @@ -292,7 +292,7 @@ gcry_mpi_copy (const gcry_mpi_t a) void gcry_mpi_snatch (gcry_mpi_t w, const gcry_mpi_t u) { - return _gcry_mpi_snatch (w, u); + _gcry_mpi_snatch (w, u); } gcry_mpi_t |