diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-07-06 09:39:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-07-06 09:39:46 -0700 |
commit | dd787c19c4f011cc3adb422ef856f2c58d989640 (patch) | |
tree | 1b8fdfb2e14cc423a31ab1ce75c6f05226483da6 /write_or_die.c | |
parent | 864cd9491772367b3ce5b0dda98f068e5bd49680 (diff) | |
parent | 0721c314a5c8fddc877140ab5a333c42c62f780d (diff) | |
download | git-dd787c19c4f011cc3adb422ef856f2c58d989640.tar.gz |
Merge branch 'tr/die_errno'
* tr/die_errno:
Use die_errno() instead of die() when checking syscalls
Convert existing die(..., strerror(errno)) to die_errno()
die_errno(): double % in strerror() output just in case
Introduce die_errno() that appends strerror(errno) to die()
Diffstat (limited to 'write_or_die.c')
-rw-r--r-- | write_or_die.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/write_or_die.c b/write_or_die.c index 4c29255df1..d45b536021 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -41,14 +41,14 @@ void maybe_flush_or_die(FILE *f, const char *desc) */ if (errno == EPIPE || errno == EINVAL) exit(0); - die("write failure on %s: %s", desc, strerror(errno)); + die_errno("write failure on '%s'", desc); } } void fsync_or_die(int fd, const char *msg) { if (fsync(fd) < 0) { - die("%s: fsync error (%s)", msg, strerror(errno)); + die_errno("fsync error on '%s'", msg); } } @@ -57,7 +57,7 @@ void write_or_die(int fd, const void *buf, size_t count) if (write_in_full(fd, buf, count) < 0) { if (errno == EPIPE) exit(0); - die("write error (%s)", strerror(errno)); + die_errno("write error"); } } |