diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-06-14 17:40:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-23 17:35:27 -0700 |
| commit | 0d21efa51cc7de5250d5da46bceacda78ba35373 (patch) | |
| tree | 7716a2c8723a3e5cf7d479654f47867d27451330 /xdiff/xutils.h | |
| parent | cda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff) | |
| download | git-0d21efa51cc7de5250d5da46bceacda78ba35373.tar.gz git-0d21efa51cc7de5250d5da46bceacda78ba35373.tar.xz | |
Teach diff about -b and -w flags
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>
Diffstat (limited to 'xdiff/xutils.h')
| -rw-r--r-- | xdiff/xutils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff/xutils.h b/xdiff/xutils.h index 08691a244..70d8b9838 100644 --- a/xdiff/xutils.h +++ b/xdiff/xutils.h @@ -34,7 +34,8 @@ 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); -unsigned long xdl_hash_record(char const **data, char const *top); +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); |