More janitorial work: remove the explicit casting of NULL literals to a

pointer type when it is not necessary to do so.

For future reference, casting NULL to a pointer type is only necessary
when (a) invoking a function AND either (b) the function has no prototype
OR (c) the function is a varargs function.

5 files changed, 13 insertions, 13 deletions

diff --git a/src/backend/port/dynloader/darwin.c b/src/backend/port/dynloader/darwin.c
index 57ca0f3f38c..72e9598dc1f 100644
--- a/src/backend/port/dynloader/darwin.c
+++ b/src/backend/port/dynloader/darwin.c
@@ -3,7 +3,7 @@
  * available with a PostgreSQL-compatible license.	Kudos Wilfredo
  * Sánchez <wsanchez@apple.com>.
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.c,v 1.9 2003/11/29 19:51:54 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.c,v 1.10 2004/01/07 18:56:27 neilc Exp $
  */
 #include "postgres.h"
 
@@ -50,7 +50,7 @@ pg_dlsym(void *handle, char *funcname)
 	else
 	{
 		free(symname);
-		return (PGFunction) NULL;
+		return NULL;
 	}
 }
 
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 39fb7b48b8a..64688c6e93d 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -52,7 +52,7 @@ BSD44_derived_dlerror(void)
 
 	strcpy(ret, error_message);
 	error_message[0] = 0;
-	return (ret[0] == 0) ? (char *) NULL : ret;
+	return (ret[0] == 0) ? NULL : ret;
 }
 
 void *
@@ -65,7 +65,7 @@ BSD44_derived_dlopen(const char *file, int num)
 #else
 	void	   *vp;
 
-	if ((vp = dlopen((char *) file, num)) == (void *) NULL)
+	if ((vp = dlopen((char *) file, num)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlopen '%s' failed. (%s)", file, dlerror());
 	return vp;
@@ -91,7 +91,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		name = buf;
 	}
 #endif
-	if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
+	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
 	return vp;
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 4b77049b3ba..81ae5607722 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -53,7 +53,7 @@ BSD44_derived_dlerror(void)
 
 	strcpy(ret, error_message);
 	error_message[0] = 0;
-	return (ret[0] == 0) ? (char *) NULL : ret;
+	return (ret[0] == 0) ? NULL : ret;
 }
 
 void *
@@ -66,7 +66,7 @@ BSD44_derived_dlopen(const char *file, int num)
 #else
 	void	   *vp;
 
-	if ((vp = dlopen((char *) file, num)) == (void *) NULL)
+	if ((vp = dlopen((char *) file, num)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlopen (%s) failed", file);
 	return vp;
@@ -91,7 +91,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		snprintf(buf, sizeof(buf), "_%s", name);
 		name = buf;
 	}
-	if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
+	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
 	return vp;
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index 4b77049b3ba..81ae5607722 100644
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -53,7 +53,7 @@ BSD44_derived_dlerror(void)
 
 	strcpy(ret, error_message);
 	error_message[0] = 0;
-	return (ret[0] == 0) ? (char *) NULL : ret;
+	return (ret[0] == 0) ? NULL : ret;
 }
 
 void *
@@ -66,7 +66,7 @@ BSD44_derived_dlopen(const char *file, int num)
 #else
 	void	   *vp;
 
-	if ((vp = dlopen((char *) file, num)) == (void *) NULL)
+	if ((vp = dlopen((char *) file, num)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlopen (%s) failed", file);
 	return vp;
@@ -91,7 +91,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		snprintf(buf, sizeof(buf), "_%s", name);
 		name = buf;
 	}
-	if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
+	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
 	return vp;
diff --git a/src/backend/port/dynloader/qnx4.c b/src/backend/port/dynloader/qnx4.c
index 6a6c7e868aa..c211ce68f43 100644
--- a/src/backend/port/dynloader/qnx4.c
+++ b/src/backend/port/dynloader/qnx4.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/dynloader/qnx4.c,v 1.5 2003/11/29 19:51:54 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/dynloader/qnx4.c,v 1.6 2004/01/07 18:56:27 neilc Exp $
  *
  *	NOTES
  *
@@ -28,7 +28,7 @@
 void *
 pg_dlopen(char *filename)
 {
-	return (void *) NULL;
+	return NULL;
 }
 
 PGFunction