[PATCH v7 3/5] Export three functions from diff.c
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jun 7, 2012, 10:23 UTC
- Message-ID
- <3d2d6819e02104dc954bd56be996e664dba90c54.1339063659.git.trast@student.ethz.ch>
- In-Reply-To
- <cover.1339063659.git.trast@student.ethz.ch>
From: Bo Yang <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> Signed-off-by: Thomas Rast <trast@student.ethz.ch> --- diff.c | 6 +++--- diff.h | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c index 77edd50..f9673f3 100644 --- a/diff.c +++ b/diff.c @@ -220,7 +220,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) return git_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); @@ -410,7 +410,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); @@ -2925,7 +2925,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 e027650..4a7d085 100644 --- a/diff.h +++ b/diff.h @@ -14,6 +14,7 @@ struct userdiff_driver; struct sha1_array; struct commit; +struct diff_filepair; typedef void (*change_fn_t)(struct diff_options *options, unsigned old_mode, unsigned new_mode, @@ -329,6 +330,22 @@ extern size_t fill_textconv(struct userdiff_driver *driver, extern int parse_rename_score(const char **cp_p); +/* 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); + extern int print_stat_summary(FILE *fp, int files, int insertions, int deletions);
-- 1.7.11.rc1.243.gbf4713c