From: Junio C Hamano <junkio@cox.net>
Date: Tue, 20 Jun 2006 00:01:35 +0000 (-0700)
Subject: xdiff: minor changes to match libxdiff-0.21
X-Git-Tag: v1.4.1-rc1~3^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d281786fcd6d0df47dd46e415f1a804b2e81ed9b;p=git.git

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>
---

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 21ab8e7e2..f91b40347 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 ea38ee903..08691a244 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);