From 6b645f91f6ebe10cfe7dabb93c42af820977e53e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 19 Mar 2026 22:43:56 +0100 Subject: [PATCH] mk-lib1521.pl: fix 4 callback function types passed to setopt Silencing these warnings (seen on Solaris 11 SPARC GCC 4.9.2 + OpenCSW): ``` lib1521.c: In function 'test_lib1521': /include/curl/typecheck-gcc.h:93:13: warning: call to 'Wcurl_easy_setopt_err_conv_cb' declared with attribute warning: curl_easy_setopt expects a curl_conv_callback argument curl_easy_setopt(curl, CURLOPT_CONV_FROM_NETWORK_FUNCTION, curl_easy_setopt(curl, CURLOPT_CONV_TO_NETWORK_FUNCTION, curl_easy_setopt(curl, CURLOPT_CONV_FROM_UTF8_FUNCTION, /include/curl/typecheck-gcc.h:123:13: warning: call to 'Wcurl_easy_setopt_err_interleave_cb' declared with attribute warning: curl_easy_setopt expects a curl_interleave_callback argument curl_easy_setopt(curl, CURLOPT_INTERLEAVEFUNCTION, ``` Ref: https://curl.se/dev/log.cgi?id=20260319160651-1785427#prob2 Follow-up to de0adda78c4c3ce6d221beefdcd4492412dcf287 Closes #21017 --- tests/libtest/mk-lib1521.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl index c94bab085a..a6a816820b 100755 --- a/tests/libtest/mk-lib1521.pl +++ b/tests/libtest/mk-lib1521.pl @@ -306,6 +306,12 @@ static curl_hstsread_callback hstsreadcb; static curl_hstswrite_callback hstswritecb; static curl_resolver_start_callback resolver_start_cb; static curl_prereq_callback prereqcb; +static curl_conv_callback conv_from_network_cb; +static curl_conv_callback conv_to_network_cb; +static curl_conv_callback conv_from_utf8_cb; +typedef size_t (*interleave_callback)(void *ptr, size_t size, size_t nmemb, + void *userdata); +static interleave_callback interleavecb; /* long options that are okay to return CURLE_BAD_FUNCTION_ARGUMENT */ @@ -355,10 +361,6 @@ static CURLcode test_lib1521(const char *URL) CURL *dep = NULL; CURLSH *share = NULL; char errorbuffer[CURL_ERROR_SIZE]; - void *conv_from_network_cb = NULL; - void *conv_to_network_cb = NULL; - void *conv_from_utf8_cb = NULL; - void *interleavecb = NULL; const char *stringpointerextra = "moooo"; struct curl_slist *slist = NULL; struct curl_httppost *httppost = NULL;