take, tal, tal/path, tal/str, tal/talloc: annotate APIs with TAKES.

[ccan] / ccan / tal / path / path.c

diff --git a/ccan/tal/path/path.c b/ccan/tal/path/path.c
index a0dbe291440e248fba0faddf6a70bf0062c0c009..362152d29cb261747f60a46d14db60addd6b928b 100644 (file)
--- a/ccan/tal/path/path.c
+++ b/ccan/tal/path/path.c
@@ -1,7 +1,6 @@
 /* Licensed under BSD-MIT - see LICENSE file for details */
 #include <ccan/tal/path/path.h>
 #include <ccan/str/str.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -50,7 +49,7 @@ char *path_join(const tal_t *ctx, const char *base, const char *a)
                goto out;
 
        len = strlen(base);
-       ret = tal_dup(ctx, char, base, len, 1 + strlen(a) + 1);
+       ret = tal_dup_arr(ctx, char, base, len, 1 + strlen(a) + 1);
        if (!ret)
                goto out;
        if (ret[len-1] != PATH_SEP)
@@ -465,7 +464,7 @@ char *path_basename(const tal_t *ctx, const char *path)
 static char *fixed_string(const tal_t *ctx,
                          const char *str, const char *path)
 {
-       char *ret = tal_dup(ctx, char, path, 0, strlen(str)+1);
+       char *ret = tal_dup_arr(ctx, char, path, 0, strlen(str)+1);
        if (ret)
                strcpy(ret, str);
        return ret;