ccanlint: fix more potential segvs when reporting ccanlint errors.

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 0e57140018ffee1693bbf3f1010dd622316e1335..41aaec9353ae9b1d09bf063f38b4e9cd24507881 100644 (file)
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -5,15 +5,14 @@
 #include "../doc_extract.h"
 
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-compulsory-tests"
-#include "generated-normal-tests"
-#undef REGISTER_TEST
 
-#define REGISTER_TEST(name, ...) 
+/* 0 == Describe failed tests.
+   1 == Describe results for partial failures.
+   2 == One line per test, plus details of failures.
 
-/* 1 == Describe results for partial failures.
-   2 == Describe gory details.
-   3 == Describe every action. */
+   Mainly for debugging ccanlint:
+   3 == Describe every object built.
+   4 == Describe every action. */
 extern int verbose;
 
 struct manifest {
@@ -22,6 +21,11 @@ struct manifest {
        char *basename;
        struct ccan_file *info_file;
 
+       /* Linked off deps. */
+       struct list_node list;
+       /* Where our final compiled output is */
+       char *compiled;
+
        struct list_head c_files;
        struct list_head h_files;
 
@@ -37,7 +41,7 @@ struct manifest {
        struct list_head mangled_examples;
 
        /* From tests/check_depends_exist.c */
-       struct list_head dep_dirs;
+       struct list_head deps;
 };
 
 struct manifest *get_manifest(const void *ctx, const char *dir);
@@ -45,14 +49,13 @@ struct manifest *get_manifest(const void *ctx, const char *dir);
 struct file_error {
        struct list_node list;
        struct ccan_file *file;
-       unsigned int line; /* 0 not to print */
-       const char *error;
+       unsigned int line;
 };
 
 struct score {
        bool pass;
        unsigned int score, total;
-       const char *error;
+       char *error;
        struct list_head per_file_errors;
 };
 
@@ -78,6 +81,14 @@ struct ccanlint {
        /* Can we do something about it? (NULL if not) */
        void (*handle)(struct manifest *m, struct score *score);
 
+       /* Options from _info. */
+       char *options;
+       /* If not set, we'll give an error if they try to set options. */
+       bool takes_options;
+
+       /* comma-separated list of dependency keys. */
+       const char *needs;
+
        /* Internal use fields: */
        /* Who depends on us? */
        struct list_head dependencies;
@@ -154,6 +165,9 @@ struct ccan_file {
 
        /* Compiled with coverage information. */
        char *cov_compiled;
+
+       /* Leak output from valgrind. */
+       char *leak_info;
 };
 
 /* A new ccan_file, with the given name (talloc_steal onto returned value). */
@@ -188,10 +202,9 @@ char *get_symbol_token(void *ctx, const char **line);
 /* Similarly for ->doc_sections */
 struct list_head *get_ccan_file_docs(struct ccan_file *f);
 
-
-/* Add an error about this file (and line, if non-zero) to the score struct */
+/* Append message about this file (and line, if non-zero) to the score->error */
 void score_file_error(struct score *, struct ccan_file *f, unsigned line,
-                     const char *error);
+                     const char *errorfmt, ...);
 
 /* Normal tests. */
 extern struct ccanlint trailing_whitespace;