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>
Jeff King committed
Feb 2, 2012 at 03:20 UTC
c876d6da88d9bf1f3377d4eed66fc7705e31c30e
3 files changed
+3
-4
grep.c
+2
-2
@@ -1215,12 +1215,12 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs)
1215
return grep_source_1(opt, gs, 0);
1216
}
1217
1218
-int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size)
1218
+int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size)
1219
{
1220
struct grep_source gs;
1221
int r;
1222
1223
- grep_source_init(&gs, GREP_SOURCE_BUF, name, NULL);
1223
+ grep_source_init(&gs, GREP_SOURCE_BUF, NULL, NULL);
1224
gs.buf = buf;
1225
gs.size = size;
1226
grep.h
+1
-1
@@ -127,7 +127,7 @@ extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const cha
127
extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
128
extern void compile_grep_patterns(struct grep_opt *opt);
129
extern void free_grep_patterns(struct grep_opt *opt);
130
-extern int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size);
130
+extern int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
131
132
struct grep_source {
133
char *name;
revision.c
-1
@@ -2128,7 +2128,6 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
2128
if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2129
return 1;
2130
return grep_buffer(&opt->grep_filter,
2131
- NULL, /* we say nothing, not even filename */
2131
commit->buffer, strlen(commit->buffer));
2132
}
2133