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

cf-socket: elminiate size_t casts

Browse source 
Use curlx_sztouz() instead.

Closes #19617
This commit is contained in:
Stefan Eissing 2025-11-20 10:46:35 +01:00 • committed by Daniel Stenberg
parent ffcf8c5ce4
commit d2ab42d786
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/cf-socket.c
View file

@ -1432,7 +1432,7 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
{
struct cf_socket_ctx *ctx = cf->ctx;
curl_socket_t fdsave;
ssize_t nwritten;
ssize_t rv;
size_t orig_len = len;
CURLcode result = CURLE_OK;
@ -1463,15 +1463,15 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */
if(cf->conn->bits.tcp_fastopen) {
nwritten = sendto(ctx->sock, buf, len, MSG_FASTOPEN,
&ctx->addr.curl_sa_addr, ctx->addr.addrlen);
rv = sendto(ctx->sock, buf, len, MSG_FASTOPEN,
&ctx->addr.curl_sa_addr, ctx->addr.addrlen);
cf->conn->bits.tcp_fastopen = FALSE;
}
else
#endif
nwritten = swrite(ctx->sock, buf, len);
rv = swrite(ctx->sock, buf, len);
if(nwritten < 0) {
if(!curlx_sztouz(rv, pnwritten)) {
int sockerr = SOCKERRNO;
if(
@ -1498,8 +1498,6 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
result = CURLE_SEND_ERROR;
}
}
else
*pnwritten = (size_t)nwritten;
#ifdef USE_WINSOCK
if(!result)
@ -1517,7 +1515,7 @@ static CURLcode cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
{
struct cf_socket_ctx *ctx = cf->ctx;
CURLcode result = CURLE_OK;
ssize_t nread;
ssize_t rv;
*pnread = 0;
#ifdef DEBUGBUILD
@ -1538,9 +1536,9 @@ static CURLcode cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
}
#endif
nread = sread(ctx->sock, buf, len);
rv = sread(ctx->sock, buf, len);
if(nread < 0) {
if(!curlx_sztouz(rv, pnread)) {
int sockerr = SOCKERRNO;
if(
@ -1566,8 +1564,6 @@ static CURLcode cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
result = CURLE_RECV_ERROR;
}
}
else
*pnread = (size_t)nread;
CURL_TRC_CF(data, cf, "recv(len=%zu) -> %d, %zu", len, result, *pnread);
if(!result && !ctx->got_first_byte) {