Skip to content

Commit eeb01eb

Browse files
committed
Remove pointless error-code checking in pg_dump/parallel.c.
Commit fe27009 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/2621622.1602184554@sss.pgh.pa.us
1 parent 961e07b commit eeb01eb

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

src/bin/pg_dump/parallel.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ typedef struct
130130

131131
/* Windows implementation of pipe access */
132132
static int pgpipe(int handles[2]);
133-
static int piperead(int s, char *buf, int len);
133+
#define piperead(a,b,c) recv(a,b,c,0)
134134
#define pipewrite(a,b,c) send(a,b,c,0)
135135

136136
#else /* !WIN32 */
@@ -1817,25 +1817,4 @@ pgpipe(int handles[2])
18171817
return 0;
18181818
}
18191819

1820-
/*
1821-
* Windows implementation of reading from a pipe.
1822-
*/
1823-
static int
1824-
piperead(int s, char *buf, int len)
1825-
{
1826-
int ret = recv(s, buf, len, 0);
1827-
1828-
if (ret < 0)
1829-
{
1830-
switch (TranslateSocketError())
1831-
{
1832-
case ALL_CONNECTION_FAILURE_ERRNOS:
1833-
/* Treat connection loss as EOF on the pipe */
1834-
ret = 0;
1835-
break;
1836-
}
1837-
}
1838-
return ret;
1839-
}
1840-
18411820
#endif /* WIN32 */

0 commit comments

Comments
 (0)