Skip to content

Commit

Permalink
transport-helper: drop read/write errno checks
Browse files Browse the repository at this point in the history
Since we use xread() and xwrite() here, EINTR, EAGAIN, and
EWOULDBLOCK retries are already handled for us, and we will
never see these errno values ourselves. We can drop these
conditions entirely, making the code easier to follow.

Signed-off-by: Jeff King <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
peff authored and gitster committed Jan 3, 2019
1 parent c14e5a1 commit d4c8136
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions transport-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -1226,8 +1226,7 @@ static int udt_do_read(struct unidirectional_transfer *t)

transfer_debug("%s is readable", t->src_name);
bytes = xread(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse);
if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN &&
errno != EINTR) {
if (bytes < 0) {
error_errno(_("read(%s) failed"), t->src_name);
return -1;
} else if (bytes == 0) {
Expand All @@ -1254,7 +1253,7 @@ static int udt_do_write(struct unidirectional_transfer *t)

transfer_debug("%s is writable", t->dest_name);
bytes = xwrite(t->dest, t->buf, t->bufuse);
if (bytes < 0 && errno != EWOULDBLOCK) {
if (bytes < 0) {
error_errno(_("write(%s) failed"), t->dest_name);
return -1;
} else if (bytes > 0) {
Expand Down

0 comments on commit d4c8136

Please sign in to comment.