postgres.git / summary / log / commit / refs

commit    5e8e794e3be9fbeddf6f2e2c0515dd0f04c784ec
Author:   Stephen Frost <sfrost@snowman.net>
Date:     Sun Feb 09 18:29:36 2014 +0000

    Focus on ftello result < 0 instead of errno
    
    Rather than reset errno (or just hope that its cleared already),
    check just the result of the ftello for < 0 to determine if there
    was an issue.
    
    Oversight by me, pointed out by Tom.


 src/bin/pg_dump/pg_backup_custom.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index a15254a118e..72bdc3928b2 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -708,7 +708,7 @@ _CloseArchive(ArchiveHandle *AH)
 	{
 		WriteHead(AH);
 		tpos = ftello(AH->FH);
-		if (tpos < 0 || errno)
+		if (tpos < 0)
 			exit_horribly(modulename, "could not determine seek position in archive file: %s\n",
 						  strerror(errno));
 		WriteToc(AH);
@@ -757,9 +757,8 @@ _ReopenArchive(ArchiveHandle *AH)
 	if (!ctx->hasSeek)
 		exit_horribly(modulename, "parallel restore from non-seekable file is not supported\n");
 
-	errno = 0;
 	tpos = ftello(AH->FH);
-	if (tpos < 0 || errno)
+	if (tpos < 0)
 		exit_horribly(modulename, "could not determine seek position in archive file: %s\n",
 					  strerror(errno));
 


[parent: 8198a321c9ea]