Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7487a82

Browse files
committed
More cleanups for compiler warnings.
1 parent 48a94aa commit 7487a82

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/backend/postmaster/postmaster.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.91 1998/06/27 13:24:19 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.92 1998/06/27 14:06:40 momjian Exp $
1414
*
1515
* NOTES
1616
*
@@ -1032,7 +1032,7 @@ CleanupProc(int pid,
10321032
if (DebugLvl)
10331033
fprintf(stderr, "%s: CleanupProc: reinitializing shared memory and semaphores\n",
10341034
progname);
1035-
shmem_exit();
1035+
shmem_exit(0);
10361036
reset_shared(PostPortName);
10371037
}
10381038
}

src/backend/storage/ipc/shmem.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.23 1998/06/27 04:53:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.24 1998/06/27 14:06:41 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -490,12 +490,9 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
490490

491491
if (!BindingTable)
492492
{
493-
/* Assert() is a macro now. substitutes inside quotes. */
494493
#ifdef USE_ASSERT_CHECKING
495494
char *strname = "BindingTable";
496-
497495
#endif
498-
499496
/*
500497
* If the binding table doesnt exist, we fake it.
501498
*
@@ -531,7 +528,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
531528

532529
if (!result)
533530
{
534-
535531
SpinRelease(BindingLock);
536532

537533
elog(ERROR, "ShmemInitStruct: Binding Table corrupted");
@@ -540,7 +536,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
540536
}
541537
else if (*foundPtr)
542538
{
543-
544539
/*
545540
* Structure is in the binding table so someone else has allocated
546541
* 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)
558553
}
559554
else
560555
{
561-
562556
/* It isn't in the table yet. allocate and initialize it */
563557
structPtr = ShmemAlloc((long) size);
564558
if (!structPtr)

0 commit comments

Comments
 (0)