luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cf-socket: deduplicate Windows Vista detection

Browse Source 
- Remove Vista detection logic from Curl_sndbuf_init and evaluate global
  init variable Curl_isVistaOrGreater instead.

This way we don't need a separate initialization in Curl_sndbuf_init.

Ref: https://github.com/curl/curl/pull/16393#discussion_r1962377920

Closes https://github.com/curl/curl/pull/16400
This commit is contained in:
Jay Satiro 2025-02-19 16:36:07 -05:00
parent 210c0c088e
commit 46e97b10ba
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cf-socket.c
View File

@ -82,6 +82,7 @@
#include "rand.h" #include "rand.h"
#include "share.h" #include "share.h"
#include "strdup.h" #include "strdup.h"
#include "system_win32.h"
#include "version_win32.h" #include "version_win32.h"
#include "strparse.h" #include "strparse.h"
@ -461,9 +462,6 @@ int Curl_socket_close(struct Curl_easy *data, struct connectdata *conn,
Windows. Following function trying to detect OS version and skips Windows. Following function trying to detect OS version and skips
SO_SNDBUF adjustment for Windows Vista and above. SO_SNDBUF adjustment for Windows Vista and above.
*/ */
#define DETECT_OS_NONE 0
#define DETECT_OS_PREVISTA 1
#define DETECT_OS_VISTA_OR_LATER 2
void Curl_sndbuf_init(curl_socket_t sockfd) void Curl_sndbuf_init(curl_socket_t sockfd)
{ {
@ -471,17 +469,7 @@ void Curl_sndbuf_init(curl_socket_t sockfd)
int curval = 0; int curval = 0;
int curlen = sizeof(curval); int curlen = sizeof(curval);
static int detectOsState = DETECT_OS_NONE; if(Curl_isVistaOrGreater)
if(detectOsState == DETECT_OS_NONE) {
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
VERSION_GREATER_THAN_EQUAL))
detectOsState = DETECT_OS_VISTA_OR_LATER;
else
detectOsState = DETECT_OS_PREVISTA;
}
if(detectOsState == DETECT_OS_VISTA_OR_LATER)
return; return;
if(getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (char *)&curval, &curlen) == 0) if(getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (char *)&curval, &curlen) == 0)