X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fidempotent.c;h=a5210e2fecf3235426474527a7127fe968bd3c92;hb=016a19d260cd7f4afeb5b2b2cc28c8bbed1cd170;hp=bf21b22621339022c17f52448cd213bd5631c4b2;hpb=ca951c94fba731b878f5bb3f81bb99c397dc4e12;p=ccan-lca-2011.git

diff --git a/tools/ccanlint/tests/idempotent.c b/tools/ccanlint/tests/idempotent.c
index bf21b22..a5210e2 100644
--- a/tools/ccanlint/tests/idempotent.c
+++ b/tools/ccanlint/tests/idempotent.c
@@ -24,13 +24,14 @@ static const char explain[]
 
 static void fix_name(char *name)
 {
-	unsigned int i, j;
+	unsigned int i;
 
-	for (i = j = 0; name[i]; i++) {
-		if (isalnum(name[i]) || name[i] == '_')
-			name[j++] = toupper(name[i]);
+	for (i = 0; name[i]; i++) {
+		if (isalnum(name[i]))
+			name[i] = toupper(name[i]);
+		else
+			name[i] = '_';
 	}
-	name[j] = '\0';
 }
 
 static void handle_idem(struct manifest *m, struct score *score)
@@ -44,10 +45,10 @@ static void handle_idem(struct manifest *m, struct score *score)
 
 		/* Main header gets CCAN_FOO_H, others CCAN_FOO_XXX_H */
 		if (strstarts(e->file->name, m->basename)
-		    || strlen(e->file->name) != strlen(m->basename) + 2)
+		    || strlen(e->file->name) == strlen(m->basename) + 2)
 			name = talloc_asprintf(score, "CCAN_%s_H", m->basename);
 		else
-			name = talloc_asprintf(score, "CCAN_%s_%s_H",
+			name = talloc_asprintf(score, "CCAN_%s_%s",
 					       m->basename, e->file->name);
 		fix_name(name);
 
@@ -183,20 +184,21 @@ static void check_idempotent(struct manifest *m,
 	struct ccan_file *f;
 
 	list_for_each(&m->h_files, f, list) {
-		if (!check_idem(f, score)) {
+		if (!check_idem(f, score))
 			score->error = "Headers are not idempotent";
-			return;
-		}
 	}
-	score->pass = true;
-	score->score = score->total;
+	if (!score->error) {
+		score->pass = true;
+		score->score = score->total;
+	}
 }
 
 struct ccanlint idempotent = {
-	.key = "idempotent",
+	.key = "headers_idempotent",
 	.name = "Module headers are #ifndef/#define wrapped",
 	.check = check_idempotent,
 	.handle = handle_idem,
+	.needs = ""
 };
 
-REGISTER_TEST(idempotent, NULL);
+REGISTER_TEST(idempotent);