summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-06-27 14:06:41 +0000
committerBruce Momjian1998-06-27 14:06:41 +0000
commit7487a82667cc1b0f17eae93dcca806d0772e9b7a (patch)
tree64c15777b96a037eec03e1da09818387d9e8b209
parent48a94aaf511b3a9e67774e916654a3cd28fc8fd3 (diff)
More cleanups for compiler warnings.
-rw-r--r--src/backend/postmaster/postmaster.c4
-rw-r--r--src/backend/storage/ipc/shmem.c8
2 files changed, 3 insertions, 9 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 28793522c08..60d998814d1 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* 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
*
@@ -1032,7 +1032,7 @@ CleanupProc(int pid,
if (DebugLvl)
fprintf(stderr, "%s: CleanupProc: reinitializing shared memory and semaphores\n",
progname);
- shmem_exit();
+ shmem_exit(0);
reset_shared(PostPortName);
}
}
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 6bf0a500a31..48b563986ed 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* 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)
{
- /* Assert() is a macro now. substitutes inside quotes. */
#ifdef USE_ASSERT_CHECKING
char *strname = "BindingTable";
-
#endif
-
/*
* If the binding table doesnt exist, we fake it.
*
@@ -531,7 +528,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
if (!result)
{
-
SpinRelease(BindingLock);
elog(ERROR, "ShmemInitStruct: Binding Table corrupted");
@@ -540,7 +536,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
}
else if (*foundPtr)
{
-
/*
* Structure is in the binding table so someone else has allocated
* 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
{
-
/* It isn't in the table yet. allocate and initialize it */
structPtr = ShmemAlloc((long) size);
if (!structPtr)