Xinqi Bao's Git
projects
/
slstatus.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
450e8e6
)
Simplify signal handling a bit
author
Laslo Hunhold <
[email protected]
>
Sun, 13 Aug 2017 18:33:44 +0000
(20:33 +0200)
committer
Aaron Marcher <
[email protected]
>
Sun, 13 Aug 2017 21:32:14 +0000
(23:32 +0200)
slstatus.c
diff
|
blob
|
history
diff --git
a/slstatus.c
b/slstatus.c
index
8d07f6e
..
cd6cc8f
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-837,11
+837,9
@@
wifi_essid(const char *iface)
}
static void
}
static void
-
sighandler
(const int signo)
+
terminate
(const int signo)
{
{
- if (signo == SIGTERM || signo == SIGINT) {
- done = 1;
- }
+ done = 1;
}
static void
}
static void
@@
-874,9
+872,9
@@
main(int argc, char *argv[])
}
memset(&act, 0, sizeof(act));
}
memset(&act, 0, sizeof(act));
- act.sa_handler =
sighandler
;
- sigaction(SIGINT, &act,
0
);
- sigaction(SIGTERM, &act,
0
);
+ act.sa_handler =
terminate
;
+ sigaction(SIGINT, &act,
NULL
);
+ sigaction(SIGTERM, &act,
NULL
);
if (!sflag) {
dpy = XOpenDisplay(NULL);
if (!sflag) {
dpy = XOpenDisplay(NULL);