X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fheaders_idempotent.c;h=4e41d058d22a60fcf4edf8550aba0586c0d7bd33;hb=932d65dd6537250e617516749f03a00fea3b34f6;hp=4b98b246bfcdacc24608e5b6352ec9a77c4b2de3;hpb=60824f8a0f758dc7808eb31cc83434ea78f44ed1;p=ccan

diff --git a/tools/ccanlint/tests/headers_idempotent.c b/tools/ccanlint/tests/headers_idempotent.c
index 4b98b246..4e41d058 100644
--- a/tools/ccanlint/tests/headers_idempotent.c
+++ b/tools/ccanlint/tests/headers_idempotent.c
@@ -46,10 +46,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)
-			name = talloc_asprintf(score, "CCAN_%s_H", m->basename);
+			name = talloc_asprintf(score, "CCAN_%s_H", m->modname);
 		else
 			name = talloc_asprintf(score, "CCAN_%s_%s",
-					       m->basename, e->file->name);
+					       m->modname, e->file->name);
 		fix_name(name);
 
 		q = talloc_asprintf(score,
@@ -58,7 +58,7 @@ static void handle_idem(struct manifest *m, struct score *score)
 		if (!ask(q))
 			continue;
 
-		tmpname = maybe_temp_file(score, ".h", false, e->file->name);
+		tmpname = temp_file(score, ".h", e->file->name);
 		out = fopen(tmpname, "w");
 		if (!out)
 			err(1, "Opening %s", tmpname);
@@ -174,7 +174,6 @@ static void check_idem(struct ccan_file *f, struct score *score)
 }
 
 static void check_idempotent(struct manifest *m,
-			     bool keep,
 			     unsigned int *timeleft, struct score *score)
 {
 	struct ccan_file *f;