diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-07-22 14:42:09 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-07-22 23:53:48 +0200 |
| commit | d91b8841d7a3ee08aa686852154b08a3e9eb9732 (patch) | |
| tree | be74173c9a2cead7f6498984d4b0bb13cb05deab | |
| parent | 97f4e8875088ff34da535864afa0054f24071cd5 (diff) | |
collect, keymap, systemctl: use _noreturn_
| -rw-r--r-- | src/systemctl/systemctl.c | 2 | ||||
| -rw-r--r-- | src/udev/collect/collect.c | 3 | ||||
| -rw-r--r-- | src/udev/keymap/keymap.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e587cfbfae..18c8abeaad 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5641,7 +5641,7 @@ done: return 0; } -static void halt_now(enum action a) { +static _noreturn_ void halt_now(enum action a) { /* Make sure C-A-D is handled by the kernel from this * point on... */ diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c index 777542979a..80f464aff0 100644 --- a/src/udev/collect/collect.c +++ b/src/udev/collect/collect.c @@ -33,6 +33,7 @@ #include "libudev.h" #include "libudev-private.h" +#include "macro.h" #define BUFSIZE 16 #define UDEV_ALARM_TIMEOUT 180 @@ -60,7 +61,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) return container_of(node, struct _mate, node); } -static void sig_alrm(int signo) +_noreturn_ static void sig_alrm(int signo) { exit(4); } diff --git a/src/udev/keymap/keymap.c b/src/udev/keymap/keymap.c index 051aa42552..6dc9c2d200 100644 --- a/src/udev/keymap/keymap.c +++ b/src/udev/keymap/keymap.c @@ -40,6 +40,7 @@ const struct key* lookup_key (const char *str, unsigned int len); #include "keys-from-name.h" #include "keys-to-name.h" +#include "macro.h" #include "util.h" #define MAX_SCANCODES 1024 @@ -346,7 +347,7 @@ static void interactive(int fd) ioctl(fd, EVIOCGRAB, 0); } -static void help(int error) +_noreturn_ static void help(int error) { const char* h = "Usage: keymap <event device> [<map file>]\n" " keymap <event device> scancode keyname [...]\n" |