X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_coverage.c;h=d877553e68b950b7bcc7a2562731f8349bf53536;hb=79ac0049672b1f27b1a7121d06cc38721f76b8e1;hp=caca30ce6865535e27bf618da43ea079f61fa425;hpb=dc8042b42500f79f613b1197df6cdf739615a89f;p=ccan

diff --git a/tools/ccanlint/tests/tests_coverage.c b/tools/ccanlint/tests/tests_coverage.c
index caca30ce..d877553e 100644
--- a/tools/ccanlint/tests/tests_coverage.c
+++ b/tools/ccanlint/tests/tests_coverage.c
@@ -1,6 +1,8 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <ccan/str/str.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -98,7 +100,7 @@ static void analyze_coverage(struct manifest *m, bool full_gcov,
 			apostrophe = strchr(filename, '\'');
 			*apostrophe = '\0';
 			if (lines_matter) {
-				file = tal_grab_file(score, filename, NULL);
+				file = grab_file(score, filename);
 				if (!file) {
 					score->error = tal_fmt(score,
 							       "Reading %s",
@@ -142,8 +144,8 @@ static void do_run_coverage_tests(struct manifest *m,
 	bool ran_some = false;
 
 	/* This tells gcov where we put those .gcno files. */
-	outdir = tal_dirname(score,
-				m->info_file->compiled[COMPILE_NORMAL]);
+	outdir = path_dirname(score,
+			      m->info_file->compiled[COMPILE_NORMAL]);
 	covcmd = tal_fmt(m, "gcov %s -o %s",
 			 full_gcov ? "" : "-n",
 			 outdir);