ccanlint: rename test keys

[ccan] / tools / ccanlint / compulsory_tests / has_info.c

diff --git a/tools/ccanlint/compulsory_tests/has_info.c b/tools/ccanlint/compulsory_tests/has_info.c
index a5c825265b3266bf9f6b00edc624345d255dd97f..5b71efa4fc9fd9c1304098a5e134d51a3c513e29 100644 (file)
--- a/tools/ccanlint/compulsory_tests/has_info.c
+++ b/tools/ccanlint/compulsory_tests/has_info.c
@@ -10,20 +10,22 @@
 #include <err.h>
 #include <string.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/talloc/talloc.h>
 
-static void *check_has_info(struct manifest *m)
+static void check_has_info(struct manifest *m,
+                          bool keep,
+                          unsigned int *timeleft,
+                          struct score *score)
 {
-       if (m->info_file)
-               return NULL;
-       return m;
-}
-
-static const char *describe_has_info(struct manifest *m, void *check_result)
-{
-       return "You have no _info file.\n\n"
+       if (m->info_file) {
+               score->pass = true;
+               score->score = score->total;
+       } else {
+               score->error = "You have no _info file.\n\n"
        "The file _info contains the metadata for a ccan package: things\n"
        "like the dependencies, the documentation for the package as a whole\n"
        "and license information.\n";
+       }
 }
 
 static const char template[] = 
@@ -52,29 +54,30 @@ static const char template[] =
        "       return 1;\n"
        "}\n";
 
-static void create_info_template(struct manifest *m, void *check_result)
+static void create_info_template(struct manifest *m, struct score *score)
 {
        FILE *info;
+       const char *filename;
 
        if (!ask("Should I create a template _info file for you?"))
                return;
 
-       info = fopen("_info", "w");
+       filename = talloc_asprintf(m, "%s/%s", m->dir, "_info");
+       info = fopen(filename, "w");
        if (!info)
-               err(1, "Trying to create a template _info");
+               err(1, "Trying to create a template _info in %s", filename);
 
        if (fprintf(info, template, m->basename) < 0) {
-               unlink_noerr("_info");
-               err(1, "Writing template into _info");
+               unlink_noerr(filename);
+               err(1, "Writing template into %s", filename);
        }
        fclose(info);
 }
 
 struct ccanlint has_info = {
-       .key = "info",
-       .name = "Has _info file",
+       .key = "info_exists",
+       .name = "Module has _info file",
        .check = check_has_info,
-       .describe = describe_has_info,
        .handle = create_info_template,
 };