From b5eb41d882f72e4f74fad599b20c0c8ec69c0c57 Mon Sep 17 00:00:00 2001 From: Viacheslav Muravyev Date: Mon, 26 Aug 2024 03:54:09 +0700 Subject: [PATCH] unix,win: remove unused rb-tree macro parameters (#4518) --- include/uv/tree.h | 4 ++-- src/unix/signal.c | 2 +- src/win/signal.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uv/tree.h b/include/uv/tree.h index 0e41cb0e..06bba084 100644 --- a/include/uv/tree.h +++ b/include/uv/tree.h @@ -483,8 +483,8 @@ name##_RB_MINMAX(struct name *head, int val) \ #define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y) #define RB_FIND(name, x, y) name##_RB_FIND(x, y) #define RB_NFIND(name, x, y) name##_RB_NFIND(x, y) -#define RB_NEXT(name, x, y) name##_RB_NEXT(y) -#define RB_PREV(name, x, y) name##_RB_PREV(y) +#define RB_NEXT(name, x) name##_RB_NEXT(x) +#define RB_PREV(name, x) name##_RB_PREV(x) #define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF) #define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF) diff --git a/src/unix/signal.c b/src/unix/signal.c index bc4206e6..f23c887d 100644 --- a/src/unix/signal.c +++ b/src/unix/signal.c @@ -195,7 +195,7 @@ static void uv__signal_handler(int signum) { for (handle = uv__signal_first_handle(signum); handle != NULL && handle->signum == signum; - handle = RB_NEXT(uv__signal_tree_s, &uv__signal_tree, handle)) { + handle = RB_NEXT(uv__signal_tree_s, handle)) { int r; msg.signum = signum; diff --git a/src/win/signal.c b/src/win/signal.c index 8c79871b..85730b27 100644 --- a/src/win/signal.c +++ b/src/win/signal.c @@ -91,7 +91,7 @@ int uv__signal_dispatch(int signum) { for (handle = RB_NFIND(uv_signal_tree_s, &uv__signal_tree, &lookup); handle != NULL && handle->signum == signum; - handle = RB_NEXT(uv_signal_tree_s, &uv__signal_tree, handle)) { + handle = RB_NEXT(uv_signal_tree_s, handle)) { unsigned long previous = InterlockedExchange( (volatile LONG*) &handle->pending_signum, signum);