From fa3b80ce7d6879a327a4dd57c86209f0b975c295 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:10:27 +0200 Subject: Fix -Wcast-function-type compiler warnings diff --git a/plugins/check_curl.c b/plugins/check_curl.c index d0871c4..d3d0199 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c @@ -239,10 +239,10 @@ void print_help (void); void print_usage (void); void print_curl_version (void); int curlhelp_initwritebuffer (curlhelp_write_curlbuf*); -int curlhelp_buffer_write_callback (void*, size_t , size_t , void*); +size_t curlhelp_buffer_write_callback(void*, size_t , size_t , void*); void curlhelp_freewritebuffer (curlhelp_write_curlbuf*); int curlhelp_initreadbuffer (curlhelp_read_curlbuf *, const char *, size_t); -int curlhelp_buffer_read_callback (void *, size_t , size_t , void *); +size_t curlhelp_buffer_read_callback(void *, size_t , size_t , void *); void curlhelp_freereadbuffer (curlhelp_read_curlbuf *); curlhelp_ssl_library curlhelp_get_ssl_library (); const char* curlhelp_get_ssl_library_string (curlhelp_ssl_library); @@ -2171,8 +2171,7 @@ curlhelp_initwritebuffer (curlhelp_write_curlbuf *buf) return 0; } -int -curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *stream) +size_t curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *stream) { curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream; @@ -2192,8 +2191,7 @@ curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *s return (int)(size * nmemb); } -int -curlhelp_buffer_read_callback (void *buffer, size_t size, size_t nmemb, void *stream) +size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream) { curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream; -- cgit v0.10-9-g596f From 928e1c7496a508223ef230fbf50132b4c0f29969 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:11:07 +0200 Subject: Whitespace fixes diff --git a/plugins/check_curl.c b/plugins/check_curl.c index d3d0199..da578b5 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c @@ -485,7 +485,7 @@ check_http (void) /* register cleanup function to shut down libcurl properly */ atexit (cleanup); - + if (verbose >= 1) handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE"); @@ -805,7 +805,7 @@ check_http (void) handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE"); } } - + /* cookie handling */ if (cookie_jar_file != NULL) { handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR"); @@ -1167,7 +1167,7 @@ GOT_FIRST_CERT: else msg[strlen(msg)-3] = '\0'; } - + /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */ die (result, "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s", state_text(result), string_statuscode (status_line.http_major, status_line.http_minor), @@ -1694,7 +1694,7 @@ process_arguments (int argc, char **argv) else { max_depth = atoi (optarg); } - break; + break; case 'f': /* onredirect */ if (!strcmp (optarg, "ok")) onredirect = STATE_OK; -- cgit v0.10-9-g596f