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