diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-24 19:49:02 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-24 19:49:02 (GMT) |
| commit | 510fe4a4d867f2c51fc77c89eae87ed483029ee4 (patch) | |
| tree | 117a5e40d6fef58ac55ee82abc16ea0d22eb8681 /unix | |
| parent | 2070993dc10e4f641dbcb297e67af6e6b8e06b8a (diff) | |
| parent | bb257caab9c90f30684ef42f1cd1bea30f592afb (diff) | |
| download | tcl-510fe4a4d867f2c51fc77c89eae87ed483029ee4.zip tcl-510fe4a4d867f2c51fc77c89eae87ed483029ee4.tar.gz tcl-510fe4a4d867f2c51fc77c89eae87ed483029ee4.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixFCmd.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index cc8af05..da14f7e 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -778,8 +778,7 @@ TclpObjCopyDirectory( Tcl_DStringFree(&dstString); if (ret != TCL_OK) { - *errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_INDEX_NONE); - Tcl_DStringFree(&ds); + *errorPtr = Tcl_DStringToObj(&ds); Tcl_IncrRefCount(*errorPtr); } return ret; @@ -832,8 +831,7 @@ TclpObjRemoveDirectory( Tcl_DStringFree(&pathString); if (ret != TCL_OK) { - *errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_INDEX_NONE); - Tcl_DStringFree(&ds); + *errorPtr = Tcl_DStringToObj(&ds); Tcl_IncrRefCount(*errorPtr); } return ret; diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 078ed05..2ddcfce 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -154,9 +154,7 @@ TclpFindExecutable( #endif { Tcl_ExternalToUtfDString(NULL, name, TCL_INDEX_NONE, &utfName); - TclSetObjNameOfExecutable( - Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), NULL); - Tcl_DStringFree(&utfName); + TclSetObjNameOfExecutable(Tcl_DStringToObj(&utfName), NULL); goto done; } @@ -190,9 +188,7 @@ TclpFindExecutable( Tcl_DStringFree(&nameString); Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&buffer), TCL_INDEX_NONE, &utfName); - TclSetObjNameOfExecutable( - Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), NULL); - Tcl_DStringFree(&utfName); + TclSetObjNameOfExecutable(Tcl_DStringToObj(&utfName), NULL); done: Tcl_DStringFree(&buffer); |