diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-12 14:55:07 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-12 14:55:07 -0400 |
commit | 6bded3fd957f13f74e9ad1599eecaae851907d67 (patch) | |
tree | a6199bf3a1bd4520c36f82e6d818cd3022bd4783 | |
parent | 63900ec374c574b501e010da110fa0b16ef119c2 (diff) |
Don't pass NULL pointer as user data to signal handler
-rw-r--r-- | compositor/compositor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c index 680772d..2b88440 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -1957,10 +1957,10 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display) static int on_term_signal(int signal_number, void *data) { - struct wlsc_compositor *ec = data; + struct wl_display *display = data; fprintf(stderr, "caught signal %d\n", signal_number); - wl_display_terminate(ec->wl_display); + wl_display_terminate(display); return 1; } @@ -2055,9 +2055,9 @@ int main(int argc, char *argv[]) display = wl_display_create(); loop = wl_display_get_event_loop(display); - wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, ec); - wl_event_loop_add_signal(loop, SIGINT, on_term_signal, ec); - wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, ec); + wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, display); + wl_event_loop_add_signal(loop, SIGINT, on_term_signal, display); + wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, display); wl_list_init(&child_process_list); wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL); |