X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fno_trailing_whitespace.c;h=5c5cf35bb68769ea1276756ac7a34c99147f5b1d;hb=932d65dd6537250e617516749f03a00fea3b34f6;hp=1018be3cd64938788a47019f71b11c832755fa8b;hpb=7bb7cd58c2d9df126dd6072e5f3bec1eb4dc916b;p=ccan

diff --git a/tools/ccanlint/tests/no_trailing_whitespace.c b/tools/ccanlint/tests/no_trailing_whitespace.c
index 1018be3c..5c5cf35b 100644
--- a/tools/ccanlint/tests/no_trailing_whitespace.c
+++ b/tools/ccanlint/tests/no_trailing_whitespace.c
@@ -22,7 +22,6 @@ static char *get_trailing_whitespace(const char *line)
 }
 
 static void check_trailing_whitespace(struct manifest *m,
-				      bool keep,
 				      unsigned int *timeleft,
 				      struct score *score)
 {
@@ -30,18 +29,21 @@ static void check_trailing_whitespace(struct manifest *m,
 	struct ccan_file *f;
 	unsigned int i;
 
+	/* We don't fail ccanlint for this. */
+	score->pass = true;
+
 	foreach_ptr(list, &m->c_files, &m->h_files) {
 		list_for_each(list, f, list) {
 			char **lines = get_ccan_file_lines(f);
 			for (i = 0; i < f->num_lines; i++) {
 				char *err = get_trailing_whitespace(lines[i]);
 				if (err)
-					score_file_error(score, f, i+1, err);
+					score_file_error(score, f, i+1,
+							 "%s", err);
 			}
 		}
 	}
 	if (!score->error) {
-		score->pass = true;
 		score->score = score->total;
 	}
 }
@@ -50,7 +52,7 @@ struct ccanlint no_trailing_whitespace = {
 	.key = "no_trailing_whitespace",
 	.name = "Module's source code has no trailing whitespace",
 	.check = check_trailing_whitespace,
-	.needs = ""
+	.needs = "info_exists"
 };