Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 27 lines (19 sloc) 0.754 kB
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
3
4 #include "xdiff/xdiff.h"
5
6 struct xdiff_emit_state;
7
8 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
9
10 struct xdiff_emit_state {
11 xdiff_emit_consume_fn consume;
12 char *remainder;
13 unsigned long remainder_size;
14 };
15
c279d7e @gitster xdl_diff: identify call sites.
gitster authored
16 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
17 int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
c1e335a combine-diff: move the code to parse hunk-header into common library.
Junio C Hamano authored
18 int parse_hunk_header(char *line, int len,
a0fd314 Match ofs/cnt types in diff interface.
Junio C Hamano authored
19 int *ob, int *on,
20 int *nb, int *nn);
7cab588 @dscho move read_mmfile() into xdiff-interface
dscho authored
21 int read_mmfile(mmfile_t *ptr, const char *filename);
6bfce93 @dscho Move buffer_is_binary() to xdiff-interface.h
dscho authored
22 int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
23
a013585 diff.c: associate a flag with each pattern and use it for compiling r…
Brandon Casey authored
24 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
f258475 @gitster Per-path attribute based hunk header selection.
gitster authored
25
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
26 #endif
Something went wrong with that request. Please try again.