1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More cleanups for compiler warnings.

Browse Source
This commit is contained in:
Bruce Momjian 1998-06-27 14:06:41 +00:00
parent 48a94aaf51
commit 7487a82667
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/postmaster/postmaster.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.91 1998/06/27 13:24:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.92 1998/06/27 14:06:40 momjian Exp $
* *
* NOTES * NOTES
* *
@ -1032,7 +1032,7 @@ CleanupProc(int pid,
if (DebugLvl) if (DebugLvl)
fprintf(stderr, "%s: CleanupProc: reinitializing shared memory and semaphores\n", fprintf(stderr, "%s: CleanupProc: reinitializing shared memory and semaphores\n",
progname); progname);
shmem_exit(); shmem_exit(0);
reset_shared(PostPortName); reset_shared(PostPortName);
} }
} }

8
src/backend/storage/ipc/shmem.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.23 1998/06/27 04:53:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.24 1998/06/27 14:06:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -490,12 +490,9 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
if (!BindingTable) if (!BindingTable)
{ {
/* Assert() is a macro now. substitutes inside quotes. */
#ifdef USE_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
char *strname = "BindingTable"; char *strname = "BindingTable";
#endif #endif
/* /*
* If the binding table doesnt exist, we fake it. * If the binding table doesnt exist, we fake it.
* *
@ -531,7 +528,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
if (!result) if (!result)
{ {
SpinRelease(BindingLock); SpinRelease(BindingLock);
elog(ERROR, "ShmemInitStruct: Binding Table corrupted"); elog(ERROR, "ShmemInitStruct: Binding Table corrupted");
@ -540,7 +536,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
} }
else if (*foundPtr) else if (*foundPtr)
{ {
/* /*
* Structure is in the binding table so someone else has allocated * Structure is in the binding table so someone else has allocated
* it already. The size better be the same as the size we are * it already. The size better be the same as the size we are
@ -558,7 +553,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
} }
else else
{ {
/* It isn't in the table yet. allocate and initialize it */ /* It isn't in the table yet. allocate and initialize it */
structPtr = ShmemAlloc((long) size); structPtr = ShmemAlloc((long) size);
if (!structPtr) if (!structPtr)