From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 22 Oct 2021 08:55:39 +0000 (+0200)
Subject: grep: prefer "struct grep_opt" over its "void *" equivalent
X-Git-Tag: v2.34.0-rc0~15^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2fb7672c03eef86b8dbf33699c12307d504a299;p=thirdparty%2Fgit.git

grep: prefer "struct grep_opt" over its "void *" equivalent

Stylistically fix up code added in bfac23d9534 (grep: Fix two memory
leaks, 2010-01-30). We usually don't use the "arg" at all once we've
casted it to the struct we want, let's not do that here when we're
freeing it. Perhaps it was thought that a cast to "void *" would
otherwise be needed?

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
index 8af5249a7b..fd184c182a 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -199,8 +199,8 @@ static void *run(void *arg)
 		grep_source_clear_data(&w->source);
 		work_done(w);
 	}
-	free_grep_patterns(arg);
-	free(arg);
+	free_grep_patterns(opt);
+	free(opt);
 
 	return (void*) (intptr_t) hit;
 }