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, see
  17 *  <http://www.gnu.org/licenses/>.
  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/* xpparm_t.flags */
  31#define XDF_NEED_MINIMAL (1 << 0)
  32
  33#define XDF_IGNORE_WHITESPACE (1 << 1)
  34#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
  35#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
  36#define XDF_IGNORE_CR_AT_EOL (1 << 4)
  37#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
  38                              XDF_IGNORE_WHITESPACE_CHANGE | \
  39                              XDF_IGNORE_WHITESPACE_AT_EOL | \
  40                              XDF_IGNORE_CR_AT_EOL)
  41
  42#define XDF_IGNORE_BLANK_LINES (1 << 7)
  43
  44#define XDF_PATIENCE_DIFF (1 << 14)
  45#define XDF_HISTOGRAM_DIFF (1 << 15)
  46#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
  47#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
  48
  49#define XDF_INDENT_HEURISTIC (1 << 23)
  50
  51/* xdemitconf_t.flags */
  52#define XDL_EMIT_FUNCNAMES (1 << 0)
  53#define XDL_EMIT_FUNCCONTEXT (1 << 2)
  54
  55/* merge simplification levels */
  56#define XDL_MERGE_MINIMAL 0
  57#define XDL_MERGE_EAGER 1
  58#define XDL_MERGE_ZEALOUS 2
  59#define XDL_MERGE_ZEALOUS_ALNUM 3
  60
  61/* merge favor modes */
  62#define XDL_MERGE_FAVOR_OURS 1
  63#define XDL_MERGE_FAVOR_THEIRS 2
  64#define XDL_MERGE_FAVOR_UNION 3
  65
  66/* merge output styles */
  67#define XDL_MERGE_DIFF3 1
  68
  69typedef struct s_mmfile {
  70        char *ptr;
  71        long size;
  72} mmfile_t;
  73
  74typedef struct s_mmbuffer {
  75        char *ptr;
  76        long size;
  77} mmbuffer_t;
  78
  79typedef struct s_xpparam {
  80        unsigned long flags;
  81
  82        /* See Documentation/diff-options.txt. */
  83        char **anchors;
  84        size_t anchors_nr;
  85} xpparam_t;
  86
  87typedef struct s_xdemitcb {
  88        void *priv;
  89        int (*out_hunk)(void *,
  90                        long old_begin, long old_nr,
  91                        long new_begin, long new_nr,
  92                        const char *func, long funclen);
  93        int (*out_line)(void *, mmbuffer_t *, int);
  94} xdemitcb_t;
  95
  96typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
  97
  98typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
  99                                            long start_b, long count_b,
 100                                            void *cb_data);
 101
 102typedef struct s_xdemitconf {
 103        long ctxlen;
 104        long interhunkctxlen;
 105        unsigned long flags;
 106        find_func_t find_func;
 107        void *find_func_priv;
 108        xdl_emit_hunk_consume_func_t hunk_func;
 109} xdemitconf_t;
 110
 111typedef struct s_bdiffparam {
 112        long bsize;
 113} bdiffparam_t;
 114
 115
 116#define xdl_malloc(x) malloc(x)
 117#define xdl_free(ptr) free(ptr)
 118#define xdl_realloc(ptr,x) realloc(ptr,x)
 119
 120void *xdl_mmfile_first(mmfile_t *mmf, long *size);
 121long xdl_mmfile_size(mmfile_t *mmf);
 122
 123int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 124             xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 125
 126typedef struct s_xmparam {
 127        xpparam_t xpp;
 128        int marker_size;
 129        int level;
 130        int favor;
 131        int style;
 132        const char *ancestor;   /* label for orig */
 133        const char *file1;      /* label for mf1 */
 134        const char *file2;      /* label for mf2 */
 135} xmparam_t;
 136
 137#define DEFAULT_CONFLICT_MARKER_SIZE 7
 138
 139int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 140                xmparam_t const *xmp, mmbuffer_t *result);
 141
 142#ifdef __cplusplus
 143}
 144#endif /* #ifdef __cplusplus */
 145
 146#endif /* #if !defined(XDIFF_H) */