Mop up from caddr_t -> Datum conversion to make things extra type safe

petere · petere · commit 65577dc83e2f · 2000-10-02T21:45:33.000Z
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.102 2000/10/02 19:42:46 petere Exp $
+ *	$Id: pqcomm.c,v 1.103 2000/10/02 21:45:31 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -152,7 +152,7 @@ static char sock_path[MAXPGPATH];
  * If a Unix socket is used for communication, explicitly close it.
  */
 static void
-StreamDoUnlink()
+StreamDoUnlink(void)
 {
 	Assert(sock_path[0]);
 	unlink(sock_path);
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.33 2000/10/02 19:42:48 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.34 2000/10/02 21:45:32 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ SISeg	   *shmInvalBuffer;
 
 static void SISegmentAttach(IpcMemoryId shmid);
 static void SISegInit(SISeg *segP, int maxBackends);
-static void CleanupInvalidationState(int status, SISeg *segP);
+static void CleanupInvalidationState(int status, Datum arg);
 static void SISetProcStateInvalid(SISeg *segP);
 
 /*
@@ -200,11 +200,14 @@ SIBackendInit(SISeg *segP)
  *
  * This function is called via on_shmem_exit() during backend shutdown,
  * so the caller has NOT acquired the lock for us.
+ *
+ * arg is really of type "SISeg*".
  */
 static void
-CleanupInvalidationState(int status,
-						 SISeg *segP)
+CleanupInvalidationState(int status, Datum arg)
 {
+	SISeg *segP = (void*) DatumGetPointer(arg);
+
 	Assert(PointerIsValid(segP));
 
 	SpinAcquire(SInvalLock);
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.80 2000/10/02 19:42:48 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.81 2000/10/02 21:45:32 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.80 2000/10/02 19:42:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.81 2000/10/02 21:45:32 petere Exp $
  */
 #include "postgres.h"
 
@@ -88,7 +88,7 @@ static PROC_HDR *ProcGlobal = NULL;
 
 PROC	   *MyProc = NULL;
 
-static void ProcKill(int exitStatus, int pid);
+static void ProcKill(int exitStatus, Datum pid);
 static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum);
 static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum);
 
@@ -396,7 +396,7 @@ ProcRemove(int pid)
  *		this process. Release any of its held spin locks.
  */
 static void
-ProcKill(int exitStatus, int pid)
+ProcKill(int exitStatus, Datum pid)
 {
 	PROC	   *proc;
 	SHMEM_OFFSET location;
@@ -416,7 +416,7 @@ ProcKill(int exitStatus, int pid)
 
 	proc = (PROC *) MAKE_PTR(location);
 
-	Assert(proc == MyProc || pid != MyProcPid);
+	Assert(proc == MyProc || (int)pid != MyProcPid);
 
 	MyProc = NULL;
 
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
@@ -11,15 +11,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.38 2000/10/02 19:42:52 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.39 2000/10/02 21:45:33 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "storage/smgr.h"
 
-static void smgrshutdown(int dummy);
+static void smgrshutdown(void);
 
 typedef struct f_smgr
 {
@@ -118,7 +118,7 @@ smgrinit()
 }
 
 static void
-smgrshutdown(int dummy)
+smgrshutdown(void)
 {
 	int			i;
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`30`	`30`	`* Portions Copyright (c) 1994, Regents of the University of California`
`31`	`31`	`*`
`32`		`- * $Id: pqcomm.c,v 1.102 2000/10/02 19:42:46 petere Exp $`
	`32`	`+ * $Id: pqcomm.c,v 1.103 2000/10/02 21:45:31 petere Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -152,7 +152,7 @@ static char sock_path[MAXPGPATH];`
`152`	`152`	`* If a Unix socket is used for communication, explicitly close it.`
`153`	`153`	`*/`
`154`	`154`	`static void`
`155`		`-StreamDoUnlink()`
	`155`	`+StreamDoUnlink(void)`
`156`	`156`	`{`
`157`	`157`	`Assert(sock_path[0]);`
`158`	`158`	`unlink(sock_path);`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.38 2000/10/02 19:42:52 petere Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.39 2000/10/02 21:45:33 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`18`	`18`	`#include "postgres.h"`
`19`	`19`
`20`	`20`	`#include "storage/smgr.h"`
`21`	`21`
`22`		`-static void smgrshutdown(int dummy);`
	`22`	`+static void smgrshutdown(void);`
`23`	`23`
`24`	`24`	`typedef struct f_smgr`
`25`	`25`	`{`
`@@ -118,7 +118,7 @@ smgrinit()`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`static void`
`121`		`-smgrshutdown(int dummy)`
	`121`	`+smgrshutdown(void)`
`122`	`122`	`{`
`123`	`123`	`int i;`
`124`	`124`