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;
}
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;
}
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;
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);
list_head_init(&m->other_test_c_files);
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);
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(&score->per_file_errors, &fe->list);
+}