diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-17 15:22:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-17 15:22:13 -0700 |
| commit | 2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9 (patch) | |
| tree | e36a8a20733792bdcad789363fb0f50985123d11 /xdiff-interface.h | |
| parent | 8be441ea1fbd6e39952c5c314014162900c2c148 (diff) | |
| parent | 85c20c304f991b33b59fbf00182a66f5cf6d2960 (diff) | |
| download | git-2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9.tar.gz git-2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9.tar.xz | |
Merge branch 'rs/xdiff-lose-emit-func'
Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unused or unnecessary code
from the latter.
By René Scharfe (6) and Ramsay Jones (1)
* rs/xdiff-lose-emit-func:
builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
xdiff: remove unused functions
xdiff: remove emit_func() and xdi_diff_hunks()
blame: factor out helper for calling xdi_diff()
blame: use hunk_func(), part 2
blame: use hunk_func(), part 1
xdiff: add hunk_func()
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 49d1116fc..eff7762ee 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -4,15 +4,11 @@ #include "xdiff/xdiff.h" typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); -typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long); int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, xdiff_emit_consume_fn fn, void *consume_callback_data, xpparam_t const *xpp, xdemitconf_t const *xecfg); -int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2, - xdiff_emit_hunk_consume_fn fn, void *consume_callback_data, - xpparam_t const *xpp, xdemitconf_t *xecfg); int parse_hunk_header(char *line, int len, int *ob, int *on, int *nb, int *nn); |