grep.c: don't pass along NULL callback value

avar · gitster · commit b8db6ed8265f · 2022-02-15T18:00:50.000-08:00
Change grep_cmd_config() to stop passing around the always-NULL "cb" value. When this code was added in 7e8f59d (grep: color patterns in output, 2009-03-07) it was non-NULL, but when that changed in 15fabd1 (builtin/grep.c: make configuration callback more reusable, 2012-10-09) this code was left behind. In a subsequent change I'll start using the "cb" value, this will make it clear which functions we call need it, and which don't. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -285,8 +285,8 @@ static int wait_all(void)
 
 static int grep_cmd_config(const char *var, const char *value, void *cb)
 {
-	int st = grep_config(var, value, cb);
-	if (git_color_default_config(var, value, cb) < 0)
+	int st = grep_config(var, value, NULL);
+	if (git_color_default_config(var, value, NULL) < 0)
 		st = -1;
 
 	if (!strcmp(var, "grep.threads")) {

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ static int wait_all(void)`
`285`	`285`
`286`	`286`	`static int grep_cmd_config(const char var, const char value, void *cb)`
`287`	`287`	`{`
`288`		`- int st = grep_config(var, value, cb);`
`289`		`- if (git_color_default_config(var, value, cb) < 0)`
	`288`	`+ int st = grep_config(var, value, NULL);`
	`289`	`+ if (git_color_default_config(var, value, NULL) < 0)`
`290`	`290`	`st = -1;`
`291`	`291`
`292`	`292`	`if (!strcmp(var, "grep.threads")) {`