X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;h=d7082fac296c68730383542dce0a82085aee03a3;hb=174fe59fdce127808420986f56987205ecab2858;hp=2a47d0eb97fc7f3ded74a6ef01e676a1cd8fae75;hpb=cb1408d445f8f8c44cbc9cb6468b3ee3d4fa7b27;p=ccan

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index 2a47d0eb..d7082fac 100644
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -1,8 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
+#include <ccan/take/take.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,7 +21,7 @@ static bool has_dep(struct manifest *m, char **deps, bool *used,
 	unsigned int i;
 
 	/* We can include ourselves, of course. */
-	if (streq(depname + strlen("ccan/"), m->basename))
+	if (streq(depname + strlen("ccan/"), m->modname))
 		return true;
 
 	for (i = 0; deps[i]; i++) {
@@ -46,9 +45,9 @@ static bool check_dep_includes(struct manifest *m,
 
 	for (i = 0; lines[i]; i++) {
 		char *mod;
-		if (!strreg(f, lines[i],
-			    "^[ \t]*#[ \t]*include[ \t]*[<\"]"
-			    "(ccan/+[^/]+)/", &mod))
+		if (!tal_strreg(f, lines[i],
+				"^[ \t]*#[ \t]*include[ \t]*[<\"]"
+				"(ccan/+.+)/+[^/]+\\.h", &mod))
 			continue;
 
 		if (has_dep(m, deps, used, mod))
@@ -86,10 +85,10 @@ static void check_depends_accurate(struct manifest *m,
 				 get_or_compile_info);
 	}
 
-	core_deps = talloc_array_length(deps) - 1;
-	test_deps = talloc_array_length(tdeps) - 1;
+	core_deps = tal_count(deps) - 1;
+	test_deps = tal_count(tdeps) - 1;
 
-	used = talloc_zero_array(m, bool, core_deps + test_deps + 1);
+	used = tal_arrz(m, bool, core_deps + test_deps + 1);
 
 	foreach_ptr(list, &m->c_files, &m->h_files) {
 		struct ccan_file *f;
@@ -99,16 +98,15 @@ static void check_depends_accurate(struct manifest *m,
 	}
 
 	for (i = 0; i < core_deps; i++) {
-		if (!used[i])
+		if (!used[i] && strstarts(deps[i], "ccan/"))
 			score_file_error(score, m->info_file, 0,
 					 "%s is an unused dependency",
 					 deps[i]);
 	}
 
-	/* Now append test dependencies to deps. */
-	deps = talloc_realloc(NULL, deps, char *,
-			      (core_deps + test_deps + 1) * sizeof(char *));
-	memcpy(&deps[core_deps], tdeps, test_deps * sizeof(char *));
+	/* Now remove NUL and append test dependencies to deps. */
+	deps = tal_dup(m, char *, take(deps), core_deps, test_deps + 2);
+	memcpy(deps + core_deps, tdeps, sizeof(tdeps[0]) * test_deps);
 	/* ccan/tap is given a free pass. */
 	deps[core_deps + test_deps] = (char *)"ccan/tap";
 	deps[core_deps + test_deps + 1] = NULL;