antithread, failtest: use ccan/err instead of err.h.

[ccan] / ccan / antithread / antithread.c

diff --git a/ccan/antithread/antithread.c b/ccan/antithread/antithread.c
index da607c1e7b28cd15a07bad97c95805349c863a65..080f890cd859fc6390c19e4e1daa18025283fb30 100644 (file)
--- a/ccan/antithread/antithread.c
+++ b/ccan/antithread/antithread.c
@@ -1,3 +1,4 @@
+/* Licensed under GPLv3+ - see LICENSE file for details */

 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>


@@ -6,10 +7,11 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <signal.h>

 #include <errno.h>
 #include <assert.h>
 #include <errno.h>
 #include <assert.h>

-#include <err.h>

 #include "antithread.h"
 #include "antithread.h"

+#include <ccan/err/err.h>

 #include <ccan/noerr/noerr.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/read_write_all/read_write_all.h>


@@ -420,7 +422,7 @@ struct at_pool *at_get_pool(int *argc, char *argv[], void **arg)
 
        p = atp->p = talloc(atp, struct at_pool_contents);
 
 
        p = atp->p = talloc(atp, struct at_pool_contents);
 

-       if (sscanf(argv[1], "AT:%p/%lu/%i/%i/%i/%p", 
+       if (sscanf(argv[1], "AT:%p/%lu/%i/%i/%i/%p",

                   &p->pool, &p->poolsize, &p->fd,
                   &p->parent_rfd, &p->parent_wfd, arg) != 6) {
                errno = EINVAL;
                   &p->pool, &p->poolsize, &p->fd,
                   &p->parent_rfd, &p->parent_wfd, arg) != 6) {
                errno = EINVAL;