Skip to content

Commit 634eb82

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4c95e3d commit 634eb82

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

notes-merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static void write_buf_to_worktree(const struct object_id *obj,
302302
fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
303303

304304
while (size > 0) {
305-
long ret = write_in_full(fd, buf, size);
305+
ssize_t ret = write_in_full(fd, buf, size);
306306
if (ret < 0) {
307307
/* Ignore epipe */
308308
if (errno == EPIPE)

0 commit comments

Comments
 (0)