]> git.ipfire.org Git - thirdparty/git.git/blame - xdiff/xdiff.h
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
[thirdparty/git.git] / xdiff / xdiff.h
CommitLineData
3443546f
LT
1/*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
4 *
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
9 *
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
14 *
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 *
19 * Davide Libenzi <davidel@xmailserver.org>
20 *
21 */
22
23#if !defined(XDIFF_H)
24#define XDIFF_H
25
26#ifdef __cplusplus
27extern "C" {
28#endif /* #ifdef __cplusplus */
29
30
31#define XDF_NEED_MINIMAL (1 << 1)
0d21efa5
JS
32#define XDF_IGNORE_WHITESPACE (1 << 2)
33#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
859f9c45
JS
34#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
35#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
3443546f
LT
36
37#define XDL_PATCH_NORMAL '-'
38#define XDL_PATCH_REVERSE '+'
39#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
40#define XDL_PATCH_IGNOREBSPACE (1 << 8)
41
acb72577 42#define XDL_EMIT_FUNCNAMES (1 << 0)
a9ed376b 43#define XDL_EMIT_COMMON (1 << 1)
acb72577 44
3443546f
LT
45#define XDL_MMB_READONLY (1 << 0)
46
47#define XDL_MMF_ATOMIC (1 << 0)
48
49#define XDL_BDOP_INS 1
50#define XDL_BDOP_CPY 2
51#define XDL_BDOP_INSB 3
52
857b933e
JS
53#define XDL_MERGE_MINIMAL 0
54#define XDL_MERGE_EAGER 1
55#define XDL_MERGE_ZEALOUS 2
3443546f
LT
56
57typedef struct s_mmfile {
58 char *ptr;
59 long size;
60} mmfile_t;
61
62typedef struct s_mmbuffer {
63 char *ptr;
64 long size;
65} mmbuffer_t;
66
67typedef struct s_xpparam {
68 unsigned long flags;
69} xpparam_t;
70
71typedef struct s_xdemitcb {
72 void *priv;
73 int (*outf)(void *, mmbuffer_t *, int);
74} xdemitcb_t;
75
f258475a
JH
76typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
77
3443546f
LT
78typedef struct s_xdemitconf {
79 long ctxlen;
acb72577 80 unsigned long flags;
f258475a
JH
81 find_func_t find_func;
82 void *find_func_priv;
3443546f
LT
83} xdemitconf_t;
84
85typedef struct s_bdiffparam {
86 long bsize;
87} bdiffparam_t;
88
89
90#define xdl_malloc(x) malloc(x)
91#define xdl_free(ptr) free(ptr)
92#define xdl_realloc(ptr,x) realloc(ptr,x)
93
94void *xdl_mmfile_first(mmfile_t *mmf, long *size);
95void *xdl_mmfile_next(mmfile_t *mmf, long *size);
96long xdl_mmfile_size(mmfile_t *mmf);
97
98int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
99 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
100
857b933e
JS
101int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
102 mmfile_t *mf2, const char *name2,
103 xpparam_t const *xpp, int level, mmbuffer_t *result);
104
3443546f
LT
105#ifdef __cplusplus
106}
107#endif /* #ifdef __cplusplus */
108
109#endif /* #if !defined(XDIFF_H) */