diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-24 20:34:04 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-24 20:34:04 (GMT) |
| commit | 8e98a96cb905e5eae722169271333e367ba0c9ab (patch) | |
| tree | a4a2677077b37b85d7a6f95e627e8ab238c35f4b | |
| parent | 278cf13c0f627be75677c47281e56bb020ebdf5b (diff) | |
| parent | e57511985899a4b10e86b28149306d5d6fd68dbf (diff) | |
| download | tcl-8e98a96cb905e5eae722169271333e367ba0c9ab.zip tcl-8e98a96cb905e5eae722169271333e367ba0c9ab.tar.gz tcl-8e98a96cb905e5eae722169271333e367ba0c9ab.tar.bz2 | |
merge core-8-branch
| -rw-r--r-- | generic/tclPkg.c | 5 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 8 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 50884a1..74f24bb 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/tclUnixFile.c b/unix/tclUnixFile.c index ef2d4b9..93f6aa8 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -154,9 +154,7 @@ TclpFindExecutable( #endif { Tcl_ExternalToUtfDStringEx(NULL, NULL, name, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL); - TclSetObjNameOfExecutable( - Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), NULL); - Tcl_DStringFree(&utfName); + TclSetObjNameOfExecutable(Tcl_DStringToObj(&utfName), NULL); goto done; } @@ -191,9 +189,7 @@ TclpFindExecutable( Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(&buffer), TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL); - 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 0af484d..5a83425 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); |