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 | 7a36917c207b6d97549078ee9371451a4a5272cc (patch) | |
| tree | 117a5e40d6fef58ac55ee82abc16ea0d22eb8681 | |
| parent | f8300a811a0f98ac8b769a2904499455cbab41f9 (diff) | |
| parent | 0201d4b3ee5ec24ea7bb96ef5acb9d52fc65b9e7 (diff) | |
| download | tcl-7a36917c207b6d97549078ee9371451a4a5272cc.zip tcl-7a36917c207b6d97549078ee9371451a4a5272cc.tar.gz tcl-7a36917c207b6d97549078ee9371451a4a5272cc.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | generic/tclPkg.c | 5 | ||||
| -rw-r--r-- | unix/tclUnixFCmd.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 8 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 2 |
4 files changed, 6 insertions, 15 deletions
diff --git a/generic/tclPkg.c b/generic/tclPkg.c index ddb98fa..6a42a38 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -537,10 +537,7 @@ PkgRequireCoreStep1( Tcl_NRAddCallback(interp, PkgRequireCoreStep2, reqPtr, INT2PTR(reqc), (void *) reqv, NULL); - Tcl_NREvalObj(interp, - Tcl_NewStringObj(Tcl_DStringValue(&command), - Tcl_DStringLength(&command)), - TCL_EVAL_GLOBAL); + Tcl_NREvalObj(interp, Tcl_DStringToObj(&command), TCL_EVAL_GLOBAL); Tcl_DStringFree(&command); return TCL_OK; } 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); diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 5d45fe1..66fa206 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -926,7 +926,7 @@ TclpObjCopyDirectory( } else if (!strcmp(Tcl_DStringValue(&ds), TclGetString(normDestPtr))) { *errorPtr = destPathPtr; } else { - *errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_INDEX_NONE); + *errorPtr = Tcl_DStringToObj(&ds); } Tcl_DStringFree(&ds); Tcl_IncrRefCount(*errorPtr); |