diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-07-18 12:22:17 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-07-18 12:22:17 (GMT) |
| commit | 7f40dea1efc31fc14c832405c46361bc49a52ea7 (patch) | |
| tree | 4c6ec4a0b70f45eb7ced1f0ab91ac0d7940f53e9 /generic/tclPathObj.c | |
| parent | 4e7d04385e3894b881f8be44e2c25dc2931ac896 (diff) | |
| parent | 1bd8f407a5fc44a8b7a54bb78d8d29a2e5b0358f (diff) | |
| download | tcl-dkf_http_cookies.zip tcl-dkf_http_cookies.tar.gz tcl-dkf_http_cookies.tar.bz2 | |
merge trunkdkf_http_cookies
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index fe6063f..99d576d 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -2437,19 +2437,13 @@ SetFsPathFromAny( } TclDecrRefCount(parts); } else { - /* - * Simple case. "rest" is relative path. Just join it. The - * "rest" object will be freed when Tcl_FSJoinToPath returns - * (unless something else claims a refCount on it). - */ - - Tcl_Obj *joined; - Tcl_Obj *rest = Tcl_NewStringObj(name+split+1, -1); + Tcl_Obj *pair[2]; - Tcl_IncrRefCount(transPtr); - joined = Tcl_FSJoinToPath(transPtr, 1, &rest); - TclDecrRefCount(transPtr); - transPtr = joined; + pair[0] = transPtr; + pair[1] = Tcl_NewStringObj(name+split+1, -1); + transPtr = TclJoinPath(2, pair); + Tcl_DecrRefCount(pair[0]); + Tcl_DecrRefCount(pair[1]); } } } else { |