From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Thu, 18 Dec 2008 16:56:51 +0000 (+0100)
Subject: Fix type-mismatch compiler warning from diff_populate_filespec()
X-Git-Tag: v1.6.1-rc4~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0956a6db7ae3a93c7bce62c1e3a6e0795055ad9f;p=git.git

Fix type-mismatch compiler warning from diff_populate_filespec()

The type of the size member of filespec is ulong, while strbuf_detach expects
a size_t pointer.  This patch should fix the warning:

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index f160c1a35..0484601f4 100644
--- a/diff.c
+++ b/diff.c
@@ -1778,7 +1778,8 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
 
 			if (strbuf_readlink(&sb, s->path, s->size))
 				goto err_empty;
-			s->data = strbuf_detach(&sb, &s->size);
+			s->size = sb.len;
+			s->data = strbuf_detach(&sb, NULL);
 			s->should_free = 1;
 			return 0;
 		}