diff options
| author | hobbs <hobbs> | 2003-07-16 21:25:07 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2003-07-16 21:25:07 (GMT) |
| commit | 8950d01535cc68e18a799015b5bd31af5c9562c3 (patch) | |
| tree | 7420a60f355dca8b31bfe9fec2dc4a6bb9cf47be /generic/tclPreserve.c | |
| parent | 807f03b48dcdb08f9acb0493b804a5b41d5bf7a0 (diff) | |
| download | tcl-8950d01535cc68e18a799015b5bd31af5c9562c3.zip tcl-8950d01535cc68e18a799015b5bd31af5c9562c3.tar.gz tcl-8950d01535cc68e18a799015b5bd31af5c9562c3.tar.bz2 | |
* generic/tclPreserve.c: In Result and Preserve'd routines, do not
* generic/tclUtil.c: assume that ckfree == free, as that is not
* generic/tclResult.c: always true. [Bug 756791] (fuller)
Diffstat (limited to 'generic/tclPreserve.c')
| -rw-r--r-- | generic/tclPreserve.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c index 50dfb02..04615b7 100644 --- a/generic/tclPreserve.c +++ b/generic/tclPreserve.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPreserve.c,v 1.3 1999/04/16 00:46:52 stanton Exp $ + * RCS: @(#) $Id: tclPreserve.c,v 1.3.34.1 2003/07/16 21:25:07 hobbs Exp $ */ #include "tclInt.h" @@ -233,8 +233,7 @@ Tcl_Release(clientData) refArray[i] = refArray[inUse]; } if (mustFree) { - if ((freeProc == TCL_DYNAMIC) || - (freeProc == (Tcl_FreeProc *) free)) { + if (freeProc == TCL_DYNAMIC) { ckfree((char *) clientData); } else { Tcl_MutexUnlock(&preserveMutex); @@ -306,8 +305,7 @@ Tcl_EventuallyFree(clientData, freeProc) * No reference for this block. Free it now. */ - if ((freeProc == TCL_DYNAMIC) - || (freeProc == (Tcl_FreeProc *) free)) { + if (freeProc == TCL_DYNAMIC) { ckfree((char *) clientData); } else { (*freeProc)((char *)clientData); |