Linus Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 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 |
| 27 | extern "C" { |
| 28 | #endif /* #ifdef __cplusplus */ |
| 29 | |
| 30 | |
| 31 | #define XDF_NEED_MINIMAL (1 << 1) |
Johannes Schindelin | 0d21efa | 2006-06-14 17:40:23 +0200 | [diff] [blame] | 32 | #define XDF_IGNORE_WHITESPACE (1 << 2) |
| 33 | #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) |
Johannes Schindelin | 859f9c4 | 2007-02-14 01:30:29 +0100 | [diff] [blame] | 34 | #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) |
Johannes Schindelin | 92b7de9 | 2009-01-07 18:04:09 +0100 | [diff] [blame] | 35 | #define XDF_PATIENCE_DIFF (1 << 5) |
Johannes Schindelin | 859f9c4 | 2007-02-14 01:30:29 +0100 | [diff] [blame] | 36 | #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) |
Linus Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 37 | |
| 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 Wooding | acb7257 | 2006-03-28 03:23:31 +0100 | [diff] [blame] | 43 | #define XDL_EMIT_FUNCNAMES (1 << 0) |
Linus Torvalds | a9ed376 | 2006-06-28 21:57:12 -0700 | [diff] [blame] | 44 | #define XDL_EMIT_COMMON (1 << 1) |
Mark Wooding | acb7257 | 2006-03-28 03:23:31 +0100 | [diff] [blame] | 45 | |
Linus Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 46 | #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 Hamano | e0af48e | 2008-08-28 01:10:04 -0700 | [diff] [blame] | 54 | /* merge simplification levels */ |
Johannes Schindelin | 857b933 | 2006-11-21 23:24:34 +0100 | [diff] [blame] | 55 | #define XDL_MERGE_MINIMAL 0 |
| 56 | #define XDL_MERGE_EAGER 1 |
| 57 | #define XDL_MERGE_ZEALOUS 2 |
Johannes Schindelin | ee95ec5 | 2008-02-17 19:07:40 +0000 | [diff] [blame] | 58 | #define XDL_MERGE_ZEALOUS_ALNUM 3 |
Junio C Hamano | e0af48e | 2008-08-28 01:10:04 -0700 | [diff] [blame] | 59 | #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 Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 64 | |
| 65 | typedef struct s_mmfile { |
| 66 | char *ptr; |
| 67 | long size; |
| 68 | } mmfile_t; |
| 69 | |
| 70 | typedef struct s_mmbuffer { |
| 71 | char *ptr; |
| 72 | long size; |
| 73 | } mmbuffer_t; |
| 74 | |
| 75 | typedef struct s_xpparam { |
| 76 | unsigned long flags; |
| 77 | } xpparam_t; |
| 78 | |
| 79 | typedef struct s_xdemitcb { |
| 80 | void *priv; |
| 81 | int (*outf)(void *, mmbuffer_t *, int); |
| 82 | } xdemitcb_t; |
| 83 | |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 84 | typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); |
| 85 | |
Linus Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 86 | typedef struct s_xdemitconf { |
| 87 | long ctxlen; |
René Scharfe | 6d0e674 | 2008-12-28 19:45:32 +0100 | [diff] [blame] | 88 | long interhunkctxlen; |
Mark Wooding | acb7257 | 2006-03-28 03:23:31 +0100 | [diff] [blame] | 89 | unsigned long flags; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 90 | find_func_t find_func; |
| 91 | void *find_func_priv; |
Brian Downing | ef2e62f | 2008-10-25 15:30:54 +0200 | [diff] [blame] | 92 | void (*emit_func)(); |
Linus Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 93 | } xdemitconf_t; |
| 94 | |
| 95 | typedef 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 | |
| 104 | void *xdl_mmfile_first(mmfile_t *mmf, long *size); |
| 105 | void *xdl_mmfile_next(mmfile_t *mmf, long *size); |
| 106 | long xdl_mmfile_size(mmfile_t *mmf); |
| 107 | |
| 108 | int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, |
| 109 | xdemitconf_t const *xecfg, xdemitcb_t *ecb); |
| 110 | |
Johannes Schindelin | 857b933 | 2006-11-21 23:24:34 +0100 | [diff] [blame] | 111 | int 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 Torvalds | 3443546 | 2006-03-24 20:13:22 -0800 | [diff] [blame] | 115 | #ifdef __cplusplus |
| 116 | } |
| 117 | #endif /* #ifdef __cplusplus */ |
| 118 | |
| 119 | #endif /* #if !defined(XDIFF_H) */ |