gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: fix some compiler warnings (#5070)

Browse Source 
* win: initialize INIT_ONCE field with dedicated initializer
Fixes: abc9767034 ("win: simplify uv_once implementation")
* win: indendation fixes
* win: squash some compiler warnings
This commit is contained in:
Benjamin Gilbert 2026-03-16 21:19:14 -07:00 committed by GitHub
parent 919b92d944
commit fa38eb43df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uv/win.h
View File

@ -279,7 +279,7 @@ typedef struct {
DWORD tls_index; DWORD tls_index;
} uv_key_t; } uv_key_t;
#define UV_ONCE_INIT { 0, { NULL } } #define UV_ONCE_INIT { 0, INIT_ONCE_STATIC_INIT }
typedef struct uv_once_s { typedef struct uv_once_s {
unsigned char unused; unsigned char unused;

11
src/win/process-stdio.c
View File

@ -215,7 +215,8 @@ int uv__stdio_create(uv_loop_t* loop,
* handles in the stdio buffer are initialized with. * handles in the stdio buffer are initialized with.
* INVALID_HANDLE_VALUE, which should be okay. */ * INVALID_HANDLE_VALUE, which should be okay. */
if (i <= 2) { if (i <= 2) {
HANDLE nul; /* Redundantly initialize to make the compiler happy. */
HANDLE nul = INVALID_HANDLE_VALUE;
DWORD access = (i == 0) ? FILE_GENERIC_READ : DWORD access = (i == 0) ? FILE_GENERIC_READ :
FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES; FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES;
@ -223,7 +224,7 @@ int uv__stdio_create(uv_loop_t* loop,
if (err) if (err)
goto error; goto error;
memcpy(CHILD_STDIO_HANDLE(buffer, i), &nul, sizeof(HANDLE)); memcpy(CHILD_STDIO_HANDLE(buffer, i), &nul, sizeof(HANDLE));
CHILD_STDIO_CRT_FLAGS(buffer, i) = FOPEN | FDEV; CHILD_STDIO_CRT_FLAGS(buffer, i) = FOPEN | FDEV;
} }
break; break;
@ -248,7 +249,7 @@ int uv__stdio_create(uv_loop_t* loop,
if (err) if (err)
goto error; goto error;
memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_pipe, sizeof(HANDLE)); memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_pipe, sizeof(HANDLE));
CHILD_STDIO_CRT_FLAGS(buffer, i) = FOPEN | FPIPE; CHILD_STDIO_CRT_FLAGS(buffer, i) = FOPEN | FPIPE;
break; break;
} }
@ -299,7 +300,7 @@ int uv__stdio_create(uv_loop_t* loop,
return -1; return -1;
} }
memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_handle, sizeof(HANDLE)); memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_handle, sizeof(HANDLE));
break; break;
} }
@ -335,7 +336,7 @@ int uv__stdio_create(uv_loop_t* loop,
if (err) if (err)
goto error; goto error;
memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_handle, sizeof(HANDLE)); memcpy(CHILD_STDIO_HANDLE(buffer, i), &child_handle, sizeof(HANDLE));
CHILD_STDIO_CRT_FLAGS(buffer, i) = crt_flags; CHILD_STDIO_CRT_FLAGS(buffer, i) = crt_flags;
break; break;
} }

4
src/win/util.c
View File

@ -508,8 +508,8 @@ int uv_uptime(double* uptime) {
unsigned int uv_available_parallelism(void) { unsigned int uv_available_parallelism(void) {
DWORD_PTR procmask; DWORD_PTR procmask;
DWORD_PTR sysmask; DWORD_PTR sysmask;
unsigned count; int count;
unsigned i; unsigned int i;
/* TODO(bnoordhuis) Use GetLogicalProcessorInformationEx() to support systems /* TODO(bnoordhuis) Use GetLogicalProcessorInformationEx() to support systems
* with > 64 CPUs? See https://github.com/libuv/libuv/pull/3458 * with > 64 CPUs? See https://github.com/libuv/libuv/pull/3458