Merge branch 'jc/maint-log-grep-all-match' (early part) into next

* 'jc/maint-log-grep-all-match' (early part):
  grep.c: mark private file-scope symbols as static
This commit is contained in:
Junio C Hamano
2012-09-15 23:35:56 -07:00
2 changed files with 6 additions and 3 deletions

6
grep.c
View File

@@ -3,6 +3,10 @@
#include "userdiff.h"
#include "xdiff-interface.h"
static int grep_source_load(struct grep_source *gs);
static int grep_source_is_binary(struct grep_source *gs);
static struct grep_pat *create_grep_pat(const char *pat, size_t patlen,
const char *origin, int no,
enum grep_pat_token t,
@@ -403,7 +407,7 @@ static void dump_grep_expression_1(struct grep_expr *x, int in)
}
}
void dump_grep_expression(struct grep_opt *opt)
static void dump_grep_expression(struct grep_opt *opt)
{
struct grep_expr *x = opt->pattern_expression;

3
grep.h
View File

@@ -159,11 +159,10 @@ struct grep_source {
void grep_source_init(struct grep_source *gs, enum grep_source_type type,
const char *name, const void *identifier);
int grep_source_load(struct grep_source *gs);
void grep_source_clear_data(struct grep_source *gs);
void grep_source_clear(struct grep_source *gs);
void grep_source_load_driver(struct grep_source *gs);
int grep_source_is_binary(struct grep_source *gs);
int grep_source(struct grep_opt *opt, struct grep_source *gs);