From 0fe99d69f0c8c6d882305d03032bbdaaa1f06954 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 1 May 2023 11:39:24 +0900 Subject: dirmngr: Fix API of functions wrt their error type. * dirmngr/crlcache.h (fakecrl_isvalid): Fix return type. * dirmngr/http.c (parse_response): Fix return type to gpg_error_t, modifying the function implementation. -- Signed-off-by: NIIBE Yutaka --- dirmngr/http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dirmngr/http.c') diff --git a/dirmngr/http.c b/dirmngr/http.c index 20f71f61b..b4c501736 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -2555,7 +2555,7 @@ http_get_header_names (http_t hd) * Parse the response from a server. * Returns: Errorcode and sets some files in the handle */ -static gpg_err_code_t +static gpg_error_t parse_response (http_t hd) { char *line, *p, *p2; @@ -2579,11 +2579,11 @@ parse_response (http_t hd) len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen); line = hd->buffer; if (!line) - return gpg_err_code_from_syserror (); /* Out of core. */ + return gpg_error_from_syserror (); /* Out of core. */ if (!maxlen) - return GPG_ERR_TRUNCATED; /* Line has been truncated. */ + return gpg_error (GPG_ERR_TRUNCATED); /* Line has been truncated. */ if (!len) - return GPG_ERR_EOF; + return gpg_error (GPG_ERR_EOF); if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP)) log_debug_string (line, "http.c:response:\n"); @@ -2623,10 +2623,10 @@ parse_response (http_t hd) len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen); line = hd->buffer; if (!line) - return gpg_err_code_from_syserror (); /* Out of core. */ + return gpg_error_from_syserror (); /* Out of core. */ /* Note, that we can silently ignore truncated lines. */ if (!len) - return GPG_ERR_EOF; + return gpg_error (GPG_ERR_EOF); /* Trim line endings of empty lines. */ if ((*line == '\r' && line[1] == '\n') || *line == '\n') *line = 0; @@ -2637,7 +2637,7 @@ parse_response (http_t hd) { gpg_err_code_t ec = store_header (hd, line); if (ec) - return ec; + return gpg_error (ec); } } while (len && *line); -- cgit v1.2.3