From b597afa45a40ed2720659649e77dd25b45383fc0 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 28 Nov 2018 16:01:40 +0200 Subject: shared/mainloop: Remove mainloop_set_signal This removes mainloop_set_signal and replaces it usage with mainloop_run_with_signal. --- android/bluetoothd-snoop.c | 9 +-------- android/system-emulator.c | 10 +--------- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'android') diff --git a/android/bluetoothd-snoop.c b/android/bluetoothd-snoop.c index 8d9a2d087..25cddee34 100644 --- a/android/bluetoothd-snoop.c +++ b/android/bluetoothd-snoop.c @@ -219,7 +219,6 @@ static void set_capabilities(void) int main(int argc, char *argv[]) { const char *path; - sigset_t mask; __btd_log_init(NULL, 0); @@ -234,12 +233,6 @@ int main(int argc, char *argv[]) mainloop_init(); - sigemptyset(&mask); - sigaddset(&mask, SIGINT); - sigaddset(&mask, SIGTERM); - - mainloop_set_signal(&mask, signal_callback, NULL, NULL); - if (!strcmp(DEFAULT_SNOOP_FILE, path)) rename(DEFAULT_SNOOP_FILE, DEFAULT_SNOOP_FILE ".old"); @@ -250,7 +243,7 @@ int main(int argc, char *argv[]) info("bluetoothd_snoop: started"); - mainloop_run(); + mainloop_run_with_signal(signal_callback, NULL); close_monitor(); diff --git a/android/system-emulator.c b/android/system-emulator.c index 1545dcea1..8bcf660e2 100644 --- a/android/system-emulator.c +++ b/android/system-emulator.c @@ -216,19 +216,11 @@ static void signal_callback(int signum, void *user_data) int main(int argc, char *argv[]) { const char SYSTEM_SOCKET_PATH[] = "\0android_system"; - sigset_t mask; struct sockaddr_un addr; int fd; mainloop_init(); - sigemptyset(&mask); - sigaddset(&mask, SIGINT); - sigaddset(&mask, SIGTERM); - sigaddset(&mask, SIGCHLD); - - mainloop_set_signal(&mask, signal_callback, NULL, NULL); - printf("Android system emulator ver %s\n", VERSION); snprintf(exec_dir, sizeof(exec_dir), "%s", dirname(argv[0])); @@ -254,5 +246,5 @@ int main(int argc, char *argv[]) /* Make sure bluetoothd creates files with proper permissions */ umask(0177); - return mainloop_run(); + return mainloop_run_with_signal(signal_callback, NULL); } -- cgit v1.2.1