From: Ævar Arnfjörð Bjarmason Date: Wed, 16 Feb 2022 00:00:35 +0000 (+0100) Subject: grep.c: don't pass along NULL callback value X-Git-Tag: v2.36.0-rc0~110^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8db6ed8265fc44ebf7163a17600162f25df6de0;p=thirdparty%2Fgit.git grep.c: don't pass along NULL callback value Change grep_cmd_config() to stop passing around the always-NULL "cb" value. When this code was added in 7e8f59d577e (grep: color patterns in output, 2009-03-07) it was non-NULL, but when that changed in 15fabd1bbd4 (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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/grep.c b/builtin/grep.c index d85cbabea6..5ec4cecae4 100644 --- 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")) {