tal: neaten child property initialization.

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index c8697320a9fd5616c5dfa1e04af686efec0c1a87..5b6581e5fc068c69218c4823672fef13a286c58e 100644 (file)
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -73,7 +73,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
        int p[2];
        char *ret;
        int status, ms;
-       struct timeval start;
+       struct timespec start;
 
        *ok = false;
        if (pipe(p) != 0)
@@ -92,7 +92,6 @@ char *run_with_timeout(const void *ctx, const char *cmd,
                close_noerr(p[1]);
                return talloc_asprintf(ctx, "Failed to fork: %s",
                                       strerror(errno));
-               return NULL;
        }
 
        if (pid == 0) {
@@ -107,7 +106,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 
                signal(SIGALRM, killme);
                itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
-               itim.it_value = time_from_msec(*timeout_ms);
+               itim.it_value = timespec_to_timeval(time_from_msec(*timeout_ms));
                setitimer(ITIMER_REAL, &itim, NULL);
 
                status = system(cmd);