Coerce type of NULL pointer return to suppress gcc compiler warnings.

Thomas G. Lockhart · Thomas G. Lockhart · commit 0e699286d339 · 1997-09-24T17:45:21.000Z
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.26 1997/09/18 20:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.27 1997/09/24 17:44:24 thomas Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -424,7 +424,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 		default:
 			elog(WARN, "heap_getsysattr: undefined attnum %d", attnum);
 	}
-	return (NULL);
+	return ((Datum) NULL);
 }
 
 /* ----------------
@@ -517,7 +517,7 @@ fastgetattr(HeapTuple tup,
 		{
 			if (isnull)
 				*isnull = true;
-			return NULL;
+			return (Datum) NULL;
 		}
 
 		/* ----------------
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -437,7 +437,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull)
 	*isnull = true;
 	SPI_result = 0;
 	if (tuple->t_natts < fnumber || fnumber <= 0)
-		return (NULL);
+		return ((Datum) NULL);
 
 	val = heap_getattr(tuple, InvalidBuffer, fnumber, tupdesc, isnull);
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.26 1997/09/18 20:19:36 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.27 1997/09/24 17:44:24 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -424,7 +424,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)`
`424`	`424`	`default:`
`425`	`425`	`elog(WARN, "heap_getsysattr: undefined attnum %d", attnum);`
`426`	`426`	`}`
`427`		`- return (NULL);`
	`427`	`+ return ((Datum) NULL);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`/* ----------------`
`@@ -517,7 +517,7 @@ fastgetattr(HeapTuple tup,`
`517`	`517`	`{`
`518`	`518`	`if (isnull)`
`519`	`519`	`*isnull = true;`
`520`		`- return NULL;`
	`520`	`+ return (Datum) NULL;`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`/* ----------------`