[PATCH 7/7] write_or_die: drop write_or_whine_pipe()
- From
Jeff King <peff@peff.net>
- Date
- Aug 3, 2016, 23:01 UTC
- Message-ID
- <20160803230141.fujy7umrihw2utpu@sigill.intra.peff.net>
- In-Reply-To
- <20160803225600.fgm23bdacunmrw44@sigill.intra.peff.net>
This function has no callers, and is not likely to gain any because it's confusing to use.
It unconditionally complains to stderr, but _doesn't_ die. Yet any caller which wants a "gentle" write would generally want to suppress the error message, because presumably they're going to write a better one, and/or try the operation again.
And the check_pipe() call leads to confusing behaviors. It means we die for EPIPE, but not for other errors, which is confusing and pointless.
On top of all that, it has unusual error return semantics, which makes it easy for callers to get it wrong.
Let's drop the function, and if somebody ever needs to resurrect something like it, they can fix these warts.
Signed-off-by: Jeff King <peff@peff.net> --- cache.h | 1 - write_or_die.c | 12 ------------ 2 files changed, 13 deletions(-)
diff --git a/cache.h b/cache.h index b5f76a4..3885911 100644 --- a/cache.h +++ b/cache.h @@ -1740,7 +1740,6 @@ extern int copy_file(const char *dst, const char *src, int mode); extern int copy_file_with_time(const char *dst, const char *src, int mode); extern void write_or_die(int fd, const void *buf, size_t count); -extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg); extern void fsync_or_die(int fd, const char *); extern ssize_t read_in_full(int fd, void *buf, size_t count); diff --git a/write_or_die.c b/write_or_die.c index 9816879..0734432 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -82,15 +82,3 @@ void write_or_die(int fd, const void *buf, size_t count) die_errno("write error"); } } - -int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg) -{ - if (write_in_full(fd, buf, count) < 0) { - check_pipe(errno); - fprintf(stderr, "%s: write error (%s)\n", - msg, strerror(errno)); - return 0; - } - - return 1; -}
-- 2.9.2.670.g42e63de