commit 1fafc78
Michael Forney
·
2018-11-14 08:05:40 +0000 UTC
parent f89bbf9
launch: Use C11 noreturn
1 files changed,
+11,
-9
+11,
-9
1@@ -27,15 +27,17 @@
2
3 #include "protocol.h"
4
5-#include <stdlib.h>
6-#include <stdio.h>
7-#include <stdbool.h>
8-#include <string.h>
9-#include <spawn.h>
10-#include <unistd.h>
11 #include <errno.h>
12 #include <fcntl.h>
13 #include <poll.h>
14+#include <spawn.h>
15+#include <stdbool.h>
16+#include <stdio.h>
17+#include <stdlib.h>
18+#include <stdnoreturn.h>
19+#include <string.h>
20+#include <unistd.h>
21+
22 #include <sys/socket.h>
23 #include <sys/stat.h>
24 #include <sys/wait.h>
25@@ -75,10 +77,10 @@ static struct {
26 static bool nflag;
27 static int sigfd[2];
28
29-static void __attribute__((noreturn, format(printf, 1, 2)))
30+static noreturn void __attribute__((format(printf, 1, 2)))
31 die(const char *format, ...);
32
33-static void __attribute__((noreturn)) usage(const char *name)
34+static noreturn void usage(const char *name)
35 {
36 fprintf(stderr, "usage: %s [-n] [-t tty] [--] server [args...]\n", name);
37 exit(2);
38@@ -136,7 +138,7 @@ cleanup(void)
39 kill(child_pid, SIGTERM);
40 }
41
42-void __attribute__((noreturn, format(printf, 1, 2)))
43+noreturn void __attribute__((format(printf, 1, 2)))
44 die(const char *format, ...)
45 {
46 va_list args;