fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify signal handling a bit

This commit is contained in:
Laslo Hunhold 2017-08-13 20:33:44 +02:00 committed by Aaron Marcher
parent 450e8e6e6b
commit 3468a6e368
No known key found for this signature in database
GPG Key ID: 74B048E5C2474F9A
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slstatus.c
View File

@ -837,12 +837,10 @@ 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
usage(void) usage(void)
@ -874,9 +872,9 @@ main(int argc, char *argv[])
} }
memset(&act, 0, sizeof(act)); memset(&act, 0, sizeof(act));
act.sa_handler = sighandler; act.sa_handler = terminate;
sigaction(SIGINT, &act, 0); sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, 0); sigaction(SIGTERM, &act, NULL);
if (!sflag) { if (!sflag) {
dpy = XOpenDisplay(NULL); dpy = XOpenDisplay(NULL);