romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-27 17:28:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

libtests: use FMT_SOCKET_T, drop more casts

Browse source 
Follow-up to 37913c01a5 #18106

Closes #18142
This commit is contained in:
Viktor Szakats 2025-08-02 02:01:20 +02:00
parent 1644a49ab8
commit c2fed8c669
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
21 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/libtest/first.c
View file

@ -178,13 +178,13 @@ CURLcode ws_recv_pong(CURL *curl, const char *expected_payload)
char buffer[256];
CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta);
if(result) {
curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %zd\n",
curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %zu\n",
result, rlen);
return result;
}
if(!(meta->flags & CURLWS_PONG)) {
curl_mfprintf(stderr, "recv_pong: wrong frame, got %zd bytes rflags %x\n",
curl_mfprintf(stderr, "recv_pong: wrong frame, got %zu bytes rflags %x\n",
rlen, meta->flags);
return CURLE_RECV_ERROR;
}

4
tests/libtest/lib1156.c
View file

@ -98,12 +98,12 @@ static int onetest(CURL *curl, const char *url, const struct testparams *p,
test_setopt(curl, CURLOPT_VERBOSE, 1L);
test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME) ? 3L : 0L);
test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME) ?
"3-1000000": (char *) NULL);
"3-1000000": (char *)NULL);
test_setopt(curl, CURLOPT_FAILONERROR, (p->flags & F_FAIL) ? 1L : 0L);
hasbody = 0;
res = curl_easy_perform(curl);
if(res != p->result) {
curl_mprintf("%zd: bad error code (%d): resume=%s, fail=%s, http416=%s, "
curl_mprintf("%zu: bad error code (%d): resume=%s, fail=%s, http416=%s, "
"content-range=%s, expected=%d\n", num, res,
(p->flags & F_RESUME) ? "yes": "no",
(p->flags & F_FAIL) ? "yes": "no",

4
tests/libtest/lib1485.c
View file

@ -59,8 +59,8 @@ static size_t t1485_header_callback(char *ptr, size_t size, size_t nmemb,
if(st->http_status >= 200 && st->http_status < 300) {
result = curl_easy_getinfo(st->easy, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T,
&clen);
curl_mfprintf(stderr, "header_callback, info Content-Length: %ld, %d\n",
(long)clen, result);
curl_mfprintf(stderr, "header_callback, info Content-Length: "
"%" CURL_FORMAT_CURL_OFF_T ", %d\n", clen, result);
if(result) {
st->result = result;
return CURLE_WRITE_ERROR;

6
tests/libtest/lib1509.c
View file

@ -28,7 +28,7 @@
size_t WriteOutput(char *ptr, size_t size, size_t nmemb, void *stream);
size_t WriteHeader(char *ptr, size_t size, size_t nmemb, void *stream);
static unsigned long realHeaderSize = 0;
static size_t realHeaderSize = 0;
static CURLcode test_lib1509(const char *URL)
{
@ -70,7 +70,7 @@ static CURLcode test_lib1509(const char *URL)
}
curl_mprintf("header length is ........: %ld\n", headerSize);
curl_mprintf("header length should be..: %lu\n", realHeaderSize);
curl_mprintf("header length should be..: %zu\n", realHeaderSize);
test_cleanup:
@ -91,7 +91,7 @@ size_t WriteHeader(char *ptr, size_t size, size_t nmemb, void *stream)
(void)ptr;
(void)stream;
realHeaderSize += curlx_uztoul(size * nmemb);
realHeaderSize += size * nmemb;
return nmemb * size;
}

3
tests/libtest/lib1541.c
View file

@ -34,11 +34,10 @@ struct t1541_transfer_status {
#define KN(a) a, #a
static int t1541_geterr(const char *name, CURLcode val, int lineno)
static void t1541_geterr(const char *name, CURLcode val, int lineno)
{
curl_mprintf("CURLINFO_%s returned %d, \"%s\" on line %d\n",
name, val, curl_easy_strerror(val), lineno);
return (int)val;
}
static void report_time(const char *key, const char *where, curl_off_t time,

4
tests/libtest/lib1948.c
View file

@ -25,7 +25,7 @@
typedef struct
{
char *buf;
const char *buf;
size_t len;
} put_buffer;
@ -55,7 +55,7 @@ static CURLcode test_lib1948(const char *URL)
easy_setopt(curl, CURLOPT_UPLOAD, 1L);
easy_setopt(curl, CURLOPT_HEADER, 1L);
easy_setopt(curl, CURLOPT_READFUNCTION, put_callback);
pbuf.buf = (char *)CURL_UNCONST(testput);
pbuf.buf = testput;
pbuf.len = strlen(testput);
easy_setopt(curl, CURLOPT_READDATA, &pbuf);
easy_setopt(curl, CURLOPT_INFILESIZE, (long)strlen(testput));

5
tests/libtest/lib2032.c
View file

@ -67,8 +67,9 @@ static size_t callback(char *ptr, size_t size, size_t nmemb, void *data)
else if(sock != ntlm_sockets[idx]) {
/* An easy handle with a socket different to previously
tracked one, log and fail right away. Known bug #37. */
curl_mfprintf(stderr, "Handle %d started on socket %d and moved to %d\n",
curlx_sztosi(idx), (int)ntlm_sockets[idx], (int)sock);
curl_mfprintf(stderr, "Handle %zd started on socket %" FMT_SOCKET_T
" and moved to %" FMT_SOCKET_T "\n",
idx, ntlm_sockets[idx], sock);
ntlmcb_res = TEST_ERR_MAJOR_BAD;
return failure;
}

2
tests/libtest/lib2304.c
View file

@ -33,7 +33,7 @@ static CURLcode recv_any(CURL *curl)
if(result)
return result;
curl_mfprintf(stderr, "recv_any: got %u bytes rflags %x\n", (int)rlen,
curl_mfprintf(stderr, "recv_any: got %zu bytes rflags %x\n", rlen,
meta->flags);
return CURLE_OK;
}

3
tests/libtest/lib2405.c
View file

@ -340,8 +340,7 @@ static CURLcode empty_multi_test(void)
/* calling curl_multi_waitfds() on multi handle with added easy handle. */
easy_init(easy);
if(set_easy((char *)CURL_UNCONST("http://example.com"), easy,
TEST_USE_HTTP1) != CURLE_OK)
if(set_easy("http://example.com", easy, TEST_USE_HTTP1) != CURLE_OK)
goto test_cleanup;
multi_add_handle(multi, easy);

2
tests/libtest/lib3207.c
View file

@ -80,7 +80,7 @@ static CURL_THREAD_RETURN_T CURL_STDCALL test_thread(void *ptr)
for(i = 0; i < PER_THREAD_SIZE; i++) {
CURL *curl = curl_easy_init();
if(curl) {
curl_easy_setopt(curl, CURLOPT_URL, (char *)CURL_UNCONST(ctx->URL));
curl_easy_setopt(curl, CURLOPT_URL, ctx->URL);
/* use the share object */
curl_easy_setopt(curl, CURLOPT_SHARE, ctx->share);

4
tests/libtest/lib506.c
View file

@ -66,7 +66,7 @@ static void t506_test_lock(CURL *handle, curl_lock_data data,
locknum = 2;
break;
default:
curl_mfprintf(stderr, "lock: no such data: %d\n", (int)data);
curl_mfprintf(stderr, "lock: no such data: %d\n", data);
return;
}
@ -102,7 +102,7 @@ static void t506_test_unlock(CURL *handle, curl_lock_data data, void *useptr)
locknum = 2;
break;
default:
curl_mfprintf(stderr, "unlock: no such data: %d\n", (int)data);
curl_mfprintf(stderr, "unlock: no such data: %d\n", data);
return;
}

26
tests/libtest/lib530.c
View file

@ -75,7 +75,8 @@ static void t530_removeFd(struct t530_Sockets *sockets, curl_socket_t fd,
int i;
if(mention)
curl_mfprintf(stderr, "%s remove socket fd %d\n", t530_tag(), (int)fd);
curl_mfprintf(stderr, "%s remove socket fd %" FMT_SOCKET_T "\n",
t530_tag(), fd);
for(i = 0; i < sockets->count; ++i) {
if(sockets->sockets[i] == fd) {
@ -98,8 +99,8 @@ static int t530_addFd(struct t530_Sockets *sockets, curl_socket_t fd,
* To ensure we only have each file descriptor once, we remove it then add
* it again.
*/
curl_mfprintf(stderr, "%s add socket fd %d for %s\n",
t530_tag(), (int)fd, what);
curl_mfprintf(stderr, "%s add socket fd %" FMT_SOCKET_T " for %s\n",
t530_tag(), fd, what);
t530_removeFd(sockets, fd, 0);
/*
* Allocate array storage when required.
@ -214,7 +215,7 @@ static int t530_checkForCompletion(CURLM *curl, int *success)
return result;
}
static int t530_getMicroSecondTimeout(struct curltime *timeout)
static ssize_t t530_getMicroSecondTimeout(struct curltime *timeout)
{
struct curltime now;
ssize_t result;
@ -224,7 +225,7 @@ static int t530_getMicroSecondTimeout(struct curltime *timeout)
if(result < 0)
result = 0;
return curlx_sztosi(result);
return result;
}
/**
@ -249,8 +250,8 @@ static void t530_updateFdSet(struct t530_Sockets *sockets, fd_set* fdset,
}
}
static int socket_action(CURLM *curl, curl_socket_t s, int evBitmask,
const char *info)
static CURLMcode socket_action(CURLM *curl, curl_socket_t s, int evBitmask,
const char *info)
{
int numhandles = 0;
CURLMcode result = curl_multi_socket_action(curl, s, evBitmask, &numhandles);
@ -258,17 +259,18 @@ static int socket_action(CURLM *curl, curl_socket_t s, int evBitmask,
curl_mfprintf(stderr, "%s Curl error on %s (%i) %s\n",
t530_tag(), info, result, curl_multi_strerror(result));
}
return (int)result;
return result;
}
/**
* Invoke curl when a file descriptor is set.
*/
static int t530_checkFdSet(CURLM *curl, struct t530_Sockets *sockets,
fd_set *fdset, int evBitmask, const char *name)
static CURLMcode t530_checkFdSet(CURLM *curl, struct t530_Sockets *sockets,
fd_set *fdset, int evBitmask,
const char *name)
{
int i;
int result = 0;
CURLMcode result = CURLM_OK;
for(i = 0; i < sockets->count; ++i) {
if(FD_ISSET(sockets->sockets[i], fdset)) {
result = socket_action(curl, sockets->sockets[i], evBitmask, name);
@ -335,7 +337,7 @@ static CURLcode testone(const char *URL, int timer_fail_at, int socket_fail_at)
t530_updateFdSet(&sockets.write, &writeSet, &maxFd);
if(timeout.tv_sec != (time_t)-1) {
int usTimeout = t530_getMicroSecondTimeout(&timeout);
int usTimeout = curlx_sztosi(t530_getMicroSecondTimeout(&timeout));
tv.tv_sec = usTimeout / 1000000;
tv.tv_usec = usTimeout % 1000000;
}

2
tests/libtest/lib540.c
View file

@ -159,7 +159,7 @@ static CURLcode loop(int num, CURLM *cm, const char *url, const char *userpwd,
if(msg->msg == CURLMSG_DONE) {
size_t i;
CURL *e = msg->easy_handle;
curl_mfprintf(stderr, "R: %d - %s\n", (int)msg->data.result,
curl_mfprintf(stderr, "R: %d - %s\n", msg->data.result,
curl_easy_strerror(msg->data.result));
curl_multi_remove_handle(cm, e);
curl_easy_cleanup(e);

6
tests/libtest/lib552.c
View file

@ -48,10 +48,10 @@ static size_t t552_read_cb(char *ptr, size_t size, size_t nmemb, void *stream)
static size_t t552_write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
{
int amount = curlx_uztosi(size * nmemb);
curl_mprintf("%.*s", amount, (char *)ptr);
size_t amount = size * nmemb;
curl_mprintf("%.*s", (int)amount, ptr);
(void)stream;
return size * nmemb;
return amount;
}
static curlioerr ioctl_callback(CURL *handle, int cmd, void *clientp)

2
tests/libtest/lib569.c
View file

@ -66,7 +66,7 @@ static CURLcode test_lib569(const char *URL)
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
res = curl_easy_perform(curl);
if(res != (int)CURLE_BAD_FUNCTION_ARGUMENT) {
if(res != CURLE_BAD_FUNCTION_ARGUMENT) {
curl_mfprintf(stderr, "This should have failed. "
"Cannot setup without a Transport: header");
res = TEST_ERR_MAJOR_BAD;

2
tests/libtest/lib570.c
View file

@ -63,7 +63,7 @@ static CURLcode test_lib570(const char *URL)
stream_uri = NULL;
res = curl_easy_perform(curl);
if(res != (int)CURLE_RTSP_CSEQ_ERROR) {
if(res != CURLE_RTSP_CSEQ_ERROR) {
curl_mfprintf(stderr, "Failed to detect CSeq mismatch");
res = TEST_ERR_MAJOR_BAD;
goto test_cleanup;

3
tests/libtest/lib571.c
View file

@ -45,11 +45,10 @@
static int rtp_packet_count = 0;
static size_t rtp_write(char *ptr, size_t size, size_t nmemb, void *stream)
static size_t rtp_write(char *data, size_t size, size_t nmemb, void *stream)
{
static const char *RTP_DATA = "$_1234\n\0Rsdf";
char *data = (char *)ptr;
int channel = RTP_PKT_CHANNEL(data);
int message_size;
int coded_size = RTP_PKT_LENGTH(data);

10
tests/libtest/lib582.c
View file

@ -44,7 +44,7 @@ static void t582_removeFd(struct t582_Sockets *sockets, curl_socket_t fd,
int i;
if(mention)
curl_mfprintf(stderr, "Remove socket fd %d\n", (int)fd);
curl_mfprintf(stderr, "Remove socket fd %" FMT_SOCKET_T "\n", fd);
for(i = 0; i < sockets->count; ++i) {
if(sockets->sockets[i] == fd) {
@ -66,7 +66,7 @@ static void t582_addFd(struct t582_Sockets *sockets, curl_socket_t fd,
* To ensure we only have each file descriptor once, we remove it then add
* it again.
*/
curl_mfprintf(stderr, "Add socket fd %d for %s\n", (int)fd, what);
curl_mfprintf(stderr, "Add socket fd %" FMT_SOCKET_T " for %s\n", fd, what);
t582_removeFd(sockets, fd, 0);
/*
* Allocate array storage when required.
@ -161,7 +161,7 @@ static int t582_checkForCompletion(CURLM *curl, int *success)
return result;
}
static int t582_getMicroSecondTimeout(struct curltime *timeout)
static ssize_t t582_getMicroSecondTimeout(struct curltime *timeout)
{
struct curltime now;
ssize_t result;
@ -171,7 +171,7 @@ static int t582_getMicroSecondTimeout(struct curltime *timeout)
if(result < 0)
result = 0;
return curlx_sztosi(result);
return result;
}
/**
@ -317,7 +317,7 @@ static CURLcode test_lib582(const char *URL)
t582_updateFdSet(&sockets.write, &writeSet, &maxFd);
if(timeout.tv_sec != (time_t)-1) {
int usTimeout = t582_getMicroSecondTimeout(&timeout);
int usTimeout = curlx_sztosi(t582_getMicroSecondTimeout(&timeout));
tv.tv_sec = usTimeout / 1000000;
tv.tv_usec = usTimeout % 1000000;
}

4
tests/libtest/lib586.c
View file

@ -62,7 +62,7 @@ static void t586_test_lock(CURL *handle, curl_lock_data data,
what = "ssl_session";
break;
default:
curl_mfprintf(stderr, "lock: no such data: %d\n", (int)data);
curl_mfprintf(stderr, "lock: no such data: %d\n", data);
return;
}
curl_mprintf("lock: %-6s [%s]: %d\n", what, user->text, user->counter);
@ -89,7 +89,7 @@ static void t586_test_unlock(CURL *handle, curl_lock_data data, void *useptr)
what = "ssl_session";
break;
default:
curl_mfprintf(stderr, "unlock: no such data: %d\n", (int)data);
curl_mfprintf(stderr, "unlock: no such data: %d\n", data);
return;
}
curl_mprintf("unlock: %-6s [%s]: %d\n", what, user->text, user->counter);

2
tests/libtest/lib643.c
View file

@ -53,7 +53,7 @@ static size_t t643_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
return 1; /* we return 1 byte at a time! */
}
return 0; /* no more data left to deliver */
return 0; /* no more data left to deliver */
}
static CURLcode t643_test_once(const char *URL, bool oldstyle)

2
tests/libtest/mk-lib1521.pl
View file

@ -336,7 +336,7 @@ static CURLcode test_lib1521(const char *URL)
void *conv_to_network_cb = NULL;
void *conv_from_utf8_cb = NULL;
void *interleavecb = NULL;
char *stringpointerextra = (char *)CURL_UNCONST("moooo");
const char *stringpointerextra = "moooo";
struct curl_slist *slist = NULL;
struct curl_httppost *httppost = NULL;
curl_mime *mimepost = NULL;