Cleanups.

bmomjian · bmomjian · commit 94cc3abe6040 · 1998-06-18T03:44:00.000Z
diff --git 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.88 1998/06/15 19:29:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.89 1998/06/18 03:43:59 momjian Exp $
  *
  * NOTES
  *
@@ -955,11 +955,10 @@ CleanupProc(int pid,
 	}
 
 	/*
-	 * ------------------------- If a backend dies in an ugly way (i.e.
+	 * If a backend dies in an ugly way (i.e.
 	 * exit status not 0) then we must signal all other backends to
 	 * quickdie.  If exit status is zero we assume everything is hunky
 	 * dory and simply remove the backend from the active backend list.
-	 * -------------------------
 	 */
 	if (!exitstatus)
 	{
@@ -1021,7 +1020,7 @@ CleanupProc(int pid,
 	}
 
 	/*
-	 * ------------- Quasi_exit means run all of the on_exitpg routines
+	 * Quasi_exit means run all of the on_exitpg routines
 	 * but don't acutally call exit().  The on_exit list of routines to do
 	 * is also truncated.
 	 *
@@ -1030,7 +1029,7 @@ CleanupProc(int pid,
 	 * requested and received a connection and I have forked off another
 	 * backend.  This prevents me from reinitializing shared stuff more
 	 * than once for the set of backends that caused the failure and were
-	 * killed off. ----------------
+	 * killed off.
 	 */
 	if (ActiveBackends == TRUE && Reinit)
 	{
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.22 1998/06/15 19:29:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.23 1998/06/18 03:44:00 momjian Exp $
  *
  * NOTES
  *
@@ -45,12 +45,14 @@
 #include <sys/ipc.h>
 #endif
 
+#ifdef NOT_USED
 #if defined(bsd44)
 int			UsePrivateMemory = 1;
 
 #else
 int			UsePrivateMemory = 0;
 
+#endif
 #endif
 
 static void IpcMemoryDetach(int status, char *shmaddr);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.88 1998/06/15 19:29:00 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.89 1998/06/18 03:43:59 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -955,11 +955,10 @@ CleanupProc(int pid,`
`955`	`955`	`}`
`956`	`956`
`957`	`957`	`/*`
`958`		`- * ------------------------- If a backend dies in an ugly way (i.e.`
	`958`	`+ * If a backend dies in an ugly way (i.e.`
`959`	`959`	`* exit status not 0) then we must signal all other backends to`
`960`	`960`	`* quickdie. If exit status is zero we assume everything is hunky`
`961`	`961`	`* dory and simply remove the backend from the active backend list.`
`962`		`- * -------------------------`
`963`	`962`	`*/`
`964`	`963`	`if (!exitstatus)`
`965`	`964`	`{`
`@@ -1021,7 +1020,7 @@ CleanupProc(int pid,`
`1021`	`1020`	`}`
`1022`	`1021`
`1023`	`1022`	`/*`
`1024`		`- * ------------- Quasi_exit means run all of the on_exitpg routines`
	`1023`	`+ * Quasi_exit means run all of the on_exitpg routines`
`1025`	`1024`	`* but don't acutally call exit(). The on_exit list of routines to do`
`1026`	`1025`	`* is also truncated.`
`1027`	`1026`	`*`
`@@ -1030,7 +1029,7 @@ CleanupProc(int pid,`
`1030`	`1029`	`* requested and received a connection and I have forked off another`
`1031`	`1030`	`* backend. This prevents me from reinitializing shared stuff more`
`1032`	`1031`	`* than once for the set of backends that caused the failure and were`
`1033`		`- * killed off. ----------------`
	`1032`	`+ * killed off.`
`1034`	`1033`	`*/`
`1035`	`1034`	`if (ActiveBackends == TRUE && Reinit)`
`1036`	`1035`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.22 1998/06/15 19:29:13 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.23 1998/06/18 03:44:00 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*`
`@@ -45,12 +45,14 @@`
`45`	`45`	`#include <sys/ipc.h>`
`46`	`46`	`#endif`
`47`	`47`
	`48`	`+#ifdef NOT_USED`
`48`	`49`	`#if defined(bsd44)`
`49`	`50`	`int UsePrivateMemory = 1;`
`50`	`51`
`51`	`52`	`#else`
`52`	`53`	`int UsePrivateMemory = 0;`
`53`	`54`
	`55`	`+#endif`
`54`	`56`	`#endif`
`55`	`57`
`56`	`58`	`static void IpcMemoryDetach(int status, char *shmaddr);`