]>
Commit | Line | Data |
---|---|---|
d9ea73e0 JH |
1 | #ifndef XDIFF_INTERFACE_H |
2 | #define XDIFF_INTERFACE_H | |
3 | ||
4 | #include "xdiff/xdiff.h" | |
d9ea73e0 JH |
5 | |
6 | typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); | |
86295bb6 | 7 | typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long); |
d9ea73e0 | 8 | |
c279d7e9 | 9 | int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); |
c99db9d2 | 10 | int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, |
8a3f524b JH |
11 | xdiff_emit_consume_fn fn, void *consume_callback_data, |
12 | xpparam_t const *xpp, | |
c99db9d2 | 13 | xdemitconf_t const *xecfg, xdemitcb_t *xecb); |
86295bb6 RS |
14 | int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2, |
15 | xdiff_emit_hunk_consume_fn fn, void *consume_callback_data, | |
16 | xpparam_t const *xpp, xdemitconf_t *xecfg); | |
c1e335a4 | 17 | int parse_hunk_header(char *line, int len, |
a0fd3146 JH |
18 | int *ob, int *on, |
19 | int *nb, int *nn); | |
7cab5883 | 20 | int read_mmfile(mmfile_t *ptr, const char *filename); |
06b65939 | 21 | void read_mmblob(mmfile_t *ptr, const unsigned char *sha1); |
6bfce93e | 22 | int buffer_is_binary(const char *ptr, unsigned long size); |
d9ea73e0 | 23 | |
a013585b | 24 | extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); |
8cfe5f1c | 25 | extern void xdiff_clear_find_func(xdemitconf_t *xecfg); |
b5412484 JH |
26 | extern int git_xmerge_config(const char *var, const char *value, void *cb); |
27 | extern int git_xmerge_style; | |
f258475a | 28 | |
d9ea73e0 | 29 | #endif |