X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff%2Fxutils.c;h=f91b4034751df72996afbe6b4b04a9f05638d322;hb=d281786fcd6d0df47dd46e415f1a804b2e81ed9b;hp=21ab8e7e263983b54c07e44150cedc5c43963a35;hpb=0da4677149b433e5424537c6acf45bd4d2f7a6df;p=git.git

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;