git-submodule: replace duplicated code with a module_list function

[thirdparty/git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index fb742dbb6ba2125b970b9d9510e208ec99954a2d..558492ba38c50351a98f80c16e83a058ace849ab 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -3,17 +3,13 @@
 
 #include "xdiff/xdiff.h"
 
-struct xdiff_emit_state;
-
 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
 
-struct xdiff_emit_state {
-       xdiff_emit_consume_fn consume;
-       char *remainder;
-       unsigned long remainder_size;
-};
-
-int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
+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, xdemitcb_t *xecb);
 int parse_hunk_header(char *line, int len,
                      int *ob, int *on,
                      int *nb, int *nn);