From 3a5080ec97f0e5954daa21b58284b8f43f4a61a5 Mon Sep 17 00:00:00 2001 From: Michalis Pappas Date: Tue, 9 Jan 2024 13:09:18 +0100 Subject: [PATCH] lib/posix-process/signal: Fix coding style of sigset.h Fix checkpatch issues, prefix macro args with underscore, remove conditional definition to HAVE_LIBC, include header for __sigset type. Checkpatch-Ignore: MACRO_ARG_REUSE Signed-off-by: Michalis Pappas Reviewed-by: Ioan-Teodor Teugea Reviewed-by: Sergiu Moga Reviewed-by: Andrei Tatar Approved-by: Andrei Tatar GitHub-Closes: #1248 --- lib/posix-process/signal/sigset.h | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/posix-process/signal/sigset.h b/lib/posix-process/signal/sigset.h index 0a46c8e06..a6ae02202 100644 --- a/lib/posix-process/signal/sigset.h +++ b/lib/posix-process/signal/sigset.h @@ -37,26 +37,22 @@ #ifndef __UK_PROCESS_SIGSET_H__ #define __UK_PROCESS_SIGSET_H__ +#include + #ifdef __cplusplus extern "C" { #endif -/* TODO: do we have gnu statement expression? */ -/* internal use */ -#if !HAVE_LIBC - -#define uk_sigemptyset(ptr) (*(ptr) = 0) -#define uk_sigfillset(ptr) (*(ptr) = ~((__sigset_t) 0)) -#define uk_sigaddset(ptr, signo) (*(ptr) |= (1UL << ((signo) - 1))) -#define uk_sigdelset(ptr, signo) (*(ptr) &= ~(1UL << ((signo) - 1))) -#define uk_sigcopyset(ptr1, ptr2) (*(ptr1) = *(ptr2)) -#define uk_sigandset(ptr1, ptr2) (*(ptr1) &= *(ptr2)) -#define uk_sigorset(ptr1, ptr2) (*(ptr1) |= *(ptr2)) -#define uk_sigreverseset(ptr) (*(ptr) = ~(*(ptr))) -#define uk_sigismember(ptr, signo) (*(ptr) & (1UL << ((signo) - 1))) -#define uk_sigisempty(ptr) (*(ptr) == 0) - -#endif +#define uk_sigemptyset(_ptr) (*(_ptr) = 0) +#define uk_sigfillset(_ptr) (*(_ptr) = ~((__sigset_t)0)) +#define uk_sigaddset(_ptr, _signo) (*(_ptr) |= (1UL << ((_signo) - 1))) +#define uk_sigdelset(_ptr, _signo) (*(_ptr) &= ~(1UL << ((_signo) - 1))) +#define uk_sigcopyset(_ptr1, _ptr2) (*(_ptr1) = *(_ptr2)) +#define uk_sigandset(_ptr1, _ptr2) (*(_ptr1) &= *(_ptr2)) +#define uk_sigorset(_ptr1, _ptr2) (*(_ptr1) |= *(_ptr2)) +#define uk_sigreverseset(_ptr) (*(_ptr) = ~(*(_ptr))) +#define uk_sigismember(_ptr, _signo) (*(_ptr) & (1UL << ((_signo) - 1))) +#define uk_sigisempty(_ptr) (*(_ptr) == 0) #ifdef __cplusplus } -- 2.39.5