Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita05ed5b

Browse files
committed
Fixes:
In postgres95/src/backend/nodes/readfuncs, lines 1188 and 1189,local_node->relname is taken to point to a NameType, while itsdefined as a pointer to char. Both the casting to Name and thecall of namestrcpy should, IMHO, be changed appropriately (firstpatch).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 seemappropriate to comply with this.Finally, postgres95/src/bin/pg_version/pg_version.c definesa 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
1 parent4477b6f commita05ed5b

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

‎src/backend/nodes/readfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.1.1.1 1996/07/09 06:21:33 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.2 1996/07/31 02:18:48 scrappy Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1185,8 +1185,8 @@ _readRangeTblEntry()
11851185
token++;
11861186
token[length-2]='\0';
11871187

1188-
local_node->relname= (Name)palloc(NAMEDATALEN);
1189-
namestrcpy(local_node->relname,token);
1188+
local_node->relname= (char*)palloc(NAMEDATALEN);
1189+
strcpy(local_node->relname,token);
11901190
token[length-2]='\"';
11911191
}
11921192

‎src/backend/storage/lmgr/proc.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/2519:45:31 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,7 +46,7 @@
4646
* This is so that we can support more backends. (system-wide semaphore
4747
* sets run out pretty fast.) -ay 4/95
4848
*
49-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/2519:45:31 scrappy Exp $
49+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
5050
*/
5151
#include<sys/time.h>
5252
#ifndefWIN32
@@ -96,7 +96,7 @@ static void ProcKill(int exitStatus, int pid);
9696
staticvoidProcGetNewSemKeyAndNum(IPCKey*key,int*semNum);
9797
staticvoidProcFreeSem(IpcSemaphoreKeysemKey,intsemNum);
9898
#if defined(PORTNAME_linux)
99-
externintHandleDeadLock(int);
99+
externvoidHandleDeadLock(int);
100100
#else
101101
externintHandleDeadLock(void);
102102
#endif
@@ -628,10 +628,11 @@ ProcAddLock(SHM_QUEUE *elem)
628628
* up my semaphore.
629629
* --------------------
630630
*/
631-
int
632631
#if defined(PORTNAME_linux)
632+
void
633633
HandleDeadLock(inti)
634634
#else
635+
int
635636
HandleDeadLock()
636637
#endif
637638
{

‎src/bin/pg_version/pg_version.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.1.1.1 1996/07/09 06:22:14 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.2 1996/07/31 02:19:23 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -31,5 +31,5 @@ elog() {}
3131

3232
GetDataHome()
3333
{
34-
return(NULL);
34+
return(0);
3535
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp