tools/ccanlint: compile cleanly with -Wextra.

[ccan] / tools / ccanlint / async.c

diff --git a/tools/ccanlint/async.c b/tools/ccanlint/async.c
index 5c2c4da73d31b1929b1dd25fcaa513c1b2337e92..e5b9078dbda65c5c36b6b46636b4fad365fd586e 100644 (file)
--- a/tools/ccanlint/async.c
+++ b/tools/ccanlint/async.c
@@ -12,9 +12,7 @@
 #include <assert.h>
 #include <ccan/lbalance/lbalance.h>
 #include <ccan/tlist/tlist.h>
-#include <ccan/grab_file/grab_file.h>
 #include <ccan/time/time.h>
-#include <ccan/talloc/talloc.h>
 
 static struct lbalance *lb;
 TLIST_TYPE(command, struct command);
@@ -36,7 +34,7 @@ struct command {
        const void *ctx;
 };
 
-static void killme(int sig)
+static void killme(int sig UNNEEDED)
 {
        kill(-getpid(), SIGKILL);
 }
@@ -47,10 +45,12 @@ static void run_more(void)
 
        while (num_running < lbalance_target(lb)) {
                int p[2];
-               c = tlist_top(&pending, struct command, list);
+
+               c = tlist_top(&pending, list);
                if (!c)
                        break;
 
+               fflush(stdout);
                if (pipe(p) != 0)
                        err(1, "Pipe failed");
                c->pid = fork();
@@ -68,7 +68,7 @@ static void run_more(void)
 
                        signal(SIGALRM, killme);
                        itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
-                       itim.it_value = time_from_msec(c->time_ms);
+                       itim.it_value = timespec_to_timeval(time_from_msec(c->time_ms).ts);
                        setitimer(ITIMER_REAL, &itim, NULL);
 
                        c->status = system(c->command);
@@ -90,7 +90,7 @@ static void run_more(void)
        }
 }
 
-static int destroy_command(struct command *command)
+static void destroy_command(struct command *command)
 {
        if (!command->done && command->pid) {
                kill(-command->pid, SIGKILL);
@@ -99,7 +99,6 @@ static int destroy_command(struct command *command)
        }
 
        tlist_del(command, list);
-       return 0;
 }
 
 void run_command_async(const void *ctx, unsigned int time_ms,
@@ -113,17 +112,18 @@ void run_command_async(const void *ctx, unsigned int time_ms,
        if (!lb)
                lb = lbalance_new();
 
-       command = talloc(ctx, struct command);
+       command = tal(ctx, struct command);
        command->ctx = ctx;
        command->time_ms = time_ms;
        command->pid = 0;
-       command->output = talloc_strdup(command, "");
+       /* We want to track length, so don't use tal_strdup */
+       command->output = tal_arrz(command, char, 1);
        va_start(ap, fmt);
-       command->command = talloc_vasprintf(command, fmt, ap);
+       command->command = tal_vfmt(command, fmt, ap);
        va_end(ap);
        tlist_add_tail(&pending, command, list);
        command->done = false;
-       talloc_set_destructor(command, destroy_command);
+       tal_add_destructor(command, destroy_command);
 
        run_more();
 }
@@ -149,14 +149,12 @@ static void reap_output(void)
                if (FD_ISSET(c->output_fd, &in)) {
                        int old_len, len;
                        /* This length includes nul terminator! */
-                       old_len = talloc_array_length(c->output);
-                       c->output = talloc_realloc(c, c->output, char,
-                                                  old_len + 1024);
+                       old_len = tal_count(c->output);
+                       tal_resize(&c->output, old_len + 1024);
                        len = read(c->output_fd, c->output + old_len - 1, 1024);
                        if (len < 0)
                                err(1, "Reading from async command");
-                       c->output = talloc_realloc(c, c->output, char,
-                                                  old_len + len);
+                       tal_resize(&c->output, old_len + len);
                        c->output[old_len + len - 1] = '\0';
                        if (len == 0) {
                                struct rusage ru;
@@ -187,7 +185,7 @@ void *collect_command(bool *ok, char **output)
        struct command *c;
        const void *ctx;
 
-       while ((c = tlist_top(&done, struct command, list)) == NULL) {
+       while ((c = tlist_top(&done, list)) == NULL) {
                if (tlist_empty(&pending) && tlist_empty(&running))
                        return NULL;
                reap_output();
@@ -196,8 +194,8 @@ void *collect_command(bool *ok, char **output)
 
        *ok = (WIFEXITED(c->status) && WEXITSTATUS(c->status) == 0);
        ctx = c->ctx;
-       *output = talloc_steal(ctx, c->output);
-       talloc_free(c);
+       *output = tal_steal(ctx, c->output);
+       tal_free(c);
        return (void *)ctx;
 }