This will turn out to be useful in a later patch Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- xdiff-interface.c | 11 +++++++++++ xdiff-interface.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/xdiff-interface.c b/xdiff-interface.c index 018e033089..fd002ebbc2 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -5,6 +5,7 @@ #include "xdiff/xdiffi.h" #include "xdiff/xemit.h" #include "xdiff/xmacros.h" +#include "xdiff/xutils.h" struct xdiff_emit_state { xdiff_emit_consume_fn consume; @@ -296,6 +297,16 @@ void xdiff_clear_find_func(xdemitconf_t *xecfg) } } +unsigned long xdiff_hash_string(const char *s, size_t len, long flags) +{ + return xdl_hash_record(&s, s + len, flags); +} + +int xdiff_compare_lines(const char *l1, long s1, const char *l2, long s2, long flags) +{ + return xdl_recmatch(l1, s1, l2, s2, flags); +} + int git_xmerge_style = -1; int git_xmerge_config(const char *var, const char *value, void *cb) diff --git a/xdiff-interface.h b/xdiff-interface.h index 6f6ba9095d..d3cb9285c5 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -29,4 +29,9 @@ extern void xdiff_clear_find_func(xdemitconf_t *xecfg); extern int git_xmerge_config(const char *var, const char *value, void *cb); extern int git_xmerge_style; +extern int xdiff_compare_lines(const char *l1, long s1, + const char *l2, long s2, long flags); + +extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags); + #endif -- 2.15.0.rc2.6.g953226eb5f