From a05ed5bc11ceef1ab98bd6cfdb7532266256c98c Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Wed, 31 Jul 1996 02:19:23 +0000
Subject: [PATCH] Fixes:
In postgres95/src/backend/nodes/readfuncs, lines 1188 and 1189,
local_node->relname is taken to point to a NameType, while its
defined as a pointer to char. Both the casting to Name and the
call of namestrcpy should, IMHO, be changed appropriately (first
patch).
As far as I could see from the Linux signal header file,
a signal handler is declared as
typedef void (*__sighandler_t)(int);
Few changes to postgres95/src/backend/storage/lmgr/proc.c seem
appropriate to comply with this.
Finally, postgres95/src/bin/pg_version/pg_version.c defines
a function GetDataHome (by default, returning an integer)
and returns NULL in the function, which isn't an integer...
Submitted by: ernst.molitor@uni-bonn.de
---
src/backend/nodes/readfuncs.c | 6 +++---
src/backend/storage/lmgr/proc.c | 9 +++++----
src/bin/pg_version/pg_version.c | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index fc909fe7aa9..f0d9e3b1aff 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.1.1.1 1996/07/09 06:21:33 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.2 1996/07/31 02:18:48 scrappy Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1185,8 +1185,8 @@ _readRangeTblEntry()
token++;
token[length - 2] = '\0';
- local_node->relname = (Name) palloc(NAMEDATALEN);
- namestrcpy(local_node->relname, token);
+ local_node->relname = (char *) palloc(NAMEDATALEN);
+ strcpy(local_node->relname, token);
token[length - 2] = '\"';
}
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 74651996d9c..6f8ce2cc994 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
*/
#include <sys/time.h>
#ifndef WIN32
@@ -96,7 +96,7 @@ static void ProcKill(int exitStatus, int pid);
static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum);
static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum);
#if defined(PORTNAME_linux)
-extern int HandleDeadLock(int);
+extern void HandleDeadLock(int);
#else
extern int HandleDeadLock(void);
#endif
@@ -628,10 +628,11 @@ ProcAddLock(SHM_QUEUE *elem)
* up my semaphore.
* --------------------
*/
-int
#if defined(PORTNAME_linux)
+void
HandleDeadLock(int i)
#else
+int
HandleDeadLock()
#endif
{
diff --git a/src/bin/pg_version/pg_version.c b/src/bin/pg_version/pg_version.c
index 6844692be7e..4b9b7abc7a1 100644
--- a/src/bin/pg_version/pg_version.c
+++ b/src/bin/pg_version/pg_version.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.1.1.1 1996/07/09 06:22:14 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.2 1996/07/31 02:19:23 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,5 +31,5 @@ elog() {}
GetDataHome()
{
- return(NULL);
+ return(0);
}
--
GitLab