summaryrefslogtreecommitdiffstats
path: root/generic/tclLoad.c
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2012-04-24 08:55:55 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2012-04-24 08:55:55 (GMT)
commited76f23a67ff725a3ef859435e72a1d809d53f8e (patch)
tree06aec4c10110301564a8a95d3a5080f61c8f5513 /generic/tclLoad.c
parent3ca91bcffca105a9023965df4a51a84ece77d737 (diff)
parentcc79d413c959197709155dc84b0680e37c20400e (diff)
downloadtcl-ed76f23a67ff725a3ef859435e72a1d809d53f8e.zip
tcl-ed76f23a67ff725a3ef859435e72a1d809d53f8e.tar.gz
tcl-ed76f23a67ff725a3ef859435e72a1d809d53f8e.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclLoad.c')
-rw-r--r--generic/tclLoad.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 202e66a..008a99d 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -873,40 +873,10 @@ Tcl_UnloadObjCmd(
done:
Tcl_DStringFree(&pkgName);
Tcl_DStringFree(&tmp);
- if (!complain && code!=TCL_OK) {
+ if (!complain && (code != TCL_OK)) {
code = TCL_OK;
Tcl_ResetResult(interp);
}
- if (code == TCL_OK) {
-#if 0
- /*
- * Result of [unload] was not documented in TIP#100, so force to be
- * the empty string by commenting this out. DKF.
- */
-
- Tcl_Obj *resultObjPtr, *objPtr[2];
-
- /*
- * Our result is the two reference counts.
- */
-
- TclNewIntObj(objPtr[0], trustedRefCount);
- TclNewIntObj(objPtr[1], safeRefCount);
- if (objPtr[0] == NULL || objPtr[1] == NULL) {
- if (objPtr[0]) {
- Tcl_DecrRefCount(objPtr[0]);
- }
- if (objPtr[1]) {
- Tcl_DecrRefCount(objPtr[1]);
- }
- } else {
- TclNewListObj(resultObjPtr, 2, objPtr);
- if (resultObjPtr != NULL) {
- Tcl_SetObjResult(interp, resultObjPtr);
- }
- }
-#endif
- }
return code;
}