X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Finfo_summary_single_line.c;h=b45e00bab4344c6dcf2f2c0220b133335e564131;hp=12f95e6e138325ea7fc40c0a17134bedca73987a;hb=HEAD;hpb=dc199bb0ca26a6a01062933e04791eaf5e8494e5

diff --git a/tools/ccanlint/tests/info_summary_single_line.c b/tools/ccanlint/tests/info_summary_single_line.c
index 12f95e6e..b45e00ba 100644
--- a/tools/ccanlint/tests/info_summary_single_line.c
+++ b/tools/ccanlint/tests/info_summary_single_line.c
@@ -1,53 +1,37 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <stdio.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 
-/* Summary line is form '<identifier> - ' (spaces for 'struct foo -') */
-/* slightly modified from doc_extract-core.c */
-static unsigned int is_summary_line(const char *line)
-{
-	unsigned int id_len;
-
-	id_len = strspn(line, IDENT_CHARS" *");
-	if (id_len == 0)
-		return 0;
-	if (strspn(line, " ") == id_len)
-		return 0;
-	if (!strstarts(line + id_len-1, " - "))
-		return 0;
-	return id_len - 1;
-}
-
 static void check_info_summary_single_line(struct manifest *m,
-					   bool keep,
-					   unsigned int *timeleft,
+					   unsigned int *timeleft UNNEEDED,
 					   struct score *score)
 {
-	int i = 0;
-	get_ccan_line_info(m->info_file);
-	score->total = 1;
-	for (i = 0; i < m->info_file->num_lines; ++i) {
-		if (is_summary_line(m->info_file->lines[i])) {
-			if (strspn(m->info_file->lines[i+1], " *") == strlen(m->info_file->lines[i+1])) {
-				/* valid summary line */
-				score->error = NULL;
-				score->pass = true;
-				score->score = 1;
-			} else {
-				/* invalid summary line - line following summary line should be empty */
-				score->pass = false;
-				score->score = 0;
-				score->error = "invalid summary line - not on a single line:";
-				score_file_error(score, m->info_file, i+1, "summary is not on a single line");
-			}
-			break;
+	struct list_head *infodocs = get_ccan_file_docs(m->info_file);
+	struct doc_section *d;
+
+	score->pass = true;
+	score->score = 1;
+
+	list_for_each(infodocs, d, list) {
+		const char *after;
+
+		if (!streq(d->type, "summary"))
+			continue;
+
+		/* line following summary line should be empty */
+		after = m->info_file->lines[d->srcline+1];
+		if (after && strspn(after, " *") != strlen(after)) {
+			score->pass = false;
+			score->score = 0;
+			score_file_error(score, m->info_file, d->srcline+1,
+					 "%s\n%s",
+					 m->info_file->lines[d->srcline],
+					 m->info_file->lines[d->srcline+1]);
 		}
 	}
 }
 
-
 struct ccanlint info_summary_single_line = {
 	.key = "info_summary_single_line",
 	.name = "Module has a single line summary in _info",