antithread: fix -Wwrite-strings warning in test, and trailing whitespace.

diff --git a/ccan/antithread/antithread.c b/ccan/antithread/antithread.c
index da607c1e7b28cd15a07bad97c95805349c863a65..e3f3bac92277379149ff5985509da319389f7e3a 100644 (file)
--- a/ccan/antithread/antithread.c
+++ b/ccan/antithread/antithread.c
@@ -420,7 +420,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;

diff --git a/ccan/antithread/test/run-spawn.c b/ccan/antithread/test/run-spawn.c
index b8aa81e5d707aafa421c3934a447e3d3b506270c..f1dcd2f82c1cc2322028ac7569d57d42a916f057 100644 (file)
--- a/ccan/antithread/test/run-spawn.c
+++ b/ccan/antithread/test/run-spawn.c
@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
        struct athread *at;
        int err, *pid;
        void *arg;
        struct athread *at;
        int err, *pid;
        void *arg;

-       char *bad_args[] = { "/", NULL };
+       char *bad_args[] = { (char *)"/", NULL };

 
        atp = at_get_pool(&argc, argv, &arg);
        if (atp) {
 
        atp = at_get_pool(&argc, argv, &arg);
        if (atp) {