brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Avoid missing braces warnings when compiling with clang

Browse Source 
Since -Werror=missing-braces is used, having missing braces warnings
aren't allowed. However, the first member of struct sigaction is a union
whose first member is a pointer, causing clang to produce warnings when
it is initialized to { 0 }.

Instead of initializing to a zero value, we can specify values of
members directly in the initializer to avoid warnings.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/633
This commit is contained in:
Ting-Wei Lan 2019-07-20 16:28:53 +08:00
parent bd5162105e
commit d9d9778a98
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@ -372,7 +372,7 @@ dump_gjs_stack_alarm_sigaction (int signo)
static void static void
dump_gjs_stack_on_signal_handler (int signo) dump_gjs_stack_on_signal_handler (int signo)
{ {
struct sigaction sa = { 0 }; struct sigaction sa = { .sa_handler = dump_gjs_stack_alarm_sigaction };
gsize i; gsize i;
/* Ignore all the signals starting this point, a part the one we'll raise /* Ignore all the signals starting this point, a part the one we'll raise
@ -388,7 +388,6 @@ dump_gjs_stack_on_signal_handler (int signo)
/* Waiting at least 5 seconds for the dumpstack, if it fails, we raise the error */ /* Waiting at least 5 seconds for the dumpstack, if it fails, we raise the error */
caught_signal = signo; caught_signal = signo;
sa.sa_handler = dump_gjs_stack_alarm_sigaction;
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
sigaction (SIGALRM, &sa, NULL); sigaction (SIGALRM, &sa, NULL);
@ -402,10 +401,11 @@ dump_gjs_stack_on_signal_handler (int signo)
static void static void
dump_gjs_stack_on_signal (int signo) dump_gjs_stack_on_signal (int signo)
{ {
struct sigaction sa = { 0 }; struct sigaction sa = {
.sa_flags = SA_RESETHAND | SA_NODEFER,
.sa_handler = dump_gjs_stack_on_signal_handler,
};
sa.sa_flags = SA_RESETHAND | SA_NODEFER;
sa.sa_handler = dump_gjs_stack_on_signal_handler;
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
sigaction (signo, &sa, NULL); sigaction (signo, &sa, NULL);