Simplify -I lines: change includes to ccan/

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 1341e57b11d3230780704ead95a0e123deb10042..d9f03dacfed94702e61a0ae0fa54e7b3f9c32e3a 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -1,7 +1,9 @@
 #include "ccanlint.h"
 #include "get_file_lines.h"
 #include <talloc/talloc.h>
-#include <string/string.h>
+#include <str/str.h>
+#include <str_talloc/str_talloc.h>
+#include <grab_file/grab_file.h>
 #include <noerr/noerr.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -13,8 +15,12 @@
 
 char **get_ccan_file_lines(struct ccan_file *f)
 {
-       if (!f->lines)
-               f->lines = get_file_lines(f, f->name, &f->num_lines);
+       if (!f->lines) {
+               char *buffer = grab_file(f, f->name, NULL);
+               if (!buffer)
+                       err(1, "Getting file %s", f->name);
+               f->lines = strsplit(f, buffer, "\n", &f->num_lines);
+       }
        return f->lines;
 }