ccanlint: tweak example compilation.

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 4908a895423b98eddcd70fc5d973dc60e871d4b9..6ee74de884c68500b0a29b44e4b8d33f33538379 100644 (file)
--- 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;
@@ -134,30 +139,6 @@ static void add_files(struct manifest *m, const char *dir)
        closedir(d);
 }
 
-char *report_on_lines(struct list_head *files,
-                     char *(*report)(const char *),
-                     char *sofar)
-{
-       struct ccan_file *f;
-
-       list_for_each(files, f, list) {
-               unsigned int i;
-               char **lines = get_ccan_file_lines(f);
-
-               for (i = 0; i < f->num_lines; i++) {
-                       char *r = report(lines[i]);
-                       if (!r)
-                               continue;
-
-                       sofar = talloc_asprintf_append(sofar,
-                                                      "%s:%u:%s\n",
-                                                      f->name, i+1, r);
-                       talloc_free(r);
-               }
-       }
-       return sofar;
-}
-
 struct manifest *get_manifest(const void *ctx, const char *dir)
 {
        struct manifest *m = talloc(ctx, struct manifest);
@@ -175,6 +156,7 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
        list_head_init(&m->other_test_files);
        list_head_init(&m->other_files);
        list_head_init(&m->examples);
+       list_head_init(&m->mangled_examples);
        list_head_init(&m->dep_dirs);
 
        olddir = talloc_getcwd(NULL);
@@ -568,3 +550,12 @@ enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
        return ret;
 }
 
+void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
+                     const char *error)
+{
+       struct file_error *fe = talloc(score, struct file_error);
+       fe->file = f;
+       fe->line = line;
+       fe->error = error;
+       list_add_tail(&score->per_file_errors, &fe->list);
+}