]> git.ipfire.org Git - thirdparty/git.git/commitdiff
grep: prefer "struct grep_opt" over its "void *" equivalent
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Fri, 22 Oct 2021 08:55:39 +0000 (10:55 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Oct 2021 17:45:25 +0000 (10:45 -0700)
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>
builtin/grep.c

index 8af5249a7bb118333da4eede706d3fd2de8a287b..fd184c182a31675668bcc29c8d8722a2f0323c47 100644 (file)
@@ -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;
 }