mirror of
				https://github.com/postgres/postgres.git
				synced 2025-10-30 00:04:49 -04:00 
			
		
		
		
	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
			
			
This commit is contained in:
		
							parent
							
								
									4477b6f6c2
								
							
						
					
					
						commit
						a05ed5bc11
					
				| @ -7,7 +7,7 @@ | |||||||
|  * |  * | ||||||
|  * |  * | ||||||
|  * IDENTIFICATION |  * 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 |  * NOTES | ||||||
|  *    Most of the read functions for plan nodes are tested. (In fact, they |  *    Most of the read functions for plan nodes are tested. (In fact, they | ||||||
| @ -1185,8 +1185,8 @@ _readRangeTblEntry() | |||||||
| 	token++; | 	token++; | ||||||
| 	token[length - 2] = '\0'; | 	token[length - 2] = '\0'; | ||||||
| 	 | 	 | ||||||
| 	local_node->relname = (Name) palloc(NAMEDATALEN); | 	local_node->relname = (char *) palloc(NAMEDATALEN); | ||||||
| 	namestrcpy(local_node->relname, token); | 	strcpy(local_node->relname, token); | ||||||
| 	token[length - 2] = '\"'; | 	token[length - 2] = '\"'; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ | |||||||
|  * |  * | ||||||
|  * |  * | ||||||
|  * IDENTIFICATION |  * 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 |  *      This is so that we can support more backends. (system-wide semaphore | ||||||
|  *      sets run out pretty fast.)                -ay 4/95 |  *      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> | #include <sys/time.h> | ||||||
| #ifndef WIN32 | #ifndef WIN32 | ||||||
| @ -96,7 +96,7 @@ static void ProcKill(int exitStatus, int pid); | |||||||
| static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum); | static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum); | ||||||
| static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum); | static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum); | ||||||
| #if defined(PORTNAME_linux) | #if defined(PORTNAME_linux) | ||||||
| extern int HandleDeadLock(int); | extern void HandleDeadLock(int); | ||||||
| #else | #else | ||||||
| extern int HandleDeadLock(void); | extern int HandleDeadLock(void); | ||||||
| #endif | #endif | ||||||
| @ -628,10 +628,11 @@ ProcAddLock(SHM_QUEUE *elem) | |||||||
|  * up my semaphore. |  * up my semaphore. | ||||||
|  * -------------------- |  * -------------------- | ||||||
|  */ |  */ | ||||||
| int |  | ||||||
| #if defined(PORTNAME_linux) | #if defined(PORTNAME_linux) | ||||||
|  | void  | ||||||
| HandleDeadLock(int i) | HandleDeadLock(int i) | ||||||
| #else | #else | ||||||
|  | int  | ||||||
| HandleDeadLock() | HandleDeadLock() | ||||||
| #endif | #endif | ||||||
| { | { | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ | |||||||
|  * |  * | ||||||
|  * |  * | ||||||
|  * IDENTIFICATION |  * 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() | GetDataHome() | ||||||
| { | { | ||||||
| 	return(NULL); | 	return(0); | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user