path: root/xdiff-interface.c
diff options
authorStefan Beller <>2017-10-25 18:49:11 (GMT)
committerJunio C Hamano <>2017-10-26 02:23:22 (GMT)
commit5ec8274b8424f76bf998059e66facff1b241337e (patch)
treeb0513c5076bc149f7ee22db1ff75d9f028c37ffa /xdiff-interface.c
parentb66b5072921fb706f1e9352f471098c988b0ca39 (diff)
xdiff-interface: export comparing and hashing strings
This will turn out to be useful in a later patch. xdl_recmatch is exported in xdiff/xutils.h, to be used by various xdiff/*.c files, but not outside of xdiff/. This one makes it available to the outside, too. While at it, add documentation. Signed-off-by: Stefan Beller <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'xdiff-interface.c')
1 files changed, 12 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 018e033..770e1f7 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,17 @@ 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)