tools: manifest.c should use path_canon.

[ccan] / tools / ccanlint / tests / info_documentation_exists.c

diff --git a/tools/ccanlint/tests/info_documentation_exists.c b/tools/ccanlint/tests/info_documentation_exists.c
index 93954c76df5612b87ea62974481d6ec47e28c60b..13cf7c7be5161114fd0eda1b4161f25ee748808a 100644 (file)
--- a/tools/ccanlint/tests/info_documentation_exists.c
+++ b/tools/ccanlint/tests/info_documentation_exists.c
@@ -11,9 +11,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <ccan/str/str.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/noerr/noerr.h>
-#include <ccan/grab_file/grab_file.h>
 
 static void check_info_documentation_exists(struct manifest *m,
                                            unsigned int *timeleft,
@@ -47,12 +45,12 @@ static void create_info_template_doc(struct manifest *m, struct score *score)
                    " *\n"
                    " * Followed by an Example: section with a standalone\n"
                    " * (trivial and usually useless) program\n"
-                   " */\n", m->basename, m->basename) < 0) {
+                   " */\n", m->modname, m->basename) < 0) {
                unlink_noerr("_info.new");
                err(1, "Writing to _info.new to insert documentation");
        }
 
-       oldcontents = grab_file(m, m->info_file->fullname, NULL);
+       oldcontents = tal_grab_file(m, m->info_file->fullname, NULL);
        if (!oldcontents) {
                unlink_noerr("_info.new");
                err(1, "Reading %s", m->info_file->fullname);
@@ -83,7 +81,7 @@ static void check_info_documentation_exists(struct manifest *m,
        score->pass = true;
 
        list_for_each(infodocs, d, list) {
-               if (!streq(d->function, m->basename))
+               if (!streq(d->function, m->modname))
                        continue;
                if (streq(d->type, "summary"))
                        summary = true;
@@ -94,13 +92,13 @@ static void check_info_documentation_exists(struct manifest *m,
        if (summary && description) {
                score->score = score->total;
        } else if (!summary) {
-               score->error = talloc_strdup(score,
+               score->error = tal_strdup(score,
                "_info file has no module documentation.\n\n"
                "CCAN modules use /**-style comments for documentation: the\n"
                "overall documentation belongs in the _info metafile.\n");
                info_documentation_exists.handle = create_info_template_doc;
        } else if (!description)  {
-               score->error = talloc_strdup(score,
+               score->error = tal_strdup(score,
                "_info file has no module description.\n\n"
                "The lines after the first summary line in the _info file\n"
                "documentation should describe the purpose and use of the\n"