From: Andres Freund <andres@anarazel.de>
Date: Sun, 14 Feb 2010 10:24:45 +0000 (+0100)
Subject: Dont try to save the errno in RecoveryConflictInterrupt to avoid confusion.
X-Git-Url: http://git.postgresql.org/gitweb/backend_dirs.html?a=commitdiff_plain;h=0dc602ca41fee1ca8bd85056add8bcb8f44bf510;p=users%2Fandresfreund%2Fpostgres.git

Dont try to save the errno in RecoveryConflictInterrupt to avoid confusion.

In the current state the errno saving in there is confusing as there
are several returns ignoring to set it. I think its currently harmless
as there should be no changes to errno at those places - beside that
the only caller (procsignal_sigusr1_handler) already saves it.
---

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8c0c8b9c88..3505fc430c 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2753,11 +2753,9 @@ SigHupHandler(SIGNAL_ARGS)
 void
 RecoveryConflictInterrupt(ProcSignalReason reason)
 {
-	int                     save_errno = errno;
-
 	/*
-	* Don't joggle the elbow of proc_exit
-	*/
+	 * Don't joggle the elbow of proc_exit
+	 */
 	if (!proc_exit_inprogress)
 	{
 		RecoveryConflictReason = reason;
@@ -2856,8 +2854,6 @@ RecoveryConflictInterrupt(ProcSignalReason reason)
 			ProcessInterrupts();
 		}
 	}
-
-	errno = save_errno;
 }
 
 /*