Junio C Hamano wrote:
> Signed-off-by: Junio C Hamano <gits...@pobox.com>
> ---
> grep.c | 6 +++++-
> grep.h | 3 +--
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/grep.c b/grep.c
> index 925aa92..c7f8a47 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -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;
>
> diff --git a/grep.h b/grep.h
> index 00d71f7..8a28a67 100644
> --- a/grep.h
> +++ b/grep.h
> @@ -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);
Heh, so I obviously didn't see this before sending the patch yesterday! :-D
Yes, this solves the problem addressed by yesterday's patch, so please
ignore that. However, this tickles sparse to complain as well ... ;-)
New patch on it's way.
[I have a funny feeling that I'm about to download an email, in response
to yesterday's patch, that says something like: "does commit 07a7d656 not
fix it for you ..." :-P ]
ATB,
Ramsay Jones
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
