Web updates.

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 2a66a545846e37e119ffc5921395f3309a0f049f..3152cd1e16a555e8b19ebca25c2b1836df11aed2 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -32,6 +32,19 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f)
        return f->doc_sections;
 }
 
+struct ccan_file *new_ccan_file(const void *ctx, char *name)
+{
+       struct ccan_file *f;
+
+       f = talloc(ctx, struct ccan_file);
+       f->lines = NULL;
+       f->line_info = NULL;
+       f->doc_sections = NULL;
+       f->compiled = NULL;
+       f->name = talloc_steal(f, name);
+       return f;
+}
+
 static void add_files(struct manifest *m, const char *dir)
 {
        DIR *d;
@@ -53,11 +66,8 @@ static void add_files(struct manifest *m, const char *dir)
                if (ent->d_name[0] == '.')
                        continue;
 
-               f = talloc(m, struct ccan_file);
-               f->lines = NULL;
-               f->line_info = NULL;
-               f->doc_sections = NULL;
-               f->name = talloc_asprintf(f, "%s%s", dir, ent->d_name);
+               f = new_ccan_file(m, talloc_asprintf(m, "%s%s",
+                                                    dir, ent->d_name));
                if (lstat(f->name, &st) != 0)
                        err(1, "lstat %s", f->name);
 
@@ -106,7 +116,7 @@ static void add_files(struct manifest *m, const char *dir)
                                else if (strstarts(f->name, "test/compile_fail"))
                                        dest = &m->compile_fail_tests;
                                else
-                                       dest = &m->other_test_files;
+                                       dest = &m->other_test_c_files;
                        } else
                                dest = &m->other_test_files;
                } else
@@ -141,9 +151,9 @@ char *report_on_lines(struct list_head *files,
        return sofar;
 }
 
-struct manifest *get_manifest(void)
+struct manifest *get_manifest(const void *ctx)
 {
-       struct manifest *m = talloc(NULL, struct manifest);
+       struct manifest *m = talloc(ctx, struct manifest);
        unsigned int len;
 
        m->info_file = NULL;
@@ -153,18 +163,15 @@ struct manifest *get_manifest(void)
        list_head_init(&m->run_tests);
        list_head_init(&m->compile_ok_tests);
        list_head_init(&m->compile_fail_tests);
+       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->dep_dirs);
+       list_head_init(&m->dep_objs);
 
-       /* *This* is why people hate C. */
-       len = 32;
-       m->basename = talloc_array(m, char, len);
-       while (!getcwd(m->basename, len)) {
-               if (errno != ERANGE)
-                       err(1, "Getting current directory");
-               m->basename = talloc_realloc(m, m->basename, char, len *= 2);
-       }
-
+       m->basename = talloc_getcwd(m);
+       if (!m->basename)
+               err(1, "Getting current directory");
        len = strlen(m->basename);
        while (len && m->basename[len-1] == '/')
                m->basename[--len] = '\0';