summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-04-25 17:51:14 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-04-25 17:51:14 (GMT)
commitdb89fa13d55a8702757ce698cd695db454d4690b (patch)
tree34e6cabc16d61e279baf7e0d225ac6dffec43f68
parent1813dc0e9670d8bad351ee0b755c36ced3ca02b4 (diff)
downloadtcl-db89fa13d55a8702757ce698cd695db454d4690b.zip
tcl-db89fa13d55a8702757ce698cd695db454d4690b.tar.gz
tcl-db89fa13d55a8702757ce698cd695db454d4690b.tar.bz2
TclFreeIntRep() related cleanup.
-rw-r--r--generic/tclPathObj.c4
-rw-r--r--generic/tclProc.c5
-rw-r--r--generic/tclTestObj.c3
3 files changed, 3 insertions, 9 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 01a297b..d9e3973 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1156,7 +1156,6 @@ Tcl_FSConvertToPathType(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
}
return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType);
@@ -1175,7 +1174,6 @@ Tcl_FSConvertToPathType(
* UpdateStringOfFsPath(pathPtr);
* }
* FreeFsPathInternalRep(pathPtr);
- * pathPtr->typePtr = NULL;
* return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType);
* }
* }
@@ -1903,7 +1901,6 @@ Tcl_FSGetNormalizedPath(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
if (Tcl_ConvertToType(interp, pathPtr, &tclFsPathType) != TCL_OK) {
return NULL;
}
@@ -2214,7 +2211,6 @@ TclFSEnsureEpochOk(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
if (SetFsPathFromAny(NULL, pathPtr) != TCL_OK) {
return TCL_ERROR;
}
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 1260f4f..a2de765 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2006,8 +2006,7 @@ TclProcCompileProc(
codePtr->compileEpoch = iPtr->compileEpoch;
codePtr->nsPtr = nsPtr;
} else {
- bodyPtr->typePtr->freeIntRepProc(bodyPtr);
- bodyPtr->typePtr = NULL;
+ TclFreeIntRep(bodyPtr);
}
}
@@ -2635,7 +2634,7 @@ SetLambdaFromAny(
* conversion to lambdaType.
*/
- objPtr->typePtr->freeIntRepProc(objPtr);
+ TclFreeIntRep(objPtr);
objPtr->internalRep.twoPtrValue.ptr1 = procPtr;
objPtr->internalRep.twoPtrValue.ptr2 = nsObjPtr;
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 1ef1dc3..92c278f 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -562,8 +562,7 @@ TestindexobjCmd(
&& !strcmp("index", objv[3]->typePtr->name)) {
indexRep = objv[3]->internalRep.otherValuePtr;
if (indexRep->tablePtr == (void *) argv) {
- objv[3]->typePtr->freeIntRepProc(objv[3]);
- objv[3]->typePtr = NULL;
+ TclFreeIntRep(objv[3]);
}
}