aboutsummaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-10-25 11:49:11 -0700
committerJunio C Hamano <gitster@pobox.com>2017-10-26 11:23:22 +0900
commit5ec8274b8424f76bf998059e66facff1b241337e (patch)
treeb0513c5076bc149f7ee22db1ff75d9f028c37ffa /xdiff-interface.h
parentb66b5072921fb706f1e9352f471098c988b0ca39 (diff)
downloadgit-5ec8274b8424f76bf998059e66facff1b241337e.tar.gz
git-5ec8274b8424f76bf998059e66facff1b241337e.tar.xz
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 <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 6f6ba9095..135fc05d7 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -29,4 +29,20 @@ 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;
+/*
+ * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
+ * Returns 1 if the strings are deemed equal, 0 otherwise.
+ * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
+ * are treated for the comparision.
+ */
+extern int xdiff_compare_lines(const char *l1, long s1,
+ const char *l2, long s2, long flags);
+
+/*
+ * Returns a hash of the string s of length len.
+ * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
+ * are treated for the hash.
+ */
+extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
+
#endif