Merge branch 'tb/banned-vsprintf-namefix'
[git/git.git] / xdiff-interface.h
CommitLineData
d9ea73e0
JH
1#ifndef XDIFF_INTERFACE_H
2#define XDIFF_INTERFACE_H
3
d449347d 4#include "cache.h"
d9ea73e0 5#include "xdiff/xdiff.h"
d9ea73e0 6
dcd1742e
JK
7/*
8 * xdiff isn't equipped to handle content over a gigabyte;
9 * we make the cutoff 1GB - 1MB to give some breathing
10 * room for constant-sized additions (e.g., merge markers)
11 */
12#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
13
9346d6d1
JK
14typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long);
15typedef void (*xdiff_emit_hunk_fn)(void *data,
16 long old_begin, long old_nr,
17 long new_begin, long new_nr,
18 const char *func, long funclen);
d9ea73e0 19
c279d7e9 20int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d2 21int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
9346d6d1
JK
22 xdiff_emit_hunk_fn hunk_fn,
23 xdiff_emit_line_fn line_fn,
24 void *consume_callback_data,
dfea7900 25 xpparam_t const *xpp, xdemitconf_t const *xecfg);
7cab5883 26int read_mmfile(mmfile_t *ptr, const char *filename);
d449347d 27void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
6bfce93e 28int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e0 29
55454427
DL
30void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
31void xdiff_clear_find_func(xdemitconf_t *xecfg);
32int git_xmerge_config(const char *var, const char *value, void *cb);
b5412484 33extern int git_xmerge_style;
f258475a 34
3b40a090
JK
35/*
36 * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL
37 * one just sends the hunk line to the line_fn callback).
38 */
39void discard_hunk_line(void *priv,
40 long ob, long on, long nb, long nn,
41 const char *func, long funclen);
42
5ec8274b
SB
43/*
44 * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
45 * Returns 1 if the strings are deemed equal, 0 otherwise.
46 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
47 * are treated for the comparision.
48 */
55454427 49int xdiff_compare_lines(const char *l1, long s1,
ad6dad09 50 const char *l2, long s2, long flags);
5ec8274b
SB
51
52/*
53 * Returns a hash of the string s of length len.
54 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
55 * are treated for the hash.
56 */
55454427 57unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
5ec8274b 58
d9ea73e0 59#endif