mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pass NULL pointer as user data to signal handler

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-08-12 14:55:07 -04:00
parent 63900ec374
commit 6bded3fd95
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+5 -5
View File
@@ -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) 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); fprintf(stderr, "caught signal %d\n", signal_number);
wl_display_terminate(ec->wl_display); wl_display_terminate(display);
return 1; return 1;
} }
@@ -2055,9 +2055,9 @@ int main(int argc, char *argv[])
display = wl_display_create(); display = wl_display_create();
loop = wl_display_get_event_loop(display); loop = wl_display_get_event_loop(display);
wl_event_loop_add_signal(loop, SIGTERM, 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, ec); wl_event_loop_add_signal(loop, SIGINT, on_term_signal, display);
wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, ec); wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, display);
wl_list_init(&child_process_list); wl_list_init(&child_process_list);
wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL); wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL);