From 1876dc1bf0af64defe2aeee52c7e2a036ef3a361 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Mon, 23 Oct 2017 10:45:19 -0700 Subject: [PATCH] Add curl error wrapper function To ensure that generic curl error messages are printed uniformly, add a wrapper function. Signed-off-by: Patrick McCarty --- src/curl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/curl.c b/src/curl.c index 4a3e2043..8e67555b 100644 --- a/src/curl.c +++ b/src/curl.c @@ -57,6 +57,12 @@ static char *capath; static char **fallback_capaths; static char fallback_capaths_no; +/* Pretty print curl return status */ +static void swupd_curl_strerror(CURLcode curl_ret) +{ + fprintf(stderr, "Curl error: (%d) %s\n", curl_ret, curl_easy_strerror(curl_ret)); +} + int swupd_curl_init(void) { CURLcode curl_ret; @@ -170,7 +176,7 @@ int swupd_curl_check_network(void) case CURLE_SSL_CACERT: break; default: - fprintf(stderr, "ERROR: (%d) %s\n", curl_ret, curl_easy_strerror(curl_ret)); + swupd_curl_strerror(curl_ret); /* something bad, stop */ goto cleanup; } @@ -456,7 +462,7 @@ exit: err = -1; break; default: - fprintf(stderr, "Curl error: %s\n", curl_easy_strerror(curl_ret)); + swupd_curl_strerror(curl_ret); err = -1; break; }