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

avar · gitster · commit a2fb7672c03e · 2021-10-23T10:45:25.000-07:00
Stylistically fix up code added in bfac23d (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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,8 @@ static void run(void arg)`
`199`	`199`	`grep_source_clear_data(&w->source);`
`200`	`200`	`work_done(w);`
`201`	`201`	`}`
`202`		`- free_grep_patterns(arg);`
`203`		`- free(arg);`
	`202`	`+ free_grep_patterns(opt);`
	`203`	`+ free(opt);`
`204`	`204`
`205`	`205`	`return (void*) (intptr_t) hit;`
`206`	`206`	`}`