Cast parameters to ckfree to (char *) to suppress compiler warnings.

tglsfdc · tglsfdc · commit aca5b34427f2 · 2000-05-23T01:59:05.000Z
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
@@ -3,7 +3,7 @@
  *			  procedural language (PL)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.21 2000/04/16 04:19:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.22 2000/05/23 01:59:05 tgl Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1064,7 +1064,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
 
 	if (ret_numvals % 2 != 0)
 	{
-		ckfree(ret_values);
+		ckfree((char *) ret_values);
 		elog(ERROR, "pltcl: invalid return list from trigger - must have even # of elements");
 	}
 
@@ -1086,7 +1086,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
 	if (sigsetjmp(Warn_restart, 1) != 0)
 	{
 		memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
-		ckfree(ret_values);
+		ckfree((char *) ret_values);
 		pltcl_restart_in_progress = 1;
 		if (--pltcl_call_level == 0)
 			pltcl_restart_in_progress = 0;
@@ -1156,7 +1156,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
 	if (rettup == NULL)
 		elog(ERROR, "pltcl: SPI_modifytuple() failed - RC = %d\n", SPI_result);
 
-	ckfree(ret_values);
+	ckfree((char *) ret_values);
 	memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
 
 	return rettup;
@@ -1581,7 +1581,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
 		free(qdesc->argvalues);
 		free(qdesc->arglen);
 		free(qdesc);
-		ckfree(args);
+		ckfree((char *) args);
 		return TCL_ERROR;
 	}
 
@@ -1730,7 +1730,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
 	 ************************************************************/
 	if (callargs != NULL)
 	{
-		ckfree(callargs);
+		ckfree((char *) callargs);
 		callargs = NULL;
 	}
 
@@ -1843,7 +1843,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
 						  TCL_VOLATILE);
 			if (callargs != NULL)
 			{
-				ckfree(callargs);
+				ckfree((char *) callargs);
 				callargs = NULL;
 			}
 			return TCL_ERROR;
@@ -1867,7 +1867,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
 					qdesc->argvalues[j] = (Datum) NULL;
 				}
 			}
-			ckfree(callargs);
+			ckfree((char *) callargs);
 			callargs = NULL;
 			pltcl_restart_in_progress = 1;
 			Tcl_SetResult(interp, "Transaction abort", TCL_VOLATILE);
@@ -1890,7 +1890,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
 		 * Free the splitted argument value list
 		 ************************************************************/
 		memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
-		ckfree(callargs);
+		ckfree((char *) callargs);
 		callargs = NULL;
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language (PL)`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.21 2000/04/16 04:19:41 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.22 2000/05/23 01:59:05 tgl Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -1064,7 +1064,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)`
`1064`	`1064`
`1065`	`1065`	`if (ret_numvals % 2 != 0)`
`1066`	`1066`	`{`
`1067`		`- ckfree(ret_values);`
	`1067`	`+ ckfree((char *) ret_values);`
`1068`	`1068`	`elog(ERROR, "pltcl: invalid return list from trigger - must have even # of elements");`
`1069`	`1069`	`}`
`1070`	`1070`
`@@ -1086,7 +1086,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)`
`1086`	`1086`	`if (sigsetjmp(Warn_restart, 1) != 0)`
`1087`	`1087`	`{`
`1088`	`1088`	`memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));`
`1089`		`- ckfree(ret_values);`
	`1089`	`+ ckfree((char *) ret_values);`
`1090`	`1090`	`pltcl_restart_in_progress = 1;`
`1091`	`1091`	`if (--pltcl_call_level == 0)`
`1092`	`1092`	`pltcl_restart_in_progress = 0;`
`@@ -1156,7 +1156,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)`
`1156`	`1156`	`if (rettup == NULL)`
`1157`	`1157`	`elog(ERROR, "pltcl: SPI_modifytuple() failed - RC = %d\n", SPI_result);`
`1158`	`1158`
`1159`		`- ckfree(ret_values);`
	`1159`	`+ ckfree((char *) ret_values);`
`1160`	`1160`	`memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));`
`1161`	`1161`
`1162`	`1162`	`return rettup;`
`@@ -1581,7 +1581,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,`
`1581`	`1581`	`free(qdesc->argvalues);`
`1582`	`1582`	`free(qdesc->arglen);`
`1583`	`1583`	`free(qdesc);`
`1584`		`- ckfree(args);`
	`1584`	`+ ckfree((char *) args);`
`1585`	`1585`	`return TCL_ERROR;`
`1586`	`1586`	`}`
`1587`	`1587`
`@@ -1730,7 +1730,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,`
`1730`	`1730`	`************************************************************/`
`1731`	`1731`	`if (callargs != NULL)`
`1732`	`1732`	`{`
`1733`		`- ckfree(callargs);`
	`1733`	`+ ckfree((char *) callargs);`
`1734`	`1734`	`callargs = NULL;`
`1735`	`1735`	`}`
`1736`	`1736`
`@@ -1843,7 +1843,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,`
`1843`	`1843`	`TCL_VOLATILE);`
`1844`	`1844`	`if (callargs != NULL)`
`1845`	`1845`	`{`
`1846`		`- ckfree(callargs);`
	`1846`	`+ ckfree((char *) callargs);`
`1847`	`1847`	`callargs = NULL;`
`1848`	`1848`	`}`
`1849`	`1849`	`return TCL_ERROR;`
`@@ -1867,7 +1867,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,`
`1867`	`1867`	`qdesc->argvalues[j] = (Datum) NULL;`
`1868`	`1868`	`}`
`1869`	`1869`	`}`
`1870`		`- ckfree(callargs);`
	`1870`	`+ ckfree((char *) callargs);`
`1871`	`1871`	`callargs = NULL;`
`1872`	`1872`	`pltcl_restart_in_progress = 1;`
`1873`	`1873`	`Tcl_SetResult(interp, "Transaction abort", TCL_VOLATILE);`
`@@ -1890,7 +1890,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,`
`1890`	`1890`	`* Free the splitted argument value list`
`1891`	`1891`	`************************************************************/`
`1892`	`1892`	`memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));`
`1893`		`- ckfree(callargs);`
	`1893`	`+ ckfree((char *) callargs);`
`1894`	`1894`	`callargs = NULL;`
`1895`	`1895`	`}`
`1896`	`1896`	`else`