]>
Commit | Line | Data |
---|---|---|
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 | |
48425792 TZ |
16 | * License along with this library; if not, see |
17 | * <http://www.gnu.org/licenses/>. | |
3443546f LT |
18 | * |
19 | * Davide Libenzi <davidel@xmailserver.org> | |
20 | * | |
21 | */ | |
22 | ||
23 | #if !defined(XDIFF_H) | |
24 | #define XDIFF_H | |
25 | ||
26 | #ifdef __cplusplus | |
27 | extern "C" { | |
28 | #endif /* #ifdef __cplusplus */ | |
29 | ||
446d12cb JH |
30 | /* xpparm_t.flags */ |
31 | #define XDF_NEED_MINIMAL (1 << 0) | |
3443546f | 32 | |
446d12cb JH |
33 | #define XDF_IGNORE_WHITESPACE (1 << 1) |
34 | #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2) | |
35 | #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3) | |
e9282f02 | 36 | #define XDF_IGNORE_CR_AT_EOL (1 << 4) |
446d12cb JH |
37 | #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \ |
38 | XDF_IGNORE_WHITESPACE_CHANGE | \ | |
e9282f02 JH |
39 | XDF_IGNORE_WHITESPACE_AT_EOL | \ |
40 | XDF_IGNORE_CR_AT_EOL) | |
3443546f | 41 | |
446d12cb | 42 | #define XDF_IGNORE_BLANK_LINES (1 << 7) |
307ab20b | 43 | |
446d12cb JH |
44 | #define XDF_PATIENCE_DIFF (1 << 14) |
45 | #define XDF_HISTOGRAM_DIFF (1 << 15) | |
307ab20b JH |
46 | #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) |
47 | #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) | |
3443546f | 48 | |
446d12cb | 49 | #define XDF_INDENT_HEURISTIC (1 << 23) |
d634d61e | 50 | |
446d12cb | 51 | /* xdemitconf_t.flags */ |
acb72577 | 52 | #define XDL_EMIT_FUNCNAMES (1 << 0) |
5d934600 | 53 | #define XDL_EMIT_NO_HUNK_HDR (1 << 1) |
14937c2c | 54 | #define XDL_EMIT_FUNCCONTEXT (1 << 2) |
acb72577 | 55 | |
e0af48e4 | 56 | /* merge simplification levels */ |
857b933e JS |
57 | #define XDL_MERGE_MINIMAL 0 |
58 | #define XDL_MERGE_EAGER 1 | |
59 | #define XDL_MERGE_ZEALOUS 2 | |
ee95ec5d | 60 | #define XDL_MERGE_ZEALOUS_ALNUM 3 |
e0af48e4 | 61 | |
73eb40ee JH |
62 | /* merge favor modes */ |
63 | #define XDL_MERGE_FAVOR_OURS 1 | |
64 | #define XDL_MERGE_FAVOR_THEIRS 2 | |
cd1d61c4 | 65 | #define XDL_MERGE_FAVOR_UNION 3 |
73eb40ee | 66 | |
e0af48e4 | 67 | /* merge output styles */ |
560119b9 | 68 | #define XDL_MERGE_DIFF3 1 |
4496526f | 69 | #define XDL_MERGE_ZEALOUS_DIFF3 2 |
3443546f LT |
70 | |
71 | typedef struct s_mmfile { | |
72 | char *ptr; | |
73 | long size; | |
74 | } mmfile_t; | |
75 | ||
76 | typedef struct s_mmbuffer { | |
77 | char *ptr; | |
78 | long size; | |
79 | } mmbuffer_t; | |
80 | ||
81 | typedef struct s_xpparam { | |
82 | unsigned long flags; | |
2477ab2e | 83 | |
296d4a94 MK |
84 | /* -I<regex> */ |
85 | regex_t **ignore_regex; | |
86 | size_t ignore_regex_nr; | |
87 | ||
2477ab2e JT |
88 | /* See Documentation/diff-options.txt. */ |
89 | char **anchors; | |
90 | size_t anchors_nr; | |
3443546f LT |
91 | } xpparam_t; |
92 | ||
93 | typedef struct s_xdemitcb { | |
94 | void *priv; | |
611e42a5 JK |
95 | int (*out_hunk)(void *, |
96 | long old_begin, long old_nr, | |
97 | long new_begin, long new_nr, | |
98 | const char *func, long funclen); | |
99 | int (*out_line)(void *, mmbuffer_t *, int); | |
3443546f LT |
100 | } xdemitcb_t; |
101 | ||
f258475a JH |
102 | typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); |
103 | ||
467d348c RS |
104 | typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a, |
105 | long start_b, long count_b, | |
106 | void *cb_data); | |
107 | ||
3443546f LT |
108 | typedef struct s_xdemitconf { |
109 | long ctxlen; | |
6d0e674a | 110 | long interhunkctxlen; |
acb72577 | 111 | unsigned long flags; |
f258475a JH |
112 | find_func_t find_func; |
113 | void *find_func_priv; | |
467d348c | 114 | xdl_emit_hunk_consume_func_t hunk_func; |
3443546f LT |
115 | } xdemitconf_t; |
116 | ||
117 | typedef struct s_bdiffparam { | |
118 | long bsize; | |
119 | } bdiffparam_t; | |
120 | ||
121 | ||
36c83197 | 122 | #define xdl_malloc(x) xmalloc(x) |
3443546f | 123 | #define xdl_free(ptr) free(ptr) |
36c83197 | 124 | #define xdl_realloc(ptr,x) xrealloc(ptr,x) |
3443546f LT |
125 | |
126 | void *xdl_mmfile_first(mmfile_t *mmf, long *size); | |
3443546f LT |
127 | long xdl_mmfile_size(mmfile_t *mmf); |
128 | ||
129 | int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, | |
130 | xdemitconf_t const *xecfg, xdemitcb_t *ecb); | |
131 | ||
00f8f97d JH |
132 | typedef struct s_xmparam { |
133 | xpparam_t xpp; | |
9914cf46 | 134 | int marker_size; |
560119b9 BW |
135 | int level; |
136 | int favor; | |
137 | int style; | |
8a161433 | 138 | const char *ancestor; /* label for orig */ |
a4b5e91c JN |
139 | const char *file1; /* label for mf1 */ |
140 | const char *file2; /* label for mf2 */ | |
00f8f97d JH |
141 | } xmparam_t; |
142 | ||
9914cf46 JH |
143 | #define DEFAULT_CONFLICT_MARKER_SIZE 7 |
144 | ||
a4b5e91c | 145 | int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, |
560119b9 | 146 | xmparam_t const *xmp, mmbuffer_t *result); |
857b933e | 147 | |
3443546f LT |
148 | #ifdef __cplusplus |
149 | } | |
150 | #endif /* #ifdef __cplusplus */ | |
151 | ||
152 | #endif /* #if !defined(XDIFF_H) */ |