mirror of
https://github.com/git/git.git
synced 2024-11-18 23:14:51 +01:00
0d21efa51c
This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to diff. The main part of the patch is teaching libxdiff about it. [jc: renamed xdl_line_match() to xdl_recmatch() since the former is used for different purposes in xpatchi.c which is in the parts of the upstream source we do not use.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
48 lines
1.7 KiB
C
48 lines
1.7 KiB
C
/*
|
|
* LibXDiff by Davide Libenzi ( File Differential Library )
|
|
* Copyright (C) 2003 Davide Libenzi
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#if !defined(XUTILS_H)
|
|
#define XUTILS_H
|
|
|
|
|
|
|
|
long xdl_bogosqrt(long n);
|
|
int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
|
|
xdemitcb_t *ecb);
|
|
int xdl_cha_init(chastore_t *cha, long isize, long icount);
|
|
void xdl_cha_free(chastore_t *cha);
|
|
void *xdl_cha_alloc(chastore_t *cha);
|
|
void *xdl_cha_first(chastore_t *cha);
|
|
void *xdl_cha_next(chastore_t *cha);
|
|
long xdl_guess_lines(mmfile_t *mf);
|
|
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags);
|
|
unsigned long xdl_hash_record(char const **data, char const *top, long flags);
|
|
unsigned int xdl_hashbits(unsigned int size);
|
|
int xdl_num_out(char *out, long val);
|
|
long xdl_atol(char const *str, char const **next);
|
|
int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
|
|
const char *func, long funclen, xdemitcb_t *ecb);
|
|
|
|
|
|
|
|
#endif /* #if !defined(XUTILS_H) */
|
|
|