mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: simplify grep_oid and grep_file

Browse Source 
In the NO_PTHREADS or !num_threads case, this doesn't change
anything. In the threaded case, note that grep_source_init duplicates
its third argument, so there is no need to keep [path]buf.buf alive
across the call of add_work().

Signed-off-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rasmus Villemoes
2018-02-23 15:47:57 +01:00
committed by Junio C Hamano
parent e2e05d619a
commit 38ef24dccf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/grep.c
View File

@ -326,6 +326,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
} }
grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid); grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
strbuf_release(&pathbuf);
#ifndef NO_PTHREADS #ifndef NO_PTHREADS
if (num_threads) { if (num_threads) {
@ -334,14 +335,12 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
* its fields, so do not call grep_source_clear() * its fields, so do not call grep_source_clear()
*/ */
add_work(opt, &gs); add_work(opt, &gs);
strbuf_release(&pathbuf);
return 0; return 0;
} else } else
#endif #endif
{ {
int hit; int hit;
strbuf_release(&pathbuf);
hit = grep_source(opt, &gs); hit = grep_source(opt, &gs);
grep_source_clear(&gs); grep_source_clear(&gs);
@ -360,6 +359,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
strbuf_addstr(&buf, filename); strbuf_addstr(&buf, filename);
grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename); grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
strbuf_release(&buf);
#ifndef NO_PTHREADS #ifndef NO_PTHREADS
if (num_threads) { if (num_threads) {
@ -368,14 +368,12 @@ static int grep_file(struct grep_opt *opt, const char *filename)
* its fields, so do not call grep_source_clear() * its fields, so do not call grep_source_clear()
*/ */
add_work(opt, &gs); add_work(opt, &gs);
strbuf_release(&buf);
return 0; return 0;
} else } else
#endif #endif
{ {
int hit; int hit;
strbuf_release(&buf);
hit = grep_source(opt, &gs); hit = grep_source(opt, &gs);
grep_source_clear(&gs); grep_source_clear(&gs);