Code

Fix type-mismatch compiler warning from diff_populate_filespec()
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Thu, 18 Dec 2008 16:56:51 +0000 (17:56 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Dec 2008 17:58:40 +0000 (09:58 -0800)
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.c

diff --git a/diff.c b/diff.c
index f160c1a35b786c8b1bb4451c254915bffde0fae3..0484601f42a8aeac408d560091d341f571f231dd 100644 (file)
--- 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;
                }