configurator: add HAVE_ERR_H test.

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index 041af49e3f214773c463e4ab8823dbb08ea9e1f8..7f232233b32b90bda37a9b5f35422e3c399ce6b0 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -3,6 +3,7 @@
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
+#include <ccan/compiler/compiler.h>
 #include "tools.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -12,7 +13,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-static char ** __attribute__((format(printf, 2, 3)))
+static char ** PRINTF_FMT(2, 3)
 lines_from_cmd(const void *ctx, const char *format, ...)
 {
        va_list ap;
@@ -48,7 +49,7 @@ static char *compile_info(const void *ctx, const char *dir)
        if (!info)
                return NULL;
 
-       info_c_file = maybe_temp_file(ctx, ".c", false, "_info");
+       info_c_file = temp_file(ctx, ".c", "_info");
        fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
        if (fd < 0)
                return NULL;
@@ -62,7 +63,7 @@ static char *compile_info(const void *ctx, const char *dir)
        if (strrchr(ccandir, '/'))
                *strrchr(ccandir, '/') = '\0';
 
-       compiled = maybe_temp_file(ctx, "", false, "info");
+       compiled = temp_file(ctx, "", "info");
        if (compile_and_link(ctx, info_c_file, ccandir, "",
                             CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
                             compiled, &output))
@@ -235,7 +236,7 @@ char **get_libs(const void *ctx, const char *dir,
 }
 
 /* FIXME: This is O(n^2), which is dumb. */
-static void uniquify_deps(char **deps)
+static char **uniquify_deps(char **deps)
 {
        unsigned int i, j, num;
 
@@ -251,7 +252,7 @@ static void uniquify_deps(char **deps)
        }
        deps[num] = NULL;
        /* Make sure talloc_array_length() works */
-       deps = talloc_realloc(NULL, deps, char *, num + 1);
+       return talloc_realloc(NULL, deps, char *, num + 1);
 }
 
 char **get_deps(const void *ctx, const char *dir,
@@ -270,8 +271,7 @@ char **get_deps(const void *ctx, const char *dir,
                unlink(temp);
                talloc_free(temp);
        }
-       uniquify_deps(ret);
-       return ret;
+       return uniquify_deps(ret);
 }
 
 char **get_safe_ccan_deps(const void *ctx, const char *dir,
@@ -283,6 +283,5 @@ char **get_safe_ccan_deps(const void *ctx, const char *dir,
        } else {
                ret = get_all_deps(ctx, dir, NULL, get_one_safe_deps);
        }
-       uniquify_deps(ret);
-       return ret;
+       return uniquify_deps(ret);
 }