diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-19 17:01:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:43:49 -0700 |
| commit | d281786fcd6d0df47dd46e415f1a804b2e81ed9b (patch) | |
| tree | a9844a33aa2c0bc8c58c8fe3e6f272362c6fe49a /xdiff | |
| parent | 0da4677149b433e5424537c6acf45bd4d2f7a6df (diff) | |
| download | git-d281786fcd6d0df47dd46e415f1a804b2e81ed9b.tar.gz | |
xdiff: minor changes to match libxdiff-0.21
This reformats the change 621c53cc082299eaf69e9f2dc0274547c7d87fb0
introduced to match what upstream author implemented in libxdiff-0.21
without changing any logic (hopefully ;-). This is to help keep
us in sync with the upstream.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xutils.c | 11 | ||||
| -rw-r--r-- | xdiff/xutils.h | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 21ab8e7e26..f91b403475 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -44,21 +44,18 @@ long xdl_bogosqrt(long n) { int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, xdemitcb_t *ecb) { + int i = 2; mmbuffer_t mb[3]; - int i; mb[0].ptr = (char *) pre; mb[0].size = psize; mb[1].ptr = (char *) rec; mb[1].size = size; - i = 2; - - if (!size || rec[size-1] != '\n') { - mb[2].ptr = "\n\\ No newline at end of file\n"; + if (size > 0 && rec[size - 1] != '\n') { + mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; mb[2].size = strlen(mb[2].ptr); - i = 3; + i++; } - if (ecb->outf(ecb->priv, mb, i) < 0) { return -1; diff --git a/xdiff/xutils.h b/xdiff/xutils.h index ea38ee903f..08691a2447 100644 --- a/xdiff/xutils.h +++ b/xdiff/xutils.h @@ -24,6 +24,7 @@ #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); |