2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
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.
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.
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
19 * Davide Libenzi <davidel@xmailserver.org>
28 #endif /* #ifdef __cplusplus */
31 #define XDF_NEED_MINIMAL (1 << 1)
32 #define XDF_IGNORE_WHITESPACE (1 << 2)
33 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
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)
37 #define XDF_PATIENCE_DIFF (1 << 5)
38 #define XDF_HISTOGRAM_DIFF (1 << 6)
39 #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
40 #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
42 #define XDF_IGNORE_BLANK_LINES (1 << 7)
44 #define XDF_COMPACTION_HEURISTIC (1 << 8)
45 #define XDF_INDENT_HEURISTIC (1 << 9)
47 #define XDL_EMIT_FUNCNAMES (1 << 0)
48 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
50 #define XDL_MMB_READONLY (1 << 0)
52 #define XDL_MMF_ATOMIC (1 << 0)
54 #define XDL_BDOP_INS 1
55 #define XDL_BDOP_CPY 2
56 #define XDL_BDOP_INSB 3
58 /* merge simplification levels */
59 #define XDL_MERGE_MINIMAL 0
60 #define XDL_MERGE_EAGER 1
61 #define XDL_MERGE_ZEALOUS 2
62 #define XDL_MERGE_ZEALOUS_ALNUM 3
64 /* merge favor modes */
65 #define XDL_MERGE_FAVOR_OURS 1
66 #define XDL_MERGE_FAVOR_THEIRS 2
67 #define XDL_MERGE_FAVOR_UNION 3
69 /* merge output styles */
70 #define XDL_MERGE_DIFF3 1
72 typedef struct s_mmfile {
77 typedef struct s_mmbuffer {
82 typedef struct s_xpparam {
86 typedef struct s_xdemitcb {
88 int (*outf)(void *, mmbuffer_t *, int);
91 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
93 typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
94 long start_b, long count_b,
97 typedef struct s_xdemitconf {
101 find_func_t find_func;
102 void *find_func_priv;
103 xdl_emit_hunk_consume_func_t hunk_func;
106 typedef struct s_bdiffparam {
111 #define xdl_malloc(x) malloc(x)
112 #define xdl_free(ptr) free(ptr)
113 #define xdl_realloc(ptr,x) realloc(ptr,x)
115 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
116 long xdl_mmfile_size(mmfile_t *mmf);
118 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
119 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
121 typedef struct s_xmparam {
127 const char *ancestor; /* label for orig */
128 const char *file1; /* label for mf1 */
129 const char *file2; /* label for mf2 */
132 #define DEFAULT_CONFLICT_MARKER_SIZE 7
134 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
135 xmparam_t const *xmp, mmbuffer_t *result);
139 #endif /* #ifdef __cplusplus */
141 #endif /* #if !defined(XDIFF_H) */