summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-09-13 17:16:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-14 06:17:59 (GMT)
commit564bde9ae69dc3d60e764078745275b637f90991 (patch)
tree45365f924c0622698493ee62ee0ede6c51133e4c /entry.c
parent06f46f237afa823c0a2775e60ed8fbd80e7c751f (diff)
downloadgit-564bde9ae69dc3d60e764078745275b637f90991.zip
git-564bde9ae69dc3d60e764078745275b637f90991.tar.gz
git-564bde9ae69dc3d60e764078745275b637f90991.tar.bz2
convert less-trivial versions of "write_in_full() != len"
The prior commit converted many sites to check the return value of write_in_full() for negativity, rather than a mismatch with the input length. This patch covers similar cases, but where the return value is stored in an intermediate variable. These should get the same treatment, but they need to be reviewed more carefully since it would be a bug if the return value is stored in an unsigned type (which indeed, it is in one of the cases). Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/entry.c b/entry.c
index 65458f0..3c1818f 100644
--- a/entry.c
+++ b/entry.c
@@ -244,7 +244,8 @@ static int write_entry(struct cache_entry *ce,
char *new;
struct strbuf buf = STRBUF_INIT;
unsigned long size;
- size_t wrote, newsize = 0;
+ ssize_t wrote;
+ size_t newsize = 0;
struct stat st;
const struct submodule *sub;
@@ -319,7 +320,7 @@ static int write_entry(struct cache_entry *ce,
fstat_done = fstat_output(fd, state, &st);
close(fd);
free(new);
- if (wrote != size)
+ if (wrote < 0)
return error("unable to write file %s", path);
break;
case S_IFGITLINK: