From fe034229eb3163d0b44219dedbaee26e07b9ac9b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 1 Nov 2018 20:48:03 +0100 Subject: [PATCH] client: Use l_main_run_with_signal instead of open coding it --- client/main.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/client/main.c b/client/main.c index 52d66145..ea64003f 100644 --- a/client/main.c +++ b/client/main.c @@ -31,8 +31,7 @@ #include "display.h" #include "dbus-proxy.h" -static void signal_handler(struct l_signal *signal, uint32_t signo, - void *user_data) +static void signal_handler(uint32_t signo, void *user_data) { switch (signo) { case SIGINT: @@ -46,19 +45,11 @@ static void signal_handler(struct l_signal *signal, uint32_t signo, int main(int argc, char *argv[]) { int exit_status; - struct l_signal *signal; - sigset_t mask; bool interactive; if (!l_main_init()) return EXIT_FAILURE; - sigemptyset(&mask); - sigaddset(&mask, SIGINT); - sigaddset(&mask, SIGTERM); - - signal = l_signal_create(&mask, signal_handler, NULL, NULL); - l_log_set_stderr(); interactive = command_init(argv, argc); @@ -68,7 +59,7 @@ int main(int argc, char *argv[]) dbus_proxy_init(); - l_main_run(); + l_main_run_with_signal(signal_handler, NULL); dbus_proxy_exit(); @@ -78,8 +69,6 @@ int main(int argc, char *argv[]) exit_status = command_get_exit_status(); command_exit(); - l_signal_remove(signal); - l_main_exit(); return exit_status;