xdiff / xdiff.hon commit log: teach "terminator" vs "separator" mode to "--pretty=format" (4da45be)
   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_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
  36
  37#define XDL_PATCH_NORMAL '-'
  38#define XDL_PATCH_REVERSE '+'
  39#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
  40#define XDL_PATCH_IGNOREBSPACE (1 << 8)
  41
  42#define XDL_EMIT_FUNCNAMES (1 << 0)
  43#define XDL_EMIT_COMMON (1 << 1)
  44
  45#define XDL_MMB_READONLY (1 << 0)
  46
  47#define XDL_MMF_ATOMIC (1 << 0)
  48
  49#define XDL_BDOP_INS 1
  50#define XDL_BDOP_CPY 2
  51#define XDL_BDOP_INSB 3
  52
  53#define XDL_MERGE_MINIMAL 0
  54#define XDL_MERGE_EAGER 1
  55#define XDL_MERGE_ZEALOUS 2
  56#define XDL_MERGE_ZEALOUS_ALNUM 3
  57
  58typedef struct s_mmfile {
  59        char *ptr;
  60        long size;
  61} mmfile_t;
  62
  63typedef struct s_mmbuffer {
  64        char *ptr;
  65        long size;
  66} mmbuffer_t;
  67
  68typedef struct s_xpparam {
  69        unsigned long flags;
  70} xpparam_t;
  71
  72typedef struct s_xdemitcb {
  73        void *priv;
  74        int (*outf)(void *, mmbuffer_t *, int);
  75} xdemitcb_t;
  76
  77typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
  78
  79typedef struct s_xdemitconf {
  80        long ctxlen;
  81        unsigned long flags;
  82        find_func_t find_func;
  83        void *find_func_priv;
  84} xdemitconf_t;
  85
  86typedef struct s_bdiffparam {
  87        long bsize;
  88} bdiffparam_t;
  89
  90
  91#define xdl_malloc(x) malloc(x)
  92#define xdl_free(ptr) free(ptr)
  93#define xdl_realloc(ptr,x) realloc(ptr,x)
  94
  95void *xdl_mmfile_first(mmfile_t *mmf, long *size);
  96void *xdl_mmfile_next(mmfile_t *mmf, long *size);
  97long xdl_mmfile_size(mmfile_t *mmf);
  98
  99int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 100             xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 101
 102int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
 103                mmfile_t *mf2, const char *name2,
 104                xpparam_t const *xpp, int level, mmbuffer_t *result);
 105
 106#ifdef __cplusplus
 107}
 108#endif /* #ifdef __cplusplus */
 109
 110#endif /* #if !defined(XDIFF_H) */