From d3352b997ca59a336a40fe6660c6e5b7079864aa Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sun, 28 Jun 2020 14:58:32 +0200 Subject: Run clang-format on source tree (excl igmp.c) --- minecproxy/signal-handler.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'minecproxy/signal-handler.c') diff --git a/minecproxy/signal-handler.c b/minecproxy/signal-handler.c index 15c3816..ba92382 100644 --- a/minecproxy/signal-handler.c +++ b/minecproxy/signal-handler.c @@ -21,16 +21,14 @@ struct signal_ev { int pipe[2]; }; -static void -signal_delete() +static void signal_delete() { assert_return(cfg->signal); uring_task_destroy(&cfg->signal->task); } -static void -signalfd_read(struct uring_task *task, int res) +static void signalfd_read(struct uring_task *task, int res) { struct signal_ev *signal = container_of(task, struct signal_ev, task); struct server *server, *stmp; @@ -60,8 +58,8 @@ signalfd_read(struct uring_task *task, int res) goto out; } - debug(DBG_DNS, "DNS lookup complete, dns: %p, dns->cb: %p", - dns, dns->cb); + debug(DBG_DNS, "DNS lookup complete, dns: %p, dns->cb: %p", dns, + dns->cb); dns->cb(dns); break; } @@ -109,8 +107,8 @@ out: uring_tbuf_read(&signal->task, signalfd_read); } -static void -hack_signal_handler(int signum, siginfo_t *si, _unused_ void *ucontext) +static void hack_signal_handler(int signum, siginfo_t *si, + _unused_ void *ucontext) { ssize_t r; @@ -119,11 +117,9 @@ hack_signal_handler(int signum, siginfo_t *si, _unused_ void *ucontext) r = write(cfg->signal->pipe[PIPE_WR], si, sizeof(*si)); if (r != sizeof(*si)) error("write: %zi\n", r); - } -static void -signal_free(struct uring_task *task) +static void signal_free(struct uring_task *task) { struct signal_ev *signal = container_of(task, struct signal_ev, task); @@ -135,18 +131,16 @@ signal_free(struct uring_task *task) xfree(signal); } -void -signal_refdump() +void signal_refdump() { assert_return(cfg->signal); uring_task_refdump(&cfg->signal->task); } -void -signal_init() +void signal_init() { - //sigset_t mask; + // sigset_t mask; struct signal_ev *signal; assert_return(!cfg->signal); @@ -183,12 +177,11 @@ signal_init() action.sa_flags = 0; sigaction(SIGPIPE, &action, NULL); - debug(DBG_SIG, "using pipe fds %i -> %i", - signal->pipe[PIPE_WR], signal->pipe[PIPE_RD]); + debug(DBG_SIG, "using pipe fds %i -> %i", signal->pipe[PIPE_WR], + signal->pipe[PIPE_RD]); uring_task_init(&signal->task, "signal", uring_parent(), signal_free); uring_task_set_fd(&signal->task, signal->pipe[PIPE_RD]); uring_task_set_buf(&signal->task, &signal->tbuf); cfg->signal = signal; uring_tbuf_read(&signal->task, signalfd_read); } - -- cgit v1.2.3