summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-09-13 13:17:44 -0400
committerJunio C Hamano <gitster@pobox.com>2017-09-14 15:17:59 +0900
commit634eb82b1aa142e2743acd836447002fd9ebfa10 (patch)
treeaef8ef65d20c41f8757eb4994d87c473a66ebf73
parent4c95e3dd28342878e0deed264ddc784b775361b7 (diff)
downloadgit-634eb82b1aa142e2743acd836447002fd9ebfa10.tar.gz
notes-merge: use ssize_t for write_in_full() return value
We store the return value of write_in_full() in a long, though the return is actually an ssize_t. This probably doesn't matter much in practice (since the buffer size is alredy an unsigned long), but it might if the size if between what can be represented in "long" and "unsigned long", and if your size_t is larger than a "long" (as it is on 64-bit Windows). Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--notes-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index c12b354f10..01cecbdda3 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -302,7 +302,7 @@ static void write_buf_to_worktree(const struct object_id *obj,
fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
while (size > 0) {
- long ret = write_in_full(fd, buf, size);
+ ssize_t ret = write_in_full(fd, buf, size);
if (ret < 0) {
/* Ignore epipe */
if (errno == EPIPE)