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>

diff --git a/entry.c b/entry.c
index 65458f07a4453fa29731fe2b9c20848d6b192b20..3c1818f1d45d92d2470ca549f9596e347086bbb6 100644 (file)
--- 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;
        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;
 
        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);
                        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:
                        return error("unable to write file %s", path);
                break;
        case S_IFGITLINK:

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 924e8537f3e4a6cf3cd581f121c37688150531d0..f21a954ce712bb06aae3b83992e20910dc6b061c 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2039,7 +2039,7 @@ static int log_ref_write_fd(int fd, const struct object_id *old_oid,
 
        written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
        free(logrec);
 
        written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
        free(logrec);

-       if (written != len)
+       if (written < 0)

                return -1;
 
        return 0;
                return -1;
 
        return 0;

diff --git a/streaming.c b/streaming.c
index 9afa66b8be6c3b5481e4542c033bfebdb2abbfda..c8b85e4498eaedee4142cbe543174ae639cae8e8 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -539,7 +539,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
                        kept = 0;
                wrote = write_in_full(fd, buf, readlen);
 
                        kept = 0;
                wrote = write_in_full(fd, buf, readlen);
 

-               if (wrote != readlen)
+               if (wrote < 0)

                        goto close_and_exit;
        }
        if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||
                        goto close_and_exit;
        }
        if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||