提交 aca5b344 编写于 作者: T Tom Lane

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

上级 b1b90594
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* procedural language (PL) * procedural language (PL)
* *
* IDENTIFICATION * 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. * This software is copyrighted by Jan Wieck - Hamburg.
* *
...@@ -1064,7 +1064,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo) ...@@ -1064,7 +1064,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
if (ret_numvals % 2 != 0) 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"); elog(ERROR, "pltcl: invalid return list from trigger - must have even # of elements");
} }
...@@ -1086,7 +1086,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo) ...@@ -1086,7 +1086,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
if (sigsetjmp(Warn_restart, 1) != 0) if (sigsetjmp(Warn_restart, 1) != 0)
{ {
memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart)); memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
ckfree(ret_values); ckfree((char *) ret_values);
pltcl_restart_in_progress = 1; pltcl_restart_in_progress = 1;
if (--pltcl_call_level == 0) if (--pltcl_call_level == 0)
pltcl_restart_in_progress = 0; pltcl_restart_in_progress = 0;
...@@ -1156,7 +1156,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo) ...@@ -1156,7 +1156,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
if (rettup == NULL) if (rettup == NULL)
elog(ERROR, "pltcl: SPI_modifytuple() failed - RC = %d\n", SPI_result); 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)); memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
return rettup; return rettup;
...@@ -1581,7 +1581,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp, ...@@ -1581,7 +1581,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
free(qdesc->argvalues); free(qdesc->argvalues);
free(qdesc->arglen); free(qdesc->arglen);
free(qdesc); free(qdesc);
ckfree(args); ckfree((char *) args);
return TCL_ERROR; return TCL_ERROR;
} }
...@@ -1730,7 +1730,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, ...@@ -1730,7 +1730,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
************************************************************/ ************************************************************/
if (callargs != NULL) if (callargs != NULL)
{ {
ckfree(callargs); ckfree((char *) callargs);
callargs = NULL; callargs = NULL;
} }
...@@ -1843,7 +1843,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, ...@@ -1843,7 +1843,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
TCL_VOLATILE); TCL_VOLATILE);
if (callargs != NULL) if (callargs != NULL)
{ {
ckfree(callargs); ckfree((char *) callargs);
callargs = NULL; callargs = NULL;
} }
return TCL_ERROR; return TCL_ERROR;
...@@ -1867,7 +1867,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, ...@@ -1867,7 +1867,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
qdesc->argvalues[j] = (Datum) NULL; qdesc->argvalues[j] = (Datum) NULL;
} }
} }
ckfree(callargs); ckfree((char *) callargs);
callargs = NULL; callargs = NULL;
pltcl_restart_in_progress = 1; pltcl_restart_in_progress = 1;
Tcl_SetResult(interp, "Transaction abort", TCL_VOLATILE); Tcl_SetResult(interp, "Transaction abort", TCL_VOLATILE);
...@@ -1890,7 +1890,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, ...@@ -1890,7 +1890,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
* Free the splitted argument value list * Free the splitted argument value list
************************************************************/ ************************************************************/
memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart)); memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));
ckfree(callargs); ckfree((char *) callargs);
callargs = NULL; callargs = NULL;
} }
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册