| From ad60aa8e1c03cc5f0c88159d37f63b0c063927c7 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 5a39daed..1a7ca70d 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 223c5513..4c23f608 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 64726bd6..392a0715 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 49026c03..c9a32c03 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 a49016f6..8e7835a5 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 7843e9f1..cda82bc3 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 */ |