git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c

index 333109cc95e0538bf344599bc412af4e4628fe0f..a57812e20a4606f8547613259d49d8c389ef34ad 100644 (file)

--- a/src/pl/tcl/pltcl.c

+++ b/src/pl/tcl/pltcl.c

* 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.

*

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");

}

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;

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;

free(qdesc->argvalues);

free(qdesc->arglen);

free(qdesc);

- ckfree(args);

+ ckfree((char *) args);

return TCL_ERROR;

}

************************************************************/

if (callargs != NULL)

{

- ckfree(callargs);

+ ckfree((char *) callargs);

callargs = NULL;

}

TCL_VOLATILE);

if (callargs != NULL)

{

- ckfree(callargs);

+ ckfree((char *) callargs);

callargs = NULL;

}

return TCL_ERROR;

qdesc->argvalues[j] = (Datum) NULL;

}

}

- ckfree(callargs);

+ ckfree((char *) callargs);

callargs = NULL;

pltcl_restart_in_progress = 1;

Tcl_SetResult(interp, "Transaction abort", TCL_VOLATILE);

* Free the splitted argument value list

************************************************************/

memcpy(&Warn_restart, &save_restart, sizeof(Warn_restart));

- ckfree(callargs);

+ ckfree((char *) callargs);

callargs = NULL;

}

else