summaryrefslogtreecommitdiffstats
path: root/generic/tclPathObj.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2012-04-26 13:52:58 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2012-04-26 13:52:58 (GMT)
commit559b06ad27d1a68be117a331a2f62219b2daa6f5 (patch)
tree502e16aa19987a0abef1d255638a9d39a00bd4ab /generic/tclPathObj.c
parentbfcb55a861fe14618d3244a4da3617595e1e2444 (diff)
parent16b4e79286e53eb98ef501a25def03233fda42bc (diff)
downloadtcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.zip
tcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.tar.gz
tcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclPathObj.c')
-rw-r--r--generic/tclPathObj.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index ba07808..4f86755 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2373,7 +2373,6 @@ SetFsPathFromAny(
*/
if (name[0] == '~') {
- char *expandedUser;
Tcl_DString temp;
int split;
char separator = '/';
@@ -2442,8 +2441,7 @@ SetFsPathFromAny(
}
}
- expandedUser = Tcl_DStringValue(&temp);
- transPtr = Tcl_NewStringObj(expandedUser, Tcl_DStringLength(&temp));
+ transPtr = TclDStringToObj(&temp);
if (split != len) {
/*
@@ -2488,7 +2486,6 @@ SetFsPathFromAny(
transPtr = joined;
}
}
- Tcl_DStringFree(&temp);
} else {
transPtr = TclJoinPath(1, &pathPtr);
}