diff --git a/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch b/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch index adc2b3f221..e09186acd1 100644 --- a/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch +++ b/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 14 Jul 2023 17:33:08 -0700 -Subject: [PATCH 1/9] Revert "win,process: write minidumps when sending SIGQUIT - (#3840)" +Subject: [PATCH 01/10] Revert "win,process: write minidumps when sending + SIGQUIT (#3840)" This reverts commit 748d894e82abcdfff7429cf745003e182c47f163. --- diff --git a/upstream_utils/libuv_patches/0002-Fix-missing-casts.patch b/upstream_utils/libuv_patches/0002-Fix-missing-casts.patch index 917d375e5e..de3bebd093 100644 --- a/upstream_utils/libuv_patches/0002-Fix-missing-casts.patch +++ b/upstream_utils/libuv_patches/0002-Fix-missing-casts.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 26 Apr 2022 15:01:25 -0400 -Subject: [PATCH 2/9] Fix missing casts +Subject: [PATCH 02/10] Fix missing casts --- src/fs-poll.c | 10 ++++---- diff --git a/upstream_utils/libuv_patches/0003-Fix-warnings.patch b/upstream_utils/libuv_patches/0003-Fix-warnings.patch index 1fdfff8098..55cbb9f9ed 100644 --- a/upstream_utils/libuv_patches/0003-Fix-warnings.patch +++ b/upstream_utils/libuv_patches/0003-Fix-warnings.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 26 Apr 2022 15:09:43 -0400 -Subject: [PATCH 3/9] Fix warnings +Subject: [PATCH 03/10] Fix warnings --- include/uv/win.h | 5 +++++ diff --git a/upstream_utils/libuv_patches/0004-Preprocessor-cleanup.patch b/upstream_utils/libuv_patches/0004-Preprocessor-cleanup.patch index 2b887e649f..d5aa3e2f1b 100644 --- a/upstream_utils/libuv_patches/0004-Preprocessor-cleanup.patch +++ b/upstream_utils/libuv_patches/0004-Preprocessor-cleanup.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 26 Apr 2022 15:19:14 -0400 -Subject: [PATCH 4/9] Preprocessor cleanup +Subject: [PATCH 04/10] Preprocessor cleanup --- include/uv.h | 12 ------------ diff --git a/upstream_utils/libuv_patches/0005-Cleanup-problematic-language.patch b/upstream_utils/libuv_patches/0005-Cleanup-problematic-language.patch index fbe7efe6df..e016c2ee1c 100644 --- a/upstream_utils/libuv_patches/0005-Cleanup-problematic-language.patch +++ b/upstream_utils/libuv_patches/0005-Cleanup-problematic-language.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 26 Apr 2022 15:24:47 -0400 -Subject: [PATCH 5/9] Cleanup problematic language +Subject: [PATCH 05/10] Cleanup problematic language --- src/unix/tty.c | 21 +++++++++++---------- diff --git a/upstream_utils/libuv_patches/0006-Fix-Win32-warning-suppression-pragma.patch b/upstream_utils/libuv_patches/0006-Fix-Win32-warning-suppression-pragma.patch index fe00159037..eaf0cb3942 100644 --- a/upstream_utils/libuv_patches/0006-Fix-Win32-warning-suppression-pragma.patch +++ b/upstream_utils/libuv_patches/0006-Fix-Win32-warning-suppression-pragma.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 21 May 2022 22:58:06 -0700 -Subject: [PATCH 6/9] Fix Win32 warning suppression pragma +Subject: [PATCH 06/10] Fix Win32 warning suppression pragma --- src/win/util.c | 2 +- diff --git a/upstream_utils/libuv_patches/0007-Use-C-atomics.patch b/upstream_utils/libuv_patches/0007-Use-C-atomics.patch index 7fea79060d..f8df99a94b 100644 --- a/upstream_utils/libuv_patches/0007-Use-C-atomics.patch +++ b/upstream_utils/libuv_patches/0007-Use-C-atomics.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 13 Jul 2023 22:13:47 -0700 -Subject: [PATCH 7/9] Use C++ atomics +Subject: [PATCH 07/10] Use C++ atomics --- src/unix/async.c | 25 +++++++++++++------------ diff --git a/upstream_utils/libuv_patches/0008-Remove-static-from-array-indices.patch b/upstream_utils/libuv_patches/0008-Remove-static-from-array-indices.patch index 0b7ab19ebf..fb98018557 100644 --- a/upstream_utils/libuv_patches/0008-Remove-static-from-array-indices.patch +++ b/upstream_utils/libuv_patches/0008-Remove-static-from-array-indices.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 13 Jul 2023 23:30:58 -0700 -Subject: [PATCH 8/9] Remove static from array indices +Subject: [PATCH 08/10] Remove static from array indices --- src/unix/linux.c | 12 ++++++------ diff --git a/upstream_utils/libuv_patches/0009-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch b/upstream_utils/libuv_patches/0009-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch index 07407f1fa1..c47dfc85ec 100644 --- a/upstream_utils/libuv_patches/0009-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch +++ b/upstream_utils/libuv_patches/0009-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 14 Jul 2023 16:40:18 -0700 -Subject: [PATCH 9/9] Add pragmas for missing libraries and set _WIN32_WINNT to - Windows 10 +Subject: [PATCH 09/10] Add pragmas for missing libraries and set _WIN32_WINNT + to Windows 10 This makes GetSystemTimePreciseAsFileTime() available. diff --git a/upstream_utils/libuv_patches/0010-Remove-swearing.patch b/upstream_utils/libuv_patches/0010-Remove-swearing.patch new file mode 100644 index 0000000000..bfbe744f71 --- /dev/null +++ b/upstream_utils/libuv_patches/0010-Remove-swearing.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jade Turner +Date: Wed, 26 Jun 2024 11:40:37 +0800 +Subject: [PATCH 10/10] Remove swearing + +--- + src/win/fs.c | 2 +- + src/win/tty.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/win/fs.c b/src/win/fs.c +index 26ba539936786902af5830c2811594292815d2d7..3c73d6294e14e665c1669728495afe6bd91782f2 100644 +--- a/src/win/fs.c ++++ b/src/win/fs.c +@@ -1704,7 +1704,7 @@ INLINE static int fs__stat_handle(HANDLE handle, uv_stat_t* statbuf, + * impossible to delete the file afterwards, since read-only files can't be + * deleted. + * +- * IOW it's all just a clusterfuck and we should think of something that ++ * IOW it's all just a mess and we should think of something that + * makes slightly more sense. + * + * And uv_fs_chmod should probably just fail on windows or be a total no-op. +diff --git a/src/win/tty.c b/src/win/tty.c +index 7adf3cd3ba81a9c41064f4ef2af01667092f27d1..c0461ae56d16165ce0c1d47fb42b7a85a85d7255 100644 +--- a/src/win/tty.c ++++ b/src/win/tty.c +@@ -1055,7 +1055,7 @@ int uv__tty_read_stop(uv_tty_t* handle) { + return 0; + + if (handle->flags & UV_HANDLE_TTY_RAW) { +- /* Cancel raw read. Write some bullshit event to force the console wait to ++ /* Cancel raw read. Write some event to force the console wait to + * return. */ + memset(&record, 0, sizeof record); + record.EventType = FOCUS_EVENT; diff --git a/upstream_utils/update_libuv.py b/upstream_utils/update_libuv.py index f7d13b4db9..273822c5da 100755 --- a/upstream_utils/update_libuv.py +++ b/upstream_utils/update_libuv.py @@ -29,6 +29,7 @@ def main(): "0007-Use-C-atomics.patch", "0008-Remove-static-from-array-indices.patch", "0009-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch", + "0010-Remove-swearing.patch", ]: git_am(os.path.join(wpilib_root, "upstream_utils/libuv_patches", f)) diff --git a/wpinet/src/main/native/cpp/http_parser.cpp b/wpinet/src/main/native/cpp/http_parser.cpp index 66fff6a2d1..fcc838e15b 100644 --- a/wpinet/src/main/native/cpp/http_parser.cpp +++ b/wpinet/src/main/native/cpp/http_parser.cpp @@ -1958,7 +1958,7 @@ reexecute: case s_chunk_parameters: { assert(parser->flags & F_CHUNKED); - /* just ignore this shit. TODO check for overflow */ + /* TODO check for overflow */ if (ch == CR) { UPDATE_STATE(s_chunk_size_almost_done); break; diff --git a/wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp index 26ba539936..3c73d6294e 100644 --- a/wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp +++ b/wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp @@ -1704,7 +1704,7 @@ INLINE static int fs__stat_handle(HANDLE handle, uv_stat_t* statbuf, * impossible to delete the file afterwards, since read-only files can't be * deleted. * - * IOW it's all just a clusterfuck and we should think of something that + * IOW it's all just a mess and we should think of something that * makes slightly more sense. * * And uv_fs_chmod should probably just fail on windows or be a total no-op. diff --git a/wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp index 7adf3cd3ba..c0461ae56d 100644 --- a/wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp +++ b/wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp @@ -1055,7 +1055,7 @@ int uv__tty_read_stop(uv_tty_t* handle) { return 0; if (handle->flags & UV_HANDLE_TTY_RAW) { - /* Cancel raw read. Write some bullshit event to force the console wait to + /* Cancel raw read. Write some event to force the console wait to * return. */ memset(&record, 0, sizeof record); record.EventType = FOCUS_EVENT;