[wpinet] Fix libuv unused variable warning on Mac (#4299)

2026-06-19 00:41:43 +00:00 · 2022-06-09 23:30:16 -07:00
parent 30f5b68264
commit 41d40dd62f
11 changed files with 124 additions and 98 deletions
--- a/upstream_utils/libuv_patches/0001-Fix-missing-casts.patch
+++ b/upstream_utils/libuv_patches/0001-Fix-missing-casts.patch
@@ -1,7 +1,7 @@
-From 776fc617c56fdce3bc218e649a9bbfbdb6d4c8f9 Mon Sep 17 00:00:00 2001
+From daf3206b03fa287961fadf439eb423a12cf4f96b Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:01:25 -0400
-Subject: [PATCH 1/8] Fix missing casts
+Subject: [PATCH 1/9] Fix missing casts

 ---
 include/uv/unix.h              |  2 +-
@@ -48,7 +48,7 @@ Subject: [PATCH 1/8] Fix missing casts
 41 files changed, 167 insertions(+), 163 deletions(-)

 diff --git a/include/uv/unix.h b/include/uv/unix.h
-index ea37d787..420be86c 100644
+index ea37d78..420be86 100644
 --- a/include/uv/unix.h
 +++ b/include/uv/unix.h
@@ -223,7 +223,7 @@ typedef struct {
@@ -61,7 +61,7 @@ index ea37d787..420be86c 100644
   unsigned int nfds;                                                          \
   void* wq[2];                                                                \
 diff --git a/src/fs-poll.c b/src/fs-poll.c
-index 1bac1c56..5a39daed 100644
+index 1bac1c5..5a39dae 100644
 --- a/src/fs-poll.c
 +++ b/src/fs-poll.c
@@ -77,7 +77,7 @@ int uv_fs_poll_start(uv_fs_poll_t* handle,
@@ -110,7 +110,7 @@ index 1bac1c56..5a39daed 100644
          last = it, it = it->previous) {
       assert(last->previous != NULL);
 diff --git a/src/inet.c b/src/inet.c
-index ddabf22f..ca8b6ac8 100644
+index ddabf22..ca8b6ac 100644
 --- a/src/inet.c
 +++ b/src/inet.c
@@ -40,9 +40,9 @@ static int inet_pton6(const char *src, unsigned char *dst);
@@ -149,7 +149,7 @@ index ddabf22f..ca8b6ac8 100644
   default:
     return UV_EAFNOSUPPORT;
 diff --git a/src/strscpy.c b/src/strscpy.c
-index 20df6fcb..6b4cc3bc 100644
+index 20df6fc..6b4cc3b 100644
 --- a/src/strscpy.c
 +++ b/src/strscpy.c
@@ -27,7 +27,7 @@ ssize_t uv__strscpy(char* d, const char* s, size_t n) {
@@ -162,7 +162,7 @@ index 20df6fcb..6b4cc3bc 100644
   if (i == 0)
     return 0;
 diff --git a/src/threadpool.c b/src/threadpool.c
-index e804c7c4..1241ace1 100644
+index e804c7c..1241ace 100644
 --- a/src/threadpool.c
 +++ b/src/threadpool.c
@@ -206,7 +206,7 @@ static void init_threads(void) {
@@ -175,7 +175,7 @@ index e804c7c4..1241ace1 100644
       nthreads = ARRAY_SIZE(default_threads);
       threads = default_threads;
 diff --git a/src/unix/bsd-ifaddrs.c b/src/unix/bsd-ifaddrs.c
-index 11ca9559..c3dd71a1 100644
+index 11ca955..c3dd71a 100644
 --- a/src/unix/bsd-ifaddrs.c
 +++ b/src/unix/bsd-ifaddrs.c
@@ -92,7 +92,7 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
@@ -188,7 +188,7 @@ index 11ca9559..c3dd71a1 100644
   if (*addresses == NULL) {
     freeifaddrs(addrs);
 diff --git a/src/unix/core.c b/src/unix/core.c
-index def5b8f7..c59e5352 100644
+index def5b8f..c59e535 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -813,7 +813,7 @@ static unsigned int next_power_of_two(unsigned int val) {
@@ -239,7 +239,7 @@ index def5b8f7..c59e5352 100644
   if (*envitems == NULL)
     return UV_ENOMEM;
 diff --git a/src/unix/darwin-proctitle.c b/src/unix/darwin-proctitle.c
-index 5288083e..9bd55dd7 100644
+index 5288083..9bd55dd 100644
 --- a/src/unix/darwin-proctitle.c
 +++ b/src/unix/darwin-proctitle.c
@@ -128,8 +128,9 @@ int uv__set_process_title(const char* title) {
@@ -255,7 +255,7 @@ index 5288083e..9bd55dd7 100644
   if (display_name_key == NULL || *display_name_key == NULL)
     goto out;
 diff --git a/src/unix/darwin.c b/src/unix/darwin.c
-index 62f04d31..5fbf7342 100644
+index 62f04d3..5fbf734 100644
 --- a/src/unix/darwin.c
 +++ b/src/unix/darwin.c
@@ -353,7 +353,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -268,7 +268,7 @@ index 62f04d31..5fbf7342 100644
     vm_deallocate(mach_task_self(), (vm_address_t)info, msg_type);
     return UV_ENOMEM;
 diff --git a/src/unix/epoll.c b/src/unix/epoll.c
-index 97348e25..4c057fb3 100644
+index 97348e2..4c057fb 100644
 --- a/src/unix/epoll.c
 +++ b/src/unix/epoll.c
@@ -325,7 +325,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -281,7 +281,7 @@ index 97348e25..4c057fb3 100644
       if (w == NULL) {
         /* File descriptor that we've stopped watching, disarm it.
 diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c
-index 658ff262..6700ff61 100644
+index 658ff26..6700ff6 100644
 --- a/src/unix/freebsd.c
 +++ b/src/unix/freebsd.c
@@ -215,7 +215,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -303,7 +303,7 @@ index 658ff262..6700ff61 100644
     uv__free(*cpu_infos);
     return UV_ENOMEM;
 diff --git a/src/unix/fs.c b/src/unix/fs.c
-index b3211ec1..1006d15d 100644
+index b3211ec..1006d15 100644
 --- a/src/unix/fs.c
 +++ b/src/unix/fs.c
@@ -137,7 +137,7 @@ extern char *mkdtemp(char *template); /* See issue #740 on AIX < 7 */
@@ -397,7 +397,7 @@ index b3211ec1..1006d15d 100644
   if (req->bufs == NULL)
     return UV_ENOMEM;
 diff --git a/src/unix/fsevents.c b/src/unix/fsevents.c
-index bf4f1f6a..648c8a98 100644
+index bf4f1f6..648c8a9 100644
 --- a/src/unix/fsevents.c
 +++ b/src/unix/fsevents.c
@@ -185,7 +185,7 @@ static void (*pFSEventStreamStop)(FSEventStreamRef);
@@ -554,7 +554,7 @@ index bf4f1f6a..648c8a98 100644
   QUEUE_REMOVE(&handle->cf_member);
   state->fsevent_handle_count--;
 diff --git a/src/unix/getaddrinfo.c b/src/unix/getaddrinfo.c
-index 77337ace..41dc3909 100644
+index 77337ac..41dc390 100644
 --- a/src/unix/getaddrinfo.c
 +++ b/src/unix/getaddrinfo.c
@@ -172,7 +172,7 @@ int uv_getaddrinfo(uv_loop_t* loop,
@@ -588,7 +588,7 @@ index 77337ace..41dc3909 100644
   if (cb) {
     uv__work_submit(loop,
 diff --git a/src/unix/ibmi.c b/src/unix/ibmi.c
-index 8c6ae636..56af31e9 100644
+index 8c6ae63..56af31e 100644
 --- a/src/unix/ibmi.c
 +++ b/src/unix/ibmi.c
@@ -288,7 +288,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -601,7 +601,7 @@ index 8c6ae636..56af31e9 100644
     return UV_ENOMEM;
   }
 diff --git a/src/unix/kqueue.c b/src/unix/kqueue.c
-index 03605514..dff3c997 100644
+index 0360551..dff3c99 100644
 --- a/src/unix/kqueue.c
 +++ b/src/unix/kqueue.c
@@ -281,8 +281,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -625,7 +625,7 @@ index 03605514..dff3c997 100644
       if (w == NULL) {
         /* File descriptor that we've stopped watching, disarm it.
 diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
-index 23a7dafe..85f3fc01 100644
+index 23a7daf..85f3fc0 100644
 --- a/src/unix/linux-core.c
 +++ b/src/unix/linux-core.c
@@ -117,7 +117,6 @@ void uv__platform_loop_delete(uv_loop_t* loop) {
@@ -655,7 +655,7 @@ index 23a7dafe..85f3fc01 100644
     freeifaddrs(addrs);
     return UV_ENOMEM;
 diff --git a/src/unix/linux-inotify.c b/src/unix/linux-inotify.c
-index c1bd260e..f5366e96 100644
+index c1bd260..f5366e9 100644
 --- a/src/unix/linux-inotify.c
 +++ b/src/unix/linux-inotify.c
@@ -281,12 +281,12 @@ int uv_fs_event_start(uv_fs_event_t* handle,
@@ -674,7 +674,7 @@ index c1bd260e..f5366e96 100644
   w->iterating = 0;
   RB_INSERT(watcher_root, CAST(&handle->loop->inotify_watchers), w);
 diff --git a/src/unix/loop.c b/src/unix/loop.c
-index a88e71c3..2e819cdd 100644
+index a88e71c..2e819cd 100644
 --- a/src/unix/loop.c
 +++ b/src/unix/loop.c
@@ -148,7 +148,7 @@ int uv_loop_fork(uv_loop_t* loop) {
@@ -687,7 +687,7 @@ index a88e71c3..2e819cdd 100644
       continue;
 
 diff --git a/src/unix/netbsd.c b/src/unix/netbsd.c
-index c66333f5..b6886a1c 100644
+index c66333f..b6886a1 100644
 --- a/src/unix/netbsd.c
 +++ b/src/unix/netbsd.c
@@ -206,14 +206,14 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -708,7 +708,7 @@ index c66333f5..b6886a1c 100644
     uv__free(cp_times);
     uv__free(*cpu_infos);
 diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c
-index f32a94df..62740f73 100644
+index f32a94d..62740f7 100644
 --- a/src/unix/openbsd.c
 +++ b/src/unix/openbsd.c
@@ -72,7 +72,7 @@ int uv_exepath(char* buffer, size_t* size) {
@@ -730,7 +730,7 @@ index f32a94df..62740f73 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/pipe.c b/src/unix/pipe.c
-index fcc2cba1..5fd91968 100644
+index fcc2cba..5fd9196 100644
 --- a/src/unix/pipe.c
 +++ b/src/unix/pipe.c
@@ -307,7 +307,7 @@ int uv_pipe_pending_count(uv_pipe_t* handle) {
@@ -752,7 +752,7 @@ index fcc2cba1..5fd91968 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/poll.c b/src/unix/poll.c
-index 7a12e2d1..73647317 100644
+index 7a12e2d..7364731 100644
 --- a/src/unix/poll.c
 +++ b/src/unix/poll.c
@@ -117,7 +117,7 @@ int uv_poll_stop(uv_poll_t* handle) {
@@ -765,7 +765,7 @@ index 7a12e2d1..73647317 100644
   int events;
 
 diff --git a/src/unix/posix-poll.c b/src/unix/posix-poll.c
-index 0f4bf938..8da038d1 100644
+index 0f4bf93..8da038d 100644
 --- a/src/unix/posix-poll.c
 +++ b/src/unix/posix-poll.c
@@ -61,7 +61,7 @@ static void uv__pollfds_maybe_resize(uv_loop_t* loop) {
@@ -778,7 +778,7 @@ index 0f4bf938..8da038d1 100644
     abort();
 
 diff --git a/src/unix/process.c b/src/unix/process.c
-index 8802e4f3..5d749844 100644
+index 8802e4f..5d74984 100644
 --- a/src/unix/process.c
 +++ b/src/unix/process.c
@@ -403,7 +403,7 @@ static int posix_spawn_can_use_setsid;
@@ -800,7 +800,7 @@ index 8802e4f3..5d749844 100644
   if (pipes == NULL)
     goto error;
 diff --git a/src/unix/proctitle.c b/src/unix/proctitle.c
-index 9d1f00dd..8cdec753 100644
+index 9d1f00d..8cdec75 100644
 --- a/src/unix/proctitle.c
 +++ b/src/unix/proctitle.c
@@ -65,7 +65,7 @@ char** uv_setup_args(int argc, char** argv) {
@@ -813,7 +813,7 @@ index 9d1f00dd..8cdec753 100644
     return argv;
 
 diff --git a/src/unix/random-sysctl-linux.c b/src/unix/random-sysctl-linux.c
-index 66ba8d74..9ef18df0 100644
+index 66ba8d7..9ef18df 100644
 --- a/src/unix/random-sysctl-linux.c
 +++ b/src/unix/random-sysctl-linux.c
@@ -48,7 +48,7 @@ int uv__random_sysctl(void* buf, size_t buflen) {
@@ -826,7 +826,7 @@ index 66ba8d74..9ef18df0 100644
 
   while (p < pe) {
 diff --git a/src/unix/stream.c b/src/unix/stream.c
-index 619b6250..41763959 100644
+index 619b625..4176395 100644
 --- a/src/unix/stream.c
 +++ b/src/unix/stream.c
@@ -112,7 +112,7 @@ static void uv__stream_osx_interrupt_select(uv_stream_t* stream) {
@@ -951,7 +951,7 @@ index 619b6250..41763959 100644
       uv__close(queued_fds->fds[i]);
     uv__free(handle->queued_fds);
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index d89e5cd1..759cd0c2 100644
+index d89e5cd..759cd0c 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -59,7 +59,7 @@ int uv_barrier_init(uv_barrier_t* barrier, unsigned int count) {
@@ -983,7 +983,7 @@ index d89e5cd1..759cd0c2 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/udp.c b/src/unix/udp.c
-index aad7a6dc..2e54b1e2 100644
+index aad7a6d..2e54b1e 100644
 --- a/src/unix/udp.c
 +++ b/src/unix/udp.c
@@ -227,11 +227,11 @@ static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf) {
@@ -1019,7 +1019,7 @@ index aad7a6dc..2e54b1e2 100644
   if (req->bufs == NULL) {
     uv__req_unregister(handle->loop, req);
 diff --git a/src/uv-common.c b/src/uv-common.c
-index f43dd3de..73d19caf 100644
+index f43dd3d..73d19ca 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -54,10 +54,10 @@ static uv__allocator_t uv__allocator = {
@@ -1086,7 +1086,7 @@ index f43dd3de..73d19caf 100644
     return NULL;
 
 diff --git a/src/win/core.c b/src/win/core.c
-index c08dedc4..b98963bf 100644
+index c08dedc..b98963b 100644
 --- a/src/win/core.c
 +++ b/src/win/core.c
@@ -98,7 +98,8 @@ static int uv__loops_add(uv_loop_t* loop) {
@@ -1119,7 +1119,7 @@ index c08dedc4..b98963bf 100644
     err = UV_ENOMEM;
     goto fail_timers_alloc;
 diff --git a/src/win/fs-event.c b/src/win/fs-event.c
-index 6758c7c7..15046731 100644
+index 6758c7c..1504673 100644
 --- a/src/win/fs-event.c
 +++ b/src/win/fs-event.c
@@ -73,7 +73,7 @@ static void uv__relative_path(const WCHAR* filename,
@@ -1141,7 +1141,7 @@ index 6758c7c7..15046731 100644
       goto short_path_done;
     }
 diff --git a/src/win/fs-fd-hash-inl.h b/src/win/fs-fd-hash-inl.h
-index 0b532af1..703a8d8f 100644
+index 0b532af..703a8d8 100644
 --- a/src/win/fs-fd-hash-inl.h
 +++ b/src/win/fs-fd-hash-inl.h
@@ -146,7 +146,7 @@ INLINE static void uv__fd_hash_add(int fd, struct uv__fd_info_s* info) {
@@ -1154,7 +1154,7 @@ index 0b532af1..703a8d8f 100644
         uv_fatal_error(ERROR_OUTOFMEMORY, "uv__malloc");
       }
 diff --git a/src/win/fs.c b/src/win/fs.c
-index 79230799..8374012f 100644
+index 7923079..8374012 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -285,7 +285,7 @@ static int fs__wide_to_utf8(WCHAR* w_source_ptr,
@@ -1275,7 +1275,7 @@ index 79230799..8374012f 100644
   if (req->fs.info.bufs == NULL) {
     SET_REQ_UV_ERROR(req, UV_ENOMEM, ERROR_OUTOFMEMORY);
 diff --git a/src/win/pipe.c b/src/win/pipe.c
-index a4bab2c4..9fb73b4e 100644
+index a4bab2c..9fb73b4 100644
 --- a/src/win/pipe.c
 +++ b/src/win/pipe.c
@@ -752,7 +752,7 @@ int uv_pipe_bind(uv_pipe_t* handle, const char* name) {
@@ -1324,7 +1324,7 @@ index a4bab2c4..9fb73b4e 100644
       *size = 0;
       err = UV_ENOMEM;
 diff --git a/src/win/process.c b/src/win/process.c
-index 24c63339..e857db3e 100644
+index 24c6333..e857db3 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -616,8 +616,8 @@ error:
@@ -1368,7 +1368,7 @@ index 24c63339..e857db3e 100644
     uv__free(dst_copy);
     return ERROR_OUTOFMEMORY;
 diff --git a/src/win/tcp.c b/src/win/tcp.c
-index 1d9085c9..02b3b8b2 100644
+index 1d9085c..02b3b8b 100644
 --- a/src/win/tcp.c
 +++ b/src/win/tcp.c
@@ -609,7 +609,7 @@ int uv__tcp_listen(uv_tcp_t* handle, int backlog, uv_connection_cb cb) {
@@ -1381,7 +1381,7 @@ index 1d9085c9..02b3b8b2 100644
       uv_fatal_error(ERROR_OUTOFMEMORY, "uv__malloc");
     }
 diff --git a/src/win/thread.c b/src/win/thread.c
-index d3b1c96b..9ad60c91 100644
+index d3b1c96..9ad60c9 100644
 --- a/src/win/thread.c
 +++ b/src/win/thread.c
@@ -98,7 +98,7 @@ static UINT __stdcall uv__thread_start(void* arg) {
@@ -1403,7 +1403,7 @@ index d3b1c96b..9ad60c91 100644
     return UV_ENOMEM;
 
 diff --git a/src/win/udp.c b/src/win/udp.c
-index 407aa6cb..05153511 100644
+index 407aa6c..0515351 100644
 --- a/src/win/udp.c
 +++ b/src/win/udp.c
@@ -1087,7 +1087,7 @@ int uv__udp_disconnect(uv_udp_t* handle) {
@@ -1416,7 +1416,7 @@ index 407aa6cb..05153511 100644
       return uv_translate_sys_error(WSAGetLastError());
 
 diff --git a/src/win/util.c b/src/win/util.c
-index 99432053..c655f532 100644
+index 9943205..c655f53 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -164,7 +164,7 @@ int uv_cwd(char* buffer, size_t* size) {
@@ -1546,5 +1546,5 @@ index 99432053..c655f532 100644
     if (var == NULL) {
       r = UV_ENOMEM;
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0002-Fix-warnings.patch
+++ b/upstream_utils/libuv_patches/0002-Fix-warnings.patch
@@ -1,7 +1,7 @@
-From 7727474439a3a3dc2b74c9c7ae4b1c36a11fdce2 Mon Sep 17 00:00:00 2001
+From 1cf6a9b2eee7a9364a3827cc85f84172e1eaea4d Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:09:43 -0400
-Subject: [PATCH 2/8] Fix warnings
+Subject: [PATCH 2/9] Fix warnings

 ---
 include/uv/win.h    |   5 +++
@@ -21,7 +21,7 @@ Subject: [PATCH 2/8] Fix warnings
 14 files changed, 99 insertions(+), 62 deletions(-)

 diff --git a/include/uv/win.h b/include/uv/win.h
-index 62be4b04..fe36a532 100644
+index 62be4b0..fe36a53 100644
 --- a/include/uv/win.h
 +++ b/include/uv/win.h
@@ -201,11 +201,16 @@ typedef int (WSAAPI* LPFN_WSARECVFROM)
@@ -42,7 +42,7 @@ index 62be4b04..fe36a532 100644
   typedef PVOID CONDITION_VARIABLE, *PCONDITION_VARIABLE;
 #endif
 diff --git a/src/idna.c b/src/idna.c
-index 93d982ca..36a39a08 100644
+index 93d982c..36a39a0 100644
 --- a/src/idna.c
 +++ b/src/idna.c
@@ -106,7 +106,7 @@ static int uv__idna_toascii_label(const char* s, const char* se,
@@ -55,7 +55,7 @@ index 93d982ca..36a39a08 100644
   unsigned k;
   unsigned n;
 diff --git a/src/inet.c b/src/inet.c
-index ca8b6ac8..1b190255 100644
+index ca8b6ac..1b19025 100644
 --- a/src/inet.c
 +++ b/src/inet.c
@@ -27,6 +27,10 @@
@@ -70,7 +70,7 @@ index ca8b6ac8..1b190255 100644
 #define UV__INET6_ADDRSTRLEN        46
 
 diff --git a/src/threadpool.c b/src/threadpool.c
-index 1241ace1..718972c3 100644
+index 1241ace..718972c 100644
 --- a/src/threadpool.c
 +++ b/src/threadpool.c
@@ -27,6 +27,10 @@
@@ -85,7 +85,7 @@ index 1241ace1..718972c3 100644
 
 static uv_once_t once = UV_ONCE_INIT;
 diff --git a/src/unix/core.c b/src/unix/core.c
-index c59e5352..be2ad1fc 100644
+index c59e535..be2ad1f 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -524,6 +524,16 @@ int uv__accept(int sockfd) {
@@ -117,7 +117,7 @@ index c59e5352..be2ad1fc 100644
 #endif
 #pragma GCC diagnostic pop
 diff --git a/src/unix/darwin.c b/src/unix/darwin.c
-index 5fbf7342..eeb35720 100644
+index 5fbf734..eeb3572 100644
 --- a/src/unix/darwin.c
 +++ b/src/unix/darwin.c
@@ -253,64 +253,68 @@ static int uv__get_cpu_speed(uint64_t* speed) {
@@ -241,7 +241,7 @@ index 5fbf7342..eeb35720 100644
 out:
   if (core_foundation_handle != NULL)
 diff --git a/src/unix/internal.h b/src/unix/internal.h
-index f418572d..5a867db7 100644
+index f418572..5a867db 100644
 --- a/src/unix/internal.h
 +++ b/src/unix/internal.h
@@ -313,8 +313,8 @@ UV_UNUSED(static void uv__update_time(uv_loop_t* loop)) {
@@ -256,7 +256,7 @@ index f418572d..5a867db7 100644
   s = strrchr(path, '/');
   if (s == NULL)
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index 759cd0c2..64726bd6 100644
+index 759cd0c..64726bd 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -244,12 +244,6 @@ int uv_thread_create_ex(uv_thread_t* tid,
@@ -273,7 +273,7 @@ index 759cd0c2..64726bd6 100644
       params->flags & UV_THREAD_HAS_STACK_SIZE ? params->stack_size : 0;
 
 diff --git a/src/uv-common.c b/src/uv-common.c
-index 73d19caf..c287246f 100644
+index 73d19ca..c287246 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -756,6 +756,10 @@ void uv__fs_readdir_cleanup(uv_fs_t* req) {
@@ -299,7 +299,7 @@ index 73d19caf..c287246f 100644
 static uv_loop_t default_loop_struct;
 static uv_loop_t* default_loop_ptr;
 diff --git a/src/win/fs-event.c b/src/win/fs-event.c
-index 15046731..3244a4e4 100644
+index 1504673..3244a4e 100644
 --- a/src/win/fs-event.c
 +++ b/src/win/fs-event.c
@@ -19,6 +19,8 @@
@@ -312,7 +312,7 @@ index 15046731..3244a4e4 100644
 #include <errno.h>
 #include <stdio.h>
 diff --git a/src/win/fs.c b/src/win/fs.c
-index 8374012f..f71b3c04 100644
+index 8374012..f71b3c0 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -19,6 +19,8 @@
@@ -325,7 +325,7 @@ index 8374012f..f71b3c04 100644
 #include <stdlib.h>
 #include <direct.h>
 diff --git a/src/win/pipe.c b/src/win/pipe.c
-index 9fb73b4e..ff4e8d25 100644
+index 9fb73b4..ff4e8d2 100644
 --- a/src/win/pipe.c
 +++ b/src/win/pipe.c
@@ -19,6 +19,8 @@
@@ -338,7 +338,7 @@ index 9fb73b4e..ff4e8d25 100644
 #include <io.h>
 #include <stdio.h>
 diff --git a/src/win/process.c b/src/win/process.c
-index e857db3e..a49016f6 100644
+index e857db3..a49016f 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -19,6 +19,8 @@
@@ -351,7 +351,7 @@ index e857db3e..a49016f6 100644
 #include <io.h>
 #include <stdio.h>
 diff --git a/src/win/tty.c b/src/win/tty.c
-index 98c58883..f6131d45 100644
+index 98c5888..f6131d4 100644
 --- a/src/win/tty.c
 +++ b/src/win/tty.c
@@ -19,6 +19,8 @@
@@ -364,5 +364,5 @@ index 98c58883..f6131d45 100644
 #include <io.h>
 #include <string.h>
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0003-Preprocessor-cleanup.patch
+++ b/upstream_utils/libuv_patches/0003-Preprocessor-cleanup.patch
@@ -1,7 +1,7 @@
-From e9c7588e574cbf1fe99c0de7f9fcbb2910f03dd8 Mon Sep 17 00:00:00 2001
+From d3b5b7ab0af09bb75fbb11fa6df60b973f8d313f Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:19:14 -0400
-Subject: [PATCH 3/8] Preprocessor cleanup
+Subject: [PATCH 3/9] Preprocessor cleanup

 ---
 include/uv.h        | 18 +-----------------
@@ -15,7 +15,7 @@ Subject: [PATCH 3/8] Preprocessor cleanup
 8 files changed, 16 insertions(+), 30 deletions(-)

 diff --git a/include/uv.h b/include/uv.h
-index ee1c94cc..dbaeb1e9 100644
+index ee1c94c..dbaeb1e 100644
 --- a/include/uv.h
 +++ b/include/uv.h
@@ -23,9 +23,6 @@
@@ -67,7 +67,7 @@ index ee1c94cc..dbaeb1e9 100644
 -#endif
 #endif /* UV_H */
 diff --git a/include/uv/unix.h b/include/uv/unix.h
-index 420be86c..256fef37 100644
+index 420be86..256fef3 100644
 --- a/include/uv/unix.h
 +++ b/include/uv/unix.h
@@ -47,14 +47,6 @@
@@ -86,7 +86,7 @@ index 420be86c..256fef37 100644
 # include "uv/darwin.h"
 #elif defined(__DragonFly__)       || \
 diff --git a/include/uv/win.h b/include/uv/win.h
-index fe36a532..7b013173 100644
+index fe36a53..7b01317 100644
 --- a/include/uv/win.h
 +++ b/include/uv/win.h
@@ -60,11 +60,7 @@ typedef struct pollfd {
@@ -103,7 +103,7 @@ index fe36a532..7b013173 100644
 #include "uv/tree.h"
 #include "uv/threadpool.h"
 diff --git a/src/unix/internal.h b/src/unix/internal.h
-index 5a867db7..7e1d408f 100644
+index 5a867db..7e1d408 100644
 --- a/src/unix/internal.h
 +++ b/src/unix/internal.h
@@ -192,6 +192,8 @@ struct uv__stream_queued_fds_s {
@@ -116,7 +116,7 @@ index 5a867db7..7e1d408f 100644
 
 /* core */
 diff --git a/src/win/fs.c b/src/win/fs.c
-index f71b3c04..71c9b169 100644
+index f71b3c0..71c9b16 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -38,6 +38,7 @@
@@ -128,7 +128,7 @@ index f71b3c04..71c9b169 100644
 #define UV_FS_FREE_PATHS         0x0002
 #define UV_FS_FREE_PTR           0x0008
 diff --git a/src/win/tty.c b/src/win/tty.c
-index f6131d45..54c6c290 100644
+index f6131d4..54c6c29 100644
 --- a/src/win/tty.c
 +++ b/src/win/tty.c
@@ -42,6 +42,8 @@
@@ -141,7 +141,7 @@ index f6131d45..54c6c290 100644
 # define InterlockedOr _InterlockedOr
 #endif
 diff --git a/src/win/util.c b/src/win/util.c
-index c655f532..7a5dd2ef 100644
+index c655f53..7a5dd2e 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -63,12 +63,20 @@
@@ -166,7 +166,7 @@ index c655f532..7a5dd2ef 100644
 static uint64_t hrtime_frequency_ = 0;
 
 diff --git a/src/win/winsock.c b/src/win/winsock.c
-index a68b0953..7843e9f1 100644
+index a68b095..7843e9f 100644
 --- a/src/win/winsock.c
 +++ b/src/win/winsock.c
@@ -25,6 +25,7 @@
@@ -178,5 +178,5 @@ index a68b0953..7843e9f1 100644
 /* Whether there are any non-IFS LSPs stacked on TCP */
 int uv_tcp_non_ifs_lsp_ipv4;
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0004-Cleanup-problematic-language.patch
+++ b/upstream_utils/libuv_patches/0004-Cleanup-problematic-language.patch
@@ -1,14 +1,14 @@
-From 1a02de906b6182af54eeafff465d51364c0bbcc4 Mon Sep 17 00:00:00 2001
+From dd043b401ad19dd0e80b196a24b10e46c26d3053 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:24:47 -0400
-Subject: [PATCH 4/8] Cleanup problematic language
+Subject: [PATCH 4/9] Cleanup problematic language

 ---
 src/unix/tty.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

 diff --git a/src/unix/tty.c b/src/unix/tty.c
-index 9442cf16..89766884 100644
+index 9442cf1..8976688 100644
 --- a/src/unix/tty.c
 +++ b/src/unix/tty.c
@@ -66,7 +66,7 @@ static int orig_termios_fd = -1;
@@ -60,5 +60,5 @@ index 9442cf16..89766884 100644
     else
       r = -1;
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0005-Use-roborio-time.patch
+++ b/upstream_utils/libuv_patches/0005-Use-roborio-time.patch
@@ -1,14 +1,14 @@
-From ec156359c45abbd0a0547d442788477d8fb57fa0 Mon Sep 17 00:00:00 2001
+From 92a83a3979d5281553ab624e6c4b0ae8a708ddf8 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:26:03 -0400
-Subject: [PATCH 5/8] Use roborio time
+Subject: [PATCH 5/9] Use roborio time

 ---
 src/unix/linux-core.c | 8 ++++++++
 1 file changed, 8 insertions(+)

 diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
-index 85f3fc01..12ed7ff1 100644
+index 85f3fc0..12ed7ff 100644
 --- a/src/unix/linux-core.c
 +++ b/src/unix/linux-core.c
@@ -67,6 +67,10 @@
@@ -41,5 +41,5 @@ index 85f3fc01..12ed7ff1 100644
 
 
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0006-Style-comments-cleanup.patch
+++ b/upstream_utils/libuv_patches/0006-Style-comments-cleanup.patch
@@ -1,7 +1,7 @@
-From 1131c424a6f54e3904eed0e2efb138ce4cce9c84 Mon Sep 17 00:00:00 2001
+From 93249980c4c2848dabd35bdc5ba4bc21ff108450 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:28:52 -0400
-Subject: [PATCH 6/8] Style / comments cleanup
+Subject: [PATCH 6/9] Style / comments cleanup

 ---
 src/fs-poll.c     | 1 +
@@ -13,7 +13,7 @@ Subject: [PATCH 6/8] Style / comments cleanup
 6 files changed, 5 insertions(+), 3 deletions(-)

 diff --git a/src/fs-poll.c b/src/fs-poll.c
-index 5a39daed..1a7ca70d 100644
+index 5a39dae..1a7ca70 100644
 --- a/src/fs-poll.c
 +++ b/src/fs-poll.c
@@ -34,6 +34,7 @@
@@ -25,7 +25,7 @@ index 5a39daed..1a7ca70d 100644
   uv_fs_poll_t* parent_handle;
   int busy_polling;
 diff --git a/src/unix/core.c b/src/unix/core.c
-index be2ad1fc..fde43d40 100644
+index be2ad1f..fde43d4 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -524,6 +524,7 @@ int uv__accept(int sockfd) {
@@ -37,7 +37,7 @@ index be2ad1fc..fde43d40 100644
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index 64726bd6..392a0715 100644
+index 64726bd..392a071 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -85,7 +85,6 @@ error2:
@@ -65,7 +65,7 @@ index 64726bd6..392a0715 100644
   struct _uv_barrier* b;
 
 diff --git a/src/uv-common.c b/src/uv-common.c
-index c287246f..534119c0 100644
+index c287246..534119c 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -756,6 +756,7 @@ void uv__fs_readdir_cleanup(uv_fs_t* req) {
@@ -77,7 +77,7 @@ index c287246f..534119c0 100644
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wvarargs"
 diff --git a/src/win/process.c b/src/win/process.c
-index a49016f6..8e7835a5 100644
+index a49016f..8e7835a 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -35,7 +35,6 @@
@@ -89,7 +89,7 @@ index a49016f6..8e7835a5 100644
 
 
 diff --git a/src/win/winsock.c b/src/win/winsock.c
-index 7843e9f1..cda82bc3 100644
+index 7843e9f..cda82bc 100644
 --- a/src/win/winsock.c
 +++ b/src/win/winsock.c
@@ -25,6 +25,7 @@
@@ -101,5 +101,5 @@ index 7843e9f1..cda82bc3 100644
 
 /* Whether there are any non-IFS LSPs stacked on TCP */
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0007-Squelch-GCC-12.1-warnings.patch
+++ b/upstream_utils/libuv_patches/0007-Squelch-GCC-12.1-warnings.patch
@@ -1,7 +1,7 @@
-From 82d952b117b770bbefebd5308416ab767eb58234 Mon Sep 17 00:00:00 2001
+From 5266f44aa4ad009f384cc8afd63bb3414fe9e553 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Tue, 17 May 2022 21:36:57 -0700
-Subject: [PATCH 7/8] Squelch GCC 12.1 warnings
+Subject: [PATCH 7/9] Squelch GCC 12.1 warnings

 ---
 src/unix/stream.c | 9 +++++++++
@@ -9,7 +9,7 @@ Subject: [PATCH 7/8] Squelch GCC 12.1 warnings
 2 files changed, 18 insertions(+)

 diff --git a/src/unix/stream.c b/src/unix/stream.c
-index 41763959..779e8ff8 100644
+index 4176395..779e8ff 100644
 --- a/src/unix/stream.c
 +++ b/src/unix/stream.c
@@ -941,7 +941,16 @@ static void uv__write_callbacks(uv_stream_t* stream) {
@@ -30,7 +30,7 @@ index 41763959..779e8ff8 100644
   while (!QUEUE_EMPTY(&pq)) {
     /* Pop a req off write_completed_queue. */
 diff --git a/src/uv-common.c b/src/uv-common.c
-index 534119c0..00d03320 100644
+index 534119c..00d0332 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -502,7 +502,16 @@ void uv_walk(uv_loop_t* loop, uv_walk_cb walk_cb, void* arg) {
@@ -51,5 +51,5 @@ index 534119c0..00d03320 100644
     q = QUEUE_HEAD(&queue);
     h = QUEUE_DATA(q, uv_handle_t, handle_queue);
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0008-Fix-Win32-warning-suppression-pragma.patch
+++ b/upstream_utils/libuv_patches/0008-Fix-Win32-warning-suppression-pragma.patch
@@ -1,14 +1,14 @@
-From ff18404849ca7560c452f8a600982211de57aa5a Mon Sep 17 00:00:00 2001
+From d58a3c912ce3ae2f4a785aea570b7858808afe1e Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Sat, 21 May 2022 22:58:06 -0700
-Subject: [PATCH 8/8] Fix Win32 warning suppression pragma
+Subject: [PATCH 8/9] Fix Win32 warning suppression pragma

 ---
 src/win/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/win/util.c b/src/win/util.c
-index 7a5dd2ef..d9888aec 100644
+index 7a5dd2e..d9888ae 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -1750,7 +1750,7 @@ int uv_os_uname(uv_utsname_t* buffer) {
@@ -21,5 +21,5 @@ index 7a5dd2ef..d9888aec 100644
     if (GetVersionExW(&os_info) == 0) {
       r = uv_translate_sys_error(GetLastError());
 -- 
-2.36.1
+2.25.1

--- a/upstream_utils/libuv_patches/0009-Avoid-unused-variable-warning-on-Mac.patch
+++ b/upstream_utils/libuv_patches/0009-Avoid-unused-variable-warning-on-Mac.patch
@@ -0,0 +1,24 @@
+From a8a0297596aa58e122b30017ad1f7c4cb846e25c Mon Sep 17 00:00:00 2001
+From: Peter Johnson <johnson.peter@gmail.com>
+Date: Sun, 5 Jun 2022 15:40:35 -0700
+Subject: [PATCH 9/9] Avoid unused variable warning on Mac
+
+---
+ src/unix/darwin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/unix/darwin.c b/src/unix/darwin.c
+index eeb3572..ed51a6a 100644
+--- a/src/unix/darwin.c
+++ b/src/unix/darwin.c
+@@ -257,6 +257,7 @@ static int uv__get_cpu_speed(uint64_t* speed) {
+   // clock_frequency_str's lifetimes after their initialization
+   {
+     kr = pIOMasterPort(MACH_PORT_NULL, &mach_port);
+    (void) kr;
+     assert(kr == KERN_SUCCESS);
+     CFMutableDictionaryRef classes_to_match
+         = pIOServiceMatching("IOPlatformDevice");
+-- 
+2.25.1
+
--- a/upstream_utils/update_libuv.py
+++ b/upstream_utils/update_libuv.py
@@ -23,6 +23,7 @@ def main():
        os.path.join(prefix, "0006-Style-comments-cleanup.patch"),
        os.path.join(prefix, "0007-Squelch-GCC-12.1-warnings.patch"),
        os.path.join(prefix, "0008-Fix-Win32-warning-suppression-pragma.patch"),
+        os.path.join(prefix, "0009-Avoid-unused-variable-warning-on-Mac.patch"),
    ])

    # Delete old install
--- a/wpinet/src/main/native/thirdparty/libuv/src/unix/darwin.cpp
+++ b/wpinet/src/main/native/thirdparty/libuv/src/unix/darwin.cpp
@@ -257,6 +257,7 @@ static int uv__get_cpu_speed(uint64_t* speed) {
  // clock_frequency_str's lifetimes after their initialization
  {
    kr = pIOMasterPort(MACH_PORT_NULL, &mach_port);
+    (void) kr;
    assert(kr == KERN_SUCCESS);
    CFMutableDictionaryRef classes_to_match
        = pIOServiceMatching("IOPlatformDevice");