diff options
| author | hobbs <hobbs> | 2003-07-16 21:24:12 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2003-07-16 21:24:12 (GMT) |
| commit | de6aa74101b91995aba9134c5093a6899d4da019 (patch) | |
| tree | 560c3be33951c19b7e96c3a683df817cf5f3e0f3 /generic/tclPreserve.c | |
| parent | a947e7228276a5effd3f3f179cd252a4934426ac (diff) | |
| download | tcl-de6aa74101b91995aba9134c5093a6899d4da019.zip tcl-de6aa74101b91995aba9134c5093a6899d4da019.tar.gz tcl-de6aa74101b91995aba9134c5093a6899d4da019.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..150e384 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.4 2003/07/16 21:24:12 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); |