summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-10-10 19:33:54 +0000
committerTom Lane2020-10-10 19:33:54 +0000
commiteeb01eb1f560d90625ac4c8ee210f29421ba4f0d (patch)
treeec5ae5ab66def1432847f4b0b5c2e3f321ed6dcc
parent961e07b8ccb56cb3979185b066b503b3d4f7c036 (diff)
Remove pointless error-code checking in pg_dump/parallel.c.
Commit fe27009cb tried to make parallel.c's Windows implementation of piperead() translate Windows socket errors to Unix, but that didn't actually work because TranslateSocketError() is backend-internal code (and not even public there). But on closer inspection, the sole caller of this function doesn't actually care whether the result is zero or negative, much less inspect the errno. So the whole exercise is totally useless, and has been since this code was introduced. Rip it out and just call recv() directly. Per buildfarm. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/bin/pg_dump/parallel.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 4b38ed6c5a..a967e11378 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -130,7 +130,7 @@ typedef struct
/* Windows implementation of pipe access */
static int pgpipe(int handles[2]);
-static int piperead(int s, char *buf, int len);
+#define piperead(a,b,c) recv(a,b,c,0)
#define pipewrite(a,b,c) send(a,b,c,0)
#else /* !WIN32 */
@@ -1817,25 +1817,4 @@ pgpipe(int handles[2])
return 0;
}
-/*
- * Windows implementation of reading from a pipe.
- */
-static int
-piperead(int s, char *buf, int len)
-{
- int ret = recv(s, buf, len, 0);
-
- if (ret < 0)
- {
- switch (TranslateSocketError())
- {
- case ALL_CONNECTION_FAILURE_ERRNOS:
- /* Treat connection loss as EOF on the pipe */
- ret = 0;
- break;
- }
- }
- return ret;
-}
-
#endif /* WIN32 */