From 13ec74481ce0137f7a60b3256cc4840073c77efa Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 7 Feb 2012 10:15:57 +0100 Subject: common: Replace macro based function calls by using DEFAULT_ERRSOURCE. * common/dns-cert.h (get_dns_cert): Remove macro. * common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert. Replace arg ERRSOURCE by global DEFAULT_ERRSOURCE. * common/http.h (http_parse_uri, http_raw_connect, http_open) (http_open_document, http_wait_response): Remove macros. * common/http.c (_http_parse_uri, _http_raw_connect, _http_open) (_http_open_document, _http_wait_response): Remove underscore from symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE. * common/ssh-utils.h (ssh_get_fingerprint) (ssh_get_fingerprint_string): Remove macros. * common/ssh-utils.h (_ssh_get_fingerprint) (_ssh_get_fingerprint_string): Remove underscore from symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE. * common/tlv.h (parse_ber_header, parse_sexp): Remove macros. * common/tlv.c: Include util.h. (_parse_ber_header, _parse_sexp): Remove underscore from symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE. --- common/ssh-utils.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'common/ssh-utils.h') diff --git a/common/ssh-utils.h b/common/ssh-utils.h index 1813c8b51..10e2ac2ad 100644 --- a/common/ssh-utils.h +++ b/common/ssh-utils.h @@ -21,16 +21,9 @@ #define GNUPG_COMMON_SSH_UTILS_H -gpg_error_t _ssh_get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len, - gpg_err_source_t errsource); -#define ssh_get_fingerprint(a,b,c) \ - _ssh_get_fingerprint ((a), (b), (c), GPG_ERR_SOURCE_DEFAULT) - -gpg_error_t _ssh_get_fingerprint_string (gcry_sexp_t key, char **r_fprstr, - gpg_err_source_t errsource); -#define ssh_get_fingerprint_string(a,b) \ - _ssh_get_fingerprint_string ((a), (b), GPG_ERR_SOURCE_DEFAULT) +gpg_error_t ssh_get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len); +gpg_error_t ssh_get_fingerprint_string (gcry_sexp_t key, char **r_fprstr); #endif /*GNUPG_COMMON_SSH_UTILS_H*/ -- cgit v1.2.3