From b8ed8b124aaff754e244dff6930b36c192fa69e0 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 14 Jan 2014 12:20:25 -0500 Subject: src/libudev: bring in line with upstream Signed-off-by: Anthony G. Basile --- src/collect/collect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/collect/collect.c') diff --git a/src/collect/collect.c b/src/collect/collect.c index 1346f27f91..cb5df01c6a 100644 --- a/src/collect/collect.c +++ b/src/collect/collect.c @@ -61,7 +61,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) return container_of(node, struct _mate, node); } -_noreturn_ static void sig_alrm(int signo) +noreturn static void sig_alrm(int signo) { exit(4); } @@ -97,7 +97,7 @@ static int prepare(char *dir, char *filename) fd = open(buf,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); if (fd < 0) - fprintf(stderr, "Cannot open %s: %s\n", buf, strerror(errno)); + fprintf(stderr, "Cannot open %s: %m\n", buf); if (lockf(fd,F_TLOCK,0) < 0) { if (debug) @@ -109,7 +109,7 @@ static int prepare(char *dir, char *filename) fprintf(stderr, "Acquired lock on %s\n", buf); } else { if (debug) - fprintf(stderr, "Could not get lock on %s: %s\n", buf, strerror(errno)); + fprintf(stderr, "Could not get lock on %s: %m\n", buf); } } @@ -404,7 +404,7 @@ int main(int argc, char **argv) us = argv[argi++]; if (signal(SIGALRM, sig_alrm) == SIG_ERR) { - fprintf(stderr, "Cannot set SIGALRM: %s\n", strerror(errno)); + fprintf(stderr, "Cannot set SIGALRM: %m\n"); ret = 2; goto exit; } -- cgit v1.2.3-54-g00ecf