X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fheaders_idempotent.c;h=56c37ef7cbb59489d771d41d7b5f6562359a90b9;hb=89fcdf8c701183e56d370876ec16a04ebbf921fb;hp=55fa9974b6d37c08edd6fc004e7068fdf25be974;hpb=5f551788224a3cf0988ae490a807b20292822f20;p=ccan

diff --git a/tools/ccanlint/tests/headers_idempotent.c b/tools/ccanlint/tests/headers_idempotent.c
index 55fa9974..56c37ef7 100644
--- a/tools/ccanlint/tests/headers_idempotent.c
+++ b/tools/ccanlint/tests/headers_idempotent.c
@@ -125,9 +125,10 @@ static void check_idem(struct ccan_file *f, struct score *score)
 	if (!f->lines[i])
 		return;
 
-	/* We expect a condition on this line. */
+	/* We expect a condition around this line. */
 	if (!line_info[i].cond) {
-		score_file_error(score, f, i+1, "Expected #ifndef");
+		score_file_error(score, f, first_preproc_line+1,
+				 "Expected #ifndef");
 		return;
 	}
 
@@ -136,7 +137,8 @@ static void check_idem(struct ccan_file *f, struct score *score)
 	/* We expect the condition to be ! IFDEF <symbol>. */
 	if (line_info[i].cond->type != PP_COND_IFDEF
 	    || !line_info[i].cond->inverse) {
-		score_file_error(score, f, i+1, "Expected #ifndef");
+		score_file_error(score, f, first_preproc_line+1,
+				 "Expected #ifndef");
 		return;
 	}
 
@@ -157,6 +159,9 @@ static void check_idem(struct ccan_file *f, struct score *score)
 		return;
 	}
 
+	/* Record this for use in depends_accurate */
+	f->idempotent_cond = line_info[i].cond;
+
 	/* Rest of code should all be covered by that conditional. */
 	for (i++; f->lines[i]; i++) {
 		unsigned int val = 0;
@@ -173,7 +178,8 @@ static void check_idem(struct ccan_file *f, struct score *score)
 }
 
 static void check_idempotent(struct manifest *m,
-			     unsigned int *timeleft, struct score *score)
+			     unsigned int *timeleft UNNEEDED,
+			     struct score *score)
 {
 	struct ccan_file *f;