diff options
| -rw-r--r-- | sha1_file.c | 9 | ||||
| -rw-r--r-- | write_or_die.c | 31 |
2 files changed, 4 insertions, 36 deletions
diff --git a/sha1_file.c b/sha1_file.c index 18dd89b50a..2a5be53fac 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1618,14 +1618,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename) static int write_buffer(int fd, const void *buf, size_t len) { - ssize_t size; - - if (!len) - return 0; - size = write_in_full(fd, buf, len); - if (!size) - return error("file write: disk full"); - if (size < 0) + if (write_in_full(fd, buf, len) < 0) return error("file write error (%s)", strerror(errno)); return 0; } diff --git a/write_or_die.c b/write_or_die.c index 488de721da..1224cac5da 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -58,14 +58,7 @@ int write_in_full(int fd, const void *buf, size_t count) void write_or_die(int fd, const void *buf, size_t count) { - ssize_t written; - - if (!count) - return; - written = write_in_full(fd, buf, count); - if (written == 0) - die("disk full?"); - else if (written < 0) { + if (write_in_full(fd, buf, count) < 0) { if (errno == EPIPE) exit(0); die("write error (%s)", strerror(errno)); @@ -74,16 +67,7 @@ void write_or_die(int fd, const void *buf, size_t count) int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg) { - ssize_t written; - - if (!count) - return 1; - written = write_in_full(fd, buf, count); - if (written == 0) { - fprintf(stderr, "%s: disk full?\n", msg); - return 0; - } - else if (written < 0) { + if (write_in_full(fd, buf, count) < 0) { if (errno == EPIPE) exit(0); fprintf(stderr, "%s: write error (%s)\n", @@ -96,16 +80,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg) int write_or_whine(int fd, const void *buf, size_t count, const char *msg) { - ssize_t written; - - if (!count) - return 1; - written = write_in_full(fd, buf, count); - if (written == 0) { - fprintf(stderr, "%s: disk full?\n", msg); - return 0; - } - else if (written < 0) { + if (write_in_full(fd, buf, count) < 0) { fprintf(stderr, "%s: write error (%s)\n", msg, strerror(errno)); return 0; |