aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-02-02 03:20:10 -0500
committerJunio C Hamano <gitster@pobox.com>2012-02-02 10:36:08 -0800
commitc876d6da88d9bf1f3377d4eed66fc7705e31c30e (patch)
tree84cc04ca18c5401bd1e9d05e72bbd1794c397e81
parent8f24a6323ece9be1bf1a04b4b5856112438337f2 (diff)
downloadgit-c876d6da88d9bf1f3377d4eed66fc7705e31c30e.tar.gz
git-c876d6da88d9bf1f3377d4eed66fc7705e31c30e.tar.xz
grep: drop grep_buffer's "name" parameter
Before the grep_source interface existed, grep_buffer was used by two types of callers: 1. Ones which pulled a file into a buffer, and then wanted to supply the file's name for the output (i.e., git grep). 2. Ones which really just wanted to grep a buffer (i.e., git log --grep). Callers in set (1) should now be using grep_source. Callers in set (2) always pass NULL for the "name" parameter of grep_buffer. We can therefore get rid of this now-useless parameter. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--grep.c4
-rw-r--r--grep.h2
-rw-r--r--revision.c1
3 files changed, 3 insertions, 4 deletions
diff --git a/grep.c b/grep.c
index 8204ca25e..2a3fe7ce6 100644
--- a/grep.c
+++ b/grep.c
@@ -1215,12 +1215,12 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs)
return grep_source_1(opt, gs, 0);
}
-int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size)
+int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size)
{
struct grep_source gs;
int r;
- grep_source_init(&gs, GREP_SOURCE_BUF, name, NULL);
+ grep_source_init(&gs, GREP_SOURCE_BUF, NULL, NULL);
gs.buf = buf;
gs.size = size;
diff --git a/grep.h b/grep.h
index e386ca4c7..8bf300141 100644
--- a/grep.h
+++ b/grep.h
@@ -127,7 +127,7 @@ extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const cha
extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
extern void compile_grep_patterns(struct grep_opt *opt);
extern void free_grep_patterns(struct grep_opt *opt);
-extern int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size);
+extern int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
struct grep_source {
char *name;
diff --git a/revision.c b/revision.c
index 064e35108..89d3a8faf 100644
--- a/revision.c
+++ b/revision.c
@@ -2128,7 +2128,6 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
return 1;
return grep_buffer(&opt->grep_filter,
- NULL, /* we say nothing, not even filename */
commit->buffer, strlen(commit->buffer));
}