Andrew's git - gitweb.git/blob

   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
  27extern "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
  60/* merge favor modes */
  61#define XDL_MERGE_FAVOR_OURS 1
  62#define XDL_MERGE_FAVOR_THEIRS 2
  63#define XDL_MERGE_FAVOR_UNION 3
  64
  65/* merge output styles */
  66#define XDL_MERGE_DIFF3 1
  67
  68typedef struct s_mmfile {
  69        char *ptr;
  70        long size;
  71} mmfile_t;
  72
  73typedef struct s_mmbuffer {
  74        char *ptr;
  75        long size;
  76} mmbuffer_t;
  77
  78typedef struct s_xpparam {
  79        unsigned long flags;
  80} xpparam_t;
  81
  82typedef struct s_xdemitcb {
  83        void *priv;
  84        int (*outf)(void *, mmbuffer_t *, int);
  85} xdemitcb_t;
  86
  87typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
  88
  89typedef struct s_xdemitconf {
  90        long ctxlen;
  91        long interhunkctxlen;
  92        unsigned long flags;
  93        find_func_t find_func;
  94        void *find_func_priv;
  95        void (*emit_func)();
  96} xdemitconf_t;
  97
  98typedef struct s_bdiffparam {
  99        long bsize;
 100} bdiffparam_t;
 101
 102
 103#define xdl_malloc(x) malloc(x)
 104#define xdl_free(ptr) free(ptr)
 105#define xdl_realloc(ptr,x) realloc(ptr,x)
 106
 107void *xdl_mmfile_first(mmfile_t *mmf, long *size);
 108void *xdl_mmfile_next(mmfile_t *mmf, long *size);
 109long xdl_mmfile_size(mmfile_t *mmf);
 110
 111int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 112             xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 113
 114typedef struct s_xmparam {
 115        xpparam_t xpp;
 116        int marker_size;
 117        int level;
 118        int favor;
 119        int style;
 120        const char *ancestor;   /* label for orig */
 121        const char *file1;      /* label for mf1 */
 122        const char *file2;      /* label for mf2 */
 123} xmparam_t;
 124
 125#define DEFAULT_CONFLICT_MARKER_SIZE 7
 126
 127int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 128                xmparam_t const *xmp, mmbuffer_t *result);
 129
 130#ifdef __cplusplus
 131}
 132#endif /* #ifdef __cplusplus */
 133
 134#endif /* #if !defined(XDIFF_H) */