From dd55afad680e3d66bc21da65087c7112107492ea Mon Sep 17 00:00:00 2001 From: Integral Date: Thu, 31 Oct 2024 17:14:03 +0800 Subject: [PATCH] refactor: use c99 struct initializers to enhance readability --- lib/libalpm/dload.c | 4 +--- lib/libalpm/util.c | 4 +--- src/pacman/sighandler.c | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2a169490..03807fa0 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -922,12 +922,10 @@ static int curl_download_internal_sandboxed(alpm_handle_t *handle, { int pid, err = 0, ret = -1, callbacks_fd[2]; sigset_t oldblock; - struct sigaction sa_ign, oldint, oldquit; + struct sigaction sa_ign = { .sa_handler = SIG_IGN }, oldint, oldquit; _alpm_sandbox_callback_context callbacks_ctx; sigemptyset(&sa_ign.sa_mask); - sa_ign.sa_handler = SIG_IGN; - sa_ign.sa_flags=0; if(pipe(callbacks_fd) != 0) { return -1; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5df52657..feb38284 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -590,9 +590,7 @@ void _alpm_reset_signals(void) #endif 0 }; - struct sigaction def; - def.sa_flags = 0; - def.sa_handler = SIG_DFL; + struct sigaction def = { .sa_handler = SIG_DFL }; sigemptyset(&def.sa_mask); for(i = signals; *i; i++) { sigaction(*i, &def, NULL); diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index 3e869a31..32b96b2e 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -40,10 +40,8 @@ static ssize_t xwrite(int fd, const void *buf, size_t count) static void _reset_handler(int signum) { - struct sigaction new_action; + struct sigaction new_action = { .sa_handler = SIG_DFL }; sigemptyset(&new_action.sa_mask); - new_action.sa_handler = SIG_DFL; - new_action.sa_flags = 0; sigaction(signum, &new_action, NULL); } @@ -76,9 +74,11 @@ static void soft_interrupt_handler(int signum) void install_soft_interrupt_handler(void) { - struct sigaction new_action; - new_action.sa_handler = soft_interrupt_handler; - new_action.sa_flags = SA_RESTART; + struct sigaction new_action = { + .sa_handler = soft_interrupt_handler, + .sa_flags = SA_RESTART, + }; + sigemptyset(&new_action.sa_mask); sigaddset(&new_action.sa_mask, SIGINT); sigaddset(&new_action.sa_mask, SIGHUP); @@ -118,10 +118,12 @@ static void segv_handler(int signum) void install_segv_handler(void) { - struct sigaction new_action; - new_action.sa_handler = segv_handler; + struct sigaction new_action = { + .sa_handler = segv_handler, + .sa_flags = SA_RESTART, + }; + sigfillset(&new_action.sa_mask); - new_action.sa_flags = SA_RESTART; sigaction(SIGSEGV, &new_action, NULL); } @@ -133,9 +135,11 @@ static void winch_handler(int signum) void install_winch_handler(void) { - struct sigaction new_action; - new_action.sa_handler = winch_handler; + struct sigaction new_action = { + .sa_handler = winch_handler, + .sa_flags = SA_RESTART, + }; + sigemptyset(&new_action.sa_mask); - new_action.sa_flags = SA_RESTART; sigaction(SIGWINCH, &new_action, NULL); }