mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
103 lines
2.7 KiB
Diff
103 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 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/9] Style / comments cleanup
|
|
|
|
---
|
|
src/fs-poll.c | 1 +
|
|
src/unix/core.c | 1 +
|
|
src/unix/thread.c | 3 +--
|
|
src/uv-common.c | 1 +
|
|
src/win/process.c | 1 -
|
|
src/win/winsock.c | 1 +
|
|
6 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/fs-poll.c b/src/fs-poll.c
|
|
index 5a39daed095502b2db34f23fcaf0ab04f31f96ff..1a7ca70d62c71f6eaef2b9985796cc46a6438869 100644
|
|
--- a/src/fs-poll.c
|
|
+++ b/src/fs-poll.c
|
|
@@ -34,6 +34,7 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
+
|
|
struct poll_ctx {
|
|
uv_fs_poll_t* parent_handle;
|
|
int busy_polling;
|
|
diff --git a/src/unix/core.c b/src/unix/core.c
|
|
index 223c55131b1ca01696792d9305ab33f0d21af73c..4c23f608c842bdcb09d621374a0ccb0bda79166e 100644
|
|
--- a/src/unix/core.c
|
|
+++ b/src/unix/core.c
|
|
@@ -544,6 +544,7 @@ int uv__accept(int sockfd) {
|
|
return peerfd;
|
|
}
|
|
|
|
+
|
|
#if defined(__APPLE__)
|
|
#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 64726bd618b930e1aa7e1de3cbceb8aa712ff617..392a0715a85074576ba89d2a415ca55037edf347 100644
|
|
--- a/src/unix/thread.c
|
|
+++ b/src/unix/thread.c
|
|
@@ -85,7 +85,6 @@ error2:
|
|
return rc;
|
|
}
|
|
|
|
-
|
|
int uv_barrier_wait(uv_barrier_t* barrier) {
|
|
struct _uv_barrier* b;
|
|
int last;
|
|
@@ -94,6 +93,7 @@ int uv_barrier_wait(uv_barrier_t* barrier) {
|
|
return UV_EINVAL;
|
|
|
|
b = barrier->b;
|
|
+ /* Lock the mutex*/
|
|
uv_mutex_lock(&b->mutex);
|
|
|
|
if (++b->in == b->threshold) {
|
|
@@ -113,7 +113,6 @@ int uv_barrier_wait(uv_barrier_t* barrier) {
|
|
return last;
|
|
}
|
|
|
|
-
|
|
void uv_barrier_destroy(uv_barrier_t* barrier) {
|
|
struct _uv_barrier* b;
|
|
|
|
diff --git a/src/uv-common.c b/src/uv-common.c
|
|
index 49026c03c53a0779a051b8f6bd5809961f5c54e2..c9a32c0336777aa3a41cac7cb7a4c23ad3f677da 100644
|
|
--- a/src/uv-common.c
|
|
+++ b/src/uv-common.c
|
|
@@ -758,6 +758,7 @@ void uv__fs_readdir_cleanup(uv_fs_t* req) {
|
|
}
|
|
}
|
|
|
|
+
|
|
#ifdef __clang__
|
|
# pragma clang diagnostic push
|
|
# pragma clang diagnostic ignored "-Wvarargs"
|
|
diff --git a/src/win/process.c b/src/win/process.c
|
|
index a49016f65601c0127b4c0ba5b538e2556314eb46..8e7835a5e90f9fae89fc9a9be2f6945e2814dfa7 100644
|
|
--- a/src/win/process.c
|
|
+++ b/src/win/process.c
|
|
@@ -35,7 +35,6 @@
|
|
#include "handle-inl.h"
|
|
#include "req-inl.h"
|
|
|
|
-
|
|
#define SIGKILL 9
|
|
|
|
|
|
diff --git a/src/win/winsock.c b/src/win/winsock.c
|
|
index 7843e9f13321c32419cebaacde82d30f471e11d7..cda82bc33c2c6e3dbfa9d978b5b40476228452bd 100644
|
|
--- a/src/win/winsock.c
|
|
+++ b/src/win/winsock.c
|
|
@@ -25,6 +25,7 @@
|
|
#include "uv.h"
|
|
#include "internal.h"
|
|
|
|
+
|
|
#pragma comment(lib, "Ws2_32.lib")
|
|
|
|
/* Whether there are any non-IFS LSPs stacked on TCP */
|