[PATCH 05/12] export three functions from diff.c
- From
Bo Yang <struggleyb.nku@gmail.com>
- Date
- Jun 26, 2010, 13:27 UTC
- Message-ID
- <1277558857-23103-6-git-send-email-struggleyb.nku@gmail.com>
- In-Reply-To
- <1277558857-23103-1-git-send-email-struggleyb.nku@gmail.com>
Use fill_metainfo to fill the line level diff meta data, emit_line to print out a line and quote_two to quote paths.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com> --- diff.c | 6 +++--- diff.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c index c692526..9846fc9 100644 --- a/diff.c +++ b/diff.c @@ -148,7 +148,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) return git_color_default_config(var, value, cb); } -static char *quote_two(const char *one, const char *two) +char *quote_two(const char *one, const char *two) { int need_one = quote_c_style(one, NULL, NULL, 1); int need_two = quote_c_style(two, NULL, NULL, 1); @@ -329,7 +329,7 @@ static void emit_line_0(struct diff_options *o, const char *set, const char *res fputc('\n', file); } -static void emit_line(struct diff_options *o, const char *set, const char *reset, +void emit_line(struct diff_options *o, const char *set, const char *reset, const char *line, int len) { emit_line_0(o, set, reset, line[0], line+1, len-1); @@ -2568,7 +2568,7 @@ static int similarity_index(struct diff_filepair *p) return p->score * 100 / MAX_SCORE; } -static void fill_metainfo(struct strbuf *msg, +void fill_metainfo(struct strbuf *msg, const char *name, const char *other, struct diff_filespec *one, diff --git a/diff.h b/diff.h index 48abe7a..5d8449c 100644 --- a/diff.h +++ b/diff.h @@ -10,6 +10,8 @@ struct rev_info; struct diff_options; struct diff_queue_struct; struct strbuf; +struct diff_filespec; +struct diff_filepair; typedef void (*change_fn_t)(struct diff_options *options, unsigned old_mode, unsigned new_mode, @@ -292,4 +294,20 @@ extern void diff_no_index(struct rev_info *, int, const char **, int, const char extern int index_differs_from(const char *def, int diff_flags); +/* some output functions line.c need */ +extern void fill_metainfo(struct strbuf *msg, + const char *name, + const char *other, + struct diff_filespec *one, + struct diff_filespec *two, + struct diff_options *o, + struct diff_filepair *p, + int *must_show_header, + int use_color); + +extern void emit_line(struct diff_options *o, const char *set, const char *reset, + const char *line, int len); + +extern char *quote_two(const char *one, const char *two); + #endif /* DIFF_H */
-- 1.7.1.577.g36cf0.dirty