blob: 4da052a3fff6768fca05b2f3399c5d87ec1daa2e [file] [log] [blame]
Linus Torvalds34435462006-03-24 20:13:22 -08001/*
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)
Johannes Schindelin0d21efa2006-06-14 17:40:23 +020032#define XDF_IGNORE_WHITESPACE (1 << 2)
33#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
Johannes Schindelin859f9c42007-02-14 01:30:29 +010034#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
Johannes Schindelin92b7de92009-01-07 18:04:09 +010035#define XDF_PATIENCE_DIFF (1 << 5)
Johannes Schindelin859f9c42007-02-14 01:30:29 +010036#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
Linus Torvalds34435462006-03-24 20:13:22 -080037
38#define XDL_PATCH_NORMAL '-'
39#define XDL_PATCH_REVERSE '+'
40#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
41#define XDL_PATCH_IGNOREBSPACE (1 << 8)
42
Mark Woodingacb72572006-03-28 03:23:31 +010043#define XDL_EMIT_FUNCNAMES (1 << 0)
Linus Torvaldsa9ed3762006-06-28 21:57:12 -070044#define XDL_EMIT_COMMON (1 << 1)
Mark Woodingacb72572006-03-28 03:23:31 +010045
Linus Torvalds34435462006-03-24 20:13:22 -080046#define XDL_MMB_READONLY (1 << 0)
47
48#define XDL_MMF_ATOMIC (1 << 0)
49
50#define XDL_BDOP_INS 1
51#define XDL_BDOP_CPY 2
52#define XDL_BDOP_INSB 3
53
Junio C Hamanoe0af48e2008-08-28 01:10:04 -070054/* merge simplification levels */
Johannes Schindelin857b9332006-11-21 23:24:34 +010055#define XDL_MERGE_MINIMAL 0
56#define XDL_MERGE_EAGER 1
57#define XDL_MERGE_ZEALOUS 2
Johannes Schindelinee95ec52008-02-17 19:07:40 +000058#define XDL_MERGE_ZEALOUS_ALNUM 3
Junio C Hamanoe0af48e2008-08-28 01:10:04 -070059#define XDL_MERGE_LEVEL_MASK 0x0f
60
61/* merge output styles */
62#define XDL_MERGE_DIFF3 0x8000
63#define XDL_MERGE_STYLE_MASK 0x8000
Linus Torvalds34435462006-03-24 20:13:22 -080064
65typedef struct s_mmfile {
66 char *ptr;
67 long size;
68} mmfile_t;
69
70typedef struct s_mmbuffer {
71 char *ptr;
72 long size;
73} mmbuffer_t;
74
75typedef struct s_xpparam {
76 unsigned long flags;
77} xpparam_t;
78
79typedef struct s_xdemitcb {
80 void *priv;
81 int (*outf)(void *, mmbuffer_t *, int);
82} xdemitcb_t;
83
Junio C Hamanof2584752007-07-06 00:45:10 -070084typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
85
Linus Torvalds34435462006-03-24 20:13:22 -080086typedef struct s_xdemitconf {
87 long ctxlen;
René Scharfe6d0e6742008-12-28 19:45:32 +010088 long interhunkctxlen;
Mark Woodingacb72572006-03-28 03:23:31 +010089 unsigned long flags;
Junio C Hamanof2584752007-07-06 00:45:10 -070090 find_func_t find_func;
91 void *find_func_priv;
Brian Downingef2e62f2008-10-25 15:30:54 +020092 void (*emit_func)();
Linus Torvalds34435462006-03-24 20:13:22 -080093} xdemitconf_t;
94
95typedef struct s_bdiffparam {
96 long bsize;
97} bdiffparam_t;
98
99
100#define xdl_malloc(x) malloc(x)
101#define xdl_free(ptr) free(ptr)
102#define xdl_realloc(ptr,x) realloc(ptr,x)
103
104void *xdl_mmfile_first(mmfile_t *mmf, long *size);
105void *xdl_mmfile_next(mmfile_t *mmf, long *size);
106long xdl_mmfile_size(mmfile_t *mmf);
107
108int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
109 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
110
Johannes Schindelin857b9332006-11-21 23:24:34 +0100111int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
112 mmfile_t *mf2, const char *name2,
113 xpparam_t const *xpp, int level, mmbuffer_t *result);
114
Linus Torvalds34435462006-03-24 20:13:22 -0800115#ifdef __cplusplus
116}
117#endif /* #ifdef __cplusplus */
118
119#endif /* #if !defined(XDIFF_H) */