xdiff/xdiff.h

   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)
  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_PATIENCE_DIFF (1 << 5)
  36 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
  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
  43 #define XDL_EMIT_FUNCNAMES (1 << 0)
  44 #define XDL_EMIT_COMMON (1 << 1)
  45
  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
  54 /* merge simplification levels */
  55 #define XDL_MERGE_MINIMAL 0
  56 #define XDL_MERGE_EAGER 1
  57 #define XDL_MERGE_ZEALOUS 2
  58 #define XDL_MERGE_ZEALOUS_ALNUM 3
  59 #define XDL_MERGE_LEVEL_MASK 0x0f
  60
  61 /* merge favor modes */
  62 #define XDL_MERGE_FAVOR_OURS 1
  63 #define XDL_MERGE_FAVOR_THEIRS 2
  64 #define XDL_MERGE_FAVOR(flags) (((flags)>>4) & 3)
  65 #define XDL_MERGE_FLAGS(level, style, favor) ((level)|(style)|((favor)<<4))
  66
  67 /* merge output styles */
  68 #define XDL_MERGE_DIFF3 0x8000
  69 #define XDL_MERGE_STYLE_MASK 0x8000
  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;
  83 } xpparam_t;
  84
  85 typedef struct s_xdemitcb {
  86         void *priv;
  87         int (*outf)(void *, mmbuffer_t *, int);
  88 } xdemitcb_t;
  89
  90 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
  91
  92 typedef struct s_xdemitconf {
  93         long ctxlen;
  94         long interhunkctxlen;
  95         unsigned long flags;
  96         find_func_t find_func;
  97         void *find_func_priv;
  98         void (*emit_func)();
  99 } xdemitconf_t;
 100
 101 typedef struct s_bdiffparam {
 102         long bsize;
 103 } bdiffparam_t;
 104
 105
 106 #define xdl_malloc(x) malloc(x)
 107 #define xdl_free(ptr) free(ptr)
 108 #define xdl_realloc(ptr,x) realloc(ptr,x)
 109
 110 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
 111 void *xdl_mmfile_next(mmfile_t *mmf, long *size);
 112 long xdl_mmfile_size(mmfile_t *mmf);
 113
 114 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 115              xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 116
 117 typedef struct s_xmparam {
 118         xpparam_t xpp;
 119         int marker_size;
 120 } xmparam_t;
 121
 122 #define DEFAULT_CONFLICT_MARKER_SIZE 7
 123
 124 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
 125                 mmfile_t *mf2, const char *name2,
 126                 xmparam_t const *xmp, int flags, mmbuffer_t *result);
 127
 128 #ifdef __cplusplus
 129 }
 130 #endif /* #ifdef __cplusplus */
 131
 132 #endif /* #if !defined(XDIFF_H) */