summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2007-05-15 14:49:22 +0200
committerJunio C Hamano <junkio@cox.net>2007-05-15 21:16:03 -0700
commit8a912bcb250d8bf57b225e1cf02c0d69d54c8920 (patch)
tree51c2ec028d037343a67d99d891e1d01ad736e69e /combine-diff.c
parent2924415f4fb081d9dde687092248c86ec0c40195 (diff)
downloadgit-8a912bcb250d8bf57b225e1cf02c0d69d54c8920.tar.gz
Ensure return value from xread() is always stored into an ssize_t
This patch fixes all calls to xread() where the return value is not stored into an ssize_t. The patch should not have any effect whatsoever, other than putting better/more appropriate type names on variables. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index cff9c5dc42..ea3ca5f950 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -714,7 +714,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
result_size = len;
result = xmalloc(len + 1);
while (sz < len) {
- int done = xread(fd, result+sz, len-sz);
+ ssize_t done = xread(fd, result+sz, len-sz);
if (done == 0)
break;
if (done < 0)