X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=9abd62288e6923307f68716d34ea7d7b2a96da04;hp=4908a895423b98eddcd70fc5d973dc60e871d4b9;hb=09fde153ba7a68715dcad3b53cbbb8804c3d2356;hpb=f9492529ffcc609036bb817561ee2a20546071ab

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 4908a895..9abd6228 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -18,10 +18,21 @@
 
 const char *ccan_dir;
 
+const char *get_ccan_file_contents(struct ccan_file *f)
+{
+	if (!f->contents) {
+		f->contents = grab_file(f, f->fullname, &f->contents_size);
+		if (!f->contents)
+			err(1, "Reading file %s", f->fullname);
+	}
+	return f->contents;
+}
+
 char **get_ccan_file_lines(struct ccan_file *f)
 {
 	if (!f->lines)
-		f->lines = strsplit(f, f->contents, "\n", &f->num_lines);
+		f->lines = strsplit(f, get_ccan_file_contents(f),
+				    "\n", &f->num_lines);
 
 	return f->lines;
 }
@@ -48,6 +59,8 @@ struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
 	f->compiled = NULL;
 	f->name = talloc_steal(f, name);
 	f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
+	f->contents = NULL;
+	f->cov_compiled = NULL;
 	return f;
 }
 
@@ -90,23 +103,15 @@ static void add_files(struct manifest *m, const char *dir)
 
 		if (streq(f->name, "_info")) {
 			m->info_file = f;
-			f->contents = grab_file(f, f->name, &f->contents_size);
-			if (!f->contents)
-				err(1, "Reading file %s", f->name);
 			continue;
 		}
 
 		is_c_src = strends(f->name, ".c");
 		if (!is_c_src && !strends(f->name, ".h")) {
-			/* We don't pull in contents of non-source files */
 			dest = &m->other_files;
 			continue;
 		}
 
-		f->contents = grab_file(f, f->name, &f->contents_size);
-		if (!f->contents)
-			err(1, "Reading file %s", f->name);
-
 		if (!strchr(f->name, '/')) {
 			if (is_c_src)
 				dest = &m->c_files;