X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fhas_main_header.c;h=338f7af789fece9a2b99f222002d0d777908288e;hp=071c7157ba54b29fa7c822f0d5a31ab5fc8e048f;hb=f9423c171395571f9880286190d9cf63da147668;hpb=501b31cddfaa3e8a4374dc84f6f75d07dd2d0abb

diff --git a/tools/ccanlint/compulsory_tests/has_main_header.c b/tools/ccanlint/compulsory_tests/has_main_header.c
index 071c7157..338f7af7 100644
--- a/tools/ccanlint/compulsory_tests/has_main_header.c
+++ b/tools/ccanlint/compulsory_tests/has_main_header.c
@@ -12,32 +12,31 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/noerr/noerr.h>
 
-static void *check_has_main_header(struct manifest *m)
+static void check_has_main_header(struct manifest *m,
+				  bool keep,
+				  unsigned int *timeleft, struct score *score)
 {
 	struct ccan_file *f;
 
 	list_for_each(&m->h_files, f, list) {
 		if (strstarts(f->name, m->basename)
-		    && strlen(f->name) == strlen(m->basename) + 2)
-			return NULL;
+		    && strlen(f->name) == strlen(m->basename) + 2) {
+			score->pass = true;
+			score->score = score->total;
+			return;
+		} 
 	}
-	return m;
-}
-
-static const char *describe_has_main_header(struct manifest *m,
-					    void *check_result)
-{
-	return talloc_asprintf(m,
+	score->error = talloc_asprintf(score,
 	"You have no %s/%s.h header file.\n\n"
 	"CCAN modules have a name, the same as the directory name.  They're\n"
 	"expected to have an interface in the header of the same name.\n",
-			       m->basename, m->basename);
+				       m->basename, m->basename);
 }
 
 struct ccanlint has_main_header = {
-	.name = "No main header file",
+	.key = "main_header_exists",
+	.name = "Module has main header file",
 	.check = check_has_main_header,
-	.describe = describe_has_main_header,
 };
 
 REGISTER_TEST(has_main_header, NULL);