Merge branch 'jc/better-conflict-resolution'
[git/dkf.git] / xdiff / xdiff.h
blobdeebe02cd3489ef3ce94b407ff9c3de4c21a0eb1
1 /*
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>
23 #if !defined(XDIFF_H)
24 #define XDIFF_H
26 #ifdef __cplusplus
27 extern "C" {
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 XDL_PATCH_NORMAL '-'
38 #define XDL_PATCH_REVERSE '+'
39 #define XDL_PATCH_MODEMASK ((1 << 8) - 1)
40 #define XDL_PATCH_IGNOREBSPACE (1 << 8)
42 #define XDL_EMIT_FUNCNAMES (1 << 0)
43 #define XDL_EMIT_COMMON (1 << 1)
45 #define XDL_MMB_READONLY (1 << 0)
47 #define XDL_MMF_ATOMIC (1 << 0)
49 #define XDL_BDOP_INS 1
50 #define XDL_BDOP_CPY 2
51 #define XDL_BDOP_INSB 3
53 /* merge simplification levels */
54 #define XDL_MERGE_MINIMAL 0
55 #define XDL_MERGE_EAGER 1
56 #define XDL_MERGE_ZEALOUS 2
57 #define XDL_MERGE_ZEALOUS_ALNUM 3
58 #define XDL_MERGE_LEVEL_MASK 0x0f
60 /* merge output styles */
61 #define XDL_MERGE_DIFF3 0x8000
62 #define XDL_MERGE_STYLE_MASK 0x8000
64 typedef struct s_mmfile {
65 char *ptr;
66 long size;
67 } mmfile_t;
69 typedef struct s_mmbuffer {
70 char *ptr;
71 long size;
72 } mmbuffer_t;
74 typedef struct s_xpparam {
75 unsigned long flags;
76 } xpparam_t;
78 typedef struct s_xdemitcb {
79 void *priv;
80 int (*outf)(void *, mmbuffer_t *, int);
81 } xdemitcb_t;
83 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
85 typedef struct s_xdemitconf {
86 long ctxlen;
87 unsigned long flags;
88 find_func_t find_func;
89 void *find_func_priv;
90 } xdemitconf_t;
92 typedef struct s_bdiffparam {
93 long bsize;
94 } bdiffparam_t;
97 #define xdl_malloc(x) malloc(x)
98 #define xdl_free(ptr) free(ptr)
99 #define xdl_realloc(ptr,x) realloc(ptr,x)
101 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
102 void *xdl_mmfile_next(mmfile_t *mmf, long *size);
103 long xdl_mmfile_size(mmfile_t *mmf);
105 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
106 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
108 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
109 mmfile_t *mf2, const char *name2,
110 xpparam_t const *xpp, int level, mmbuffer_t *result);
112 #ifdef __cplusplus
114 #endif /* #ifdef __cplusplus */
116 #endif /* #if !defined(XDIFF_H) */