[PATCH v7 01/10] convert: remove erroneous tests for errno == EPIPE
flat view
STALE3436d
REVIEWED: 1 (0M)
From: Ben Peart <hidden>
Date: 2017-05-05 15:28:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v7 of 7 in this series; 1 review trailer.
Revisions (7)
start_multi_file_filter() and apply_multi_file_filter() currently test for errno == EPIPE but treating EPIPE as an error is already happening from one of the packet_write() functions. Signed-off-by: Ben Peart <redacted> Found/Fixed-by: Jeff King [off-list ref] Acked-by: Lars Schneider <redacted> --- convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/convert.c b/convert.c
index 4e17e45ed2..bdd528086f 100644
--- a/convert.c
+++ b/convert.c@@ -661,7 +661,7 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons done: sigchain_pop(SIGPIPE); - if (err || errno == EPIPE) { + if (err) { error("initialization for external filter '%s' failed", cmd); kill_multi_file_filter(hashmap, entry); return NULL;
@@ -752,7 +752,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len done: sigchain_pop(SIGPIPE); - if (err || errno == EPIPE) { + if (err) { if (!strcmp(filter_status.buf, "error")) { /* The filter signaled a problem with the file. */ } else if (!strcmp(filter_status.buf, "abort")) {
--
2.12.2.gvfs.2.20.g3624a68d62.dirty