romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:41:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

urldata: convert 'long' fields to fixed variable types

Browse source 
Makes sure they work identically cross-platform, as long varies in size
between Windows vs non-Windows. Makes Curl_easy 16 bytes smaller on 64
bit Linux.

This reduces support for the RTSP cseq counters to 32 bit (down from 63
bit previously on 64 bit non-Windows), but it is probably safe.
Implementations probably rarely support anything above 32 bits anyway
and this is how curl has worked on Windows since always.

There is now only one 'long' left in urldata.h (in the ssl_config_data
struct). That field, certverifyresult, is used to store the response
code from TLS backend code and in the OpenSSL case that function returns
an actual 'long'.

Closes #20227
This commit is contained in:
Daniel Stenberg 2026-01-08 23:57:58 +01:00
parent 3402036e1a
commit d881b91133
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 42 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/setopt.c
View file

@ -1050,9 +1050,10 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
s->low_speed_limit = arg;
break;
case CURLOPT_LOW_SPEED_TIME:
if(arg < 0)
return CURLE_BAD_FUNCTION_ARGUMENT;
s->low_speed_time = arg;
result = value_range(&arg, 0, 0, USHRT_MAX);
if(result)
return result;
s->low_speed_time = (uint16_t)arg;
break;
case CURLOPT_PORT:
if((arg < 0) || (arg > 65535))
@ -1190,11 +1191,17 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
case CURLOPT_RTSP_REQUEST:
return setopt_RTSP_REQUEST(data, arg);
case CURLOPT_RTSP_CLIENT_CSEQ:
data->state.rtsp_next_client_CSeq = arg;
result = value_range(&arg, 0, 0, INT_MAX);
if(result)
return result;
data->state.rtsp_next_client_CSeq = (uint32_t)arg;
break;
case CURLOPT_RTSP_SERVER_CSEQ:
data->state.rtsp_next_server_CSeq = arg;
result = value_range(&arg, 0, 0, INT_MAX);
if(result)
return result;
data->state.rtsp_next_server_CSeq = (uint32_t)arg;
break;
#endif /* !CURL_DISABLE_RTSP */
@ -1231,9 +1238,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
return setopt_set_timeout_ms(&s->happy_eyeballs_timeout, arg);
case CURLOPT_UPKEEP_INTERVAL_MS:
if(arg < 0)
return CURLE_BAD_FUNCTION_ARGUMENT;
s->upkeep_interval_ms = arg;
return setopt_set_timeout_ms(&s->upkeep_interval_ms, arg);
break;
case CURLOPT_MAXAGE_CONN:
return setopt_set_timeout_sec(&s->conn_max_idle_ms, arg);