X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=f1e45c50ebc5fb37c1cf8a44becfbd8141c56f2d;hp=041af49e3f214773c463e4ab8823dbb08ea9e1f8;hb=163daaf4813b2061b106b9b0077202724e3dca04;hpb=4c5ed661c625ac2638a18f9540ff5b9f96a6ba6f diff --git a/tools/depends.c b/tools/depends.c index 041af49e..f1e45c50 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -235,7 +235,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 +251,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 +270,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 +282,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); }