From: Johan Malm <jgm323@gmail.com>
Date: Mon, 3 Apr 2023 12:49:35 +0000 (+0100)
Subject: find-banned: print filename with each unwanted token
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=684731200f2300a06799aece5f0d314596b5b735;p=proto%2Flabwc.git

find-banned: print filename with each unwanted token
---

diff --git a/scripts/helper/find-idents.c b/scripts/helper/find-idents.c
index b7b36a84..655aba28 100644
--- a/scripts/helper/find-idents.c
+++ b/scripts/helper/find-idents.c
@@ -343,7 +343,7 @@ read_file(const char *filename)
 }
 
 static bool
-grep(struct token *tokens, const char *pattern)
+grep(struct token *tokens, const char *filename, const char *pattern)
 {
 	bool found = false;
 	unsigned int in_comment = 0;
@@ -362,7 +362,7 @@ grep(struct token *tokens, const char *pattern)
 		if (t->kind == TOKEN_IDENTIFIER) {
 			if (!pattern || !strcmp(t->name.buf, pattern)) {
 				found = true;
-				printf("%d:\t%s\n", t->line, t->name.buf);
+				printf("%s:%d\t%s\n", filename, t->line, t->name.buf);
 			}
 		}
 	}
@@ -389,10 +389,10 @@ main(int argc, char **argv)
 
 	if (argc == 2) {
 		/* Dump all idents */
-		grep(tokens, NULL);
+		grep(tokens, argv[1], NULL);
 	} else {
 		for (int i = 2; i < argc; ++i) {
-			found |= grep(tokens, argv[i]);
+			found |= grep(tokens, argv[1], argv[i]);
 		}
 	}