summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/tclMacOSXFCmd.c2
-rw-r--r--tests/winConsole.test7
-rw-r--r--unix/tclUnixChan.c2
-rw-r--r--unix/tclUnixFCmd.c12
-rw-r--r--unix/tclUnixFile.c4
-rw-r--r--unix/tclUnixInit.c2
-rw-r--r--win/tclWinChan.c2
-rw-r--r--win/tclWinConsole.c1
-rw-r--r--win/tclWinFCmd.c12
-rw-r--r--win/tclWinFile.c10
-rw-r--r--win/tclWinInit.c2
-rw-r--r--win/tclWinPipe.c2
12 files changed, 29 insertions, 29 deletions
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 332e0a4..e7effd0 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -642,7 +642,7 @@ SetOSTypeFromAny(
Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
Tcl_Size length;
- string = Tcl_GetStringFromObj(objPtr, &length);
+ string = TclGetStringFromObj(objPtr, &length);
Tcl_UtfToExternalDStringEx(NULL, encoding, string, length, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
if (Tcl_DStringLength(&ds) > 4) {
diff --git a/tests/winConsole.test b/tests/winConsole.test
index e87c870..1d4a4b5 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -10,9 +10,10 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require tcltest
-namespace import ::tcltest::test
-
+if {"::tcltest" ni [namespace children]} {
+ package require tcltest 2.5
+ namespace import -force ::tcltest::*
+}
catch {package require twapi} ;# Only to bring window to foreground. Not critical
::tcltest::ConstraintInitializer haveThread { expr {![catch {package require Thread}]} }
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 1436b5c..3e887d0 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -706,7 +706,7 @@ FileGetOptionProc(
* general probe.
*/
- dictContents = Tcl_GetStringFromObj(dictObj, &dictLength);
+ dictContents = TclGetStringFromObj(dictObj, &dictLength);
Tcl_DStringAppend(dsPtr, dictContents, dictLength);
Tcl_DecrRefCount(dictObj);
return TCL_OK;
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 48023b1..3eee59e 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1516,7 +1516,7 @@ SetGroupAttribute(
const char *string;
Tcl_Size length;
- string = Tcl_GetStringFromObj(attributePtr, &length);
+ string = TclGetStringFromObj(attributePtr, &length);
if (Tcl_UtfToExternalDStringEx(interp, NULL, string, length, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
@@ -1587,7 +1587,7 @@ SetOwnerAttribute(
const char *string;
Tcl_Size length;
- string = Tcl_GetStringFromObj(attributePtr, &length);
+ string = TclGetStringFromObj(attributePtr, &length);
if (Tcl_UtfToExternalDStringEx(interp, NULL, string, length, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
@@ -1966,7 +1966,7 @@ TclpObjNormalizePath(
const char *currentPathEndPosition;
char cur;
Tcl_Size pathLen;
- const char *path = Tcl_GetStringFromObj(pathPtr, &pathLen);
+ const char *path = TclGetStringFromObj(pathPtr, &pathLen);
Tcl_DString ds;
const char *nativePath;
#ifndef NO_REALPATH
@@ -2208,7 +2208,7 @@ TclUnixOpenTemporaryFile(
*/
if (dirObj) {
- string = Tcl_GetStringFromObj(dirObj, &length);
+ string = TclGetStringFromObj(dirObj, &length);
if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &templ, NULL) != TCL_OK) {
return -1;
}
@@ -2220,7 +2220,7 @@ TclUnixOpenTemporaryFile(
TclDStringAppendLiteral(&templ, "/");
if (basenameObj) {
- string = Tcl_GetStringFromObj(basenameObj, &length);
+ string = TclGetStringFromObj(basenameObj, &length);
if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &tmp, NULL) != TCL_OK) {
Tcl_DStringFree(&tmp);
return -1;
@@ -2235,7 +2235,7 @@ TclUnixOpenTemporaryFile(
#ifdef HAVE_MKSTEMPS
if (extensionObj) {
- string = Tcl_GetStringFromObj(extensionObj, &length);
+ string = TclGetStringFromObj(extensionObj, &length);
if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &tmp, NULL) != TCL_OK) {
Tcl_DStringFree(&templ);
return -1;
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 42be6bc..70924f8 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -989,7 +989,7 @@ TclpObjLink(
if (transPtr == NULL) {
return NULL;
}
- target = Tcl_GetStringFromObj(transPtr, &length);
+ target = TclGetStringFromObj(transPtr, &length);
if (Tcl_UtfToExternalDStringEx(NULL, NULL, target, length, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
return NULL;
@@ -1149,7 +1149,7 @@ TclNativeCreateNativeRep(
Tcl_IncrRefCount(validPathPtr);
}
- str = Tcl_GetStringFromObj(validPathPtr, &len);
+ str = TclGetStringFromObj(validPathPtr, &len);
if (Tcl_UtfToExternalDStringEx(NULL, NULL, str, len, 0, &ds, NULL) != TCL_OK) {
Tcl_DecrRefCount(validPathPtr);
Tcl_DStringFree(&ds);
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index c7bc463..eb8fa4c 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -551,7 +551,7 @@ TclpInitLibraryPath(
* TODO - why is the type size_t anyways?
*/
Tcl_Size length;
- str = Tcl_GetStringFromObj(pathPtr, &length);
+ str = TclGetStringFromObj(pathPtr, &length);
*lengthPtr = length;
*valuePtr = (char *)Tcl_Alloc(length + 1);
memcpy(*valuePtr, str, length + 1);
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 6413adb..afd5de1 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -961,7 +961,7 @@ FileGetOptionProc(
* general probe.
*/
- dictContents = Tcl_GetStringFromObj(dictObj, &dictLength);
+ dictContents = TclGetStringFromObj(dictObj, &dictLength);
Tcl_DStringAppend(dsPtr, dictContents, dictLength);
Tcl_DecrRefCount(dictObj);
return TCL_OK;
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 146f6b8..c77d97f 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -2008,7 +2008,6 @@ AllocateConsoleHandleInfo(
handleInfoPtr = (ConsoleHandleInfo *) Tcl_Alloc(sizeof(*handleInfoPtr));
memset(handleInfoPtr, 0, sizeof(*handleInfoPtr));
- memset(handleInfoPtr, 0, sizeof(*handleInfoPtr));
handleInfoPtr->console = consoleHandle;
InitializeSRWLock(&handleInfoPtr->lock);
InitializeConditionVariable(&handleInfoPtr->consoleThreadCV);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 7ce3b4c..e7164df 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1534,7 +1534,7 @@ GetWinFileAttributes(
*/
Tcl_Size len;
- const char *str = Tcl_GetStringFromObj(fileName, &len);
+ const char *str = TclGetStringFromObj(fileName, &len);
if (len < 4) {
if (len == 0) {
@@ -1622,7 +1622,7 @@ ConvertFileNameFormat(
Tcl_ListObjIndex(NULL, splitPath, i, &elt);
- pathv = Tcl_GetStringFromObj(elt, &length);
+ pathv = TclGetStringFromObj(elt, &length);
if ((pathv[0] == '/') || ((length == 3) && (pathv[1] == ':'))
|| (strcmp(pathv, ".") == 0) || (strcmp(pathv, "..") == 0)) {
/*
@@ -1658,7 +1658,7 @@ ConvertFileNameFormat(
* likely to lead to infinite loops.
*/
- tempString = Tcl_GetStringFromObj(tempPath, &length);
+ tempString = TclGetStringFromObj(tempPath, &length);
Tcl_DStringInit(&ds);
nativeName = Tcl_UtfToWCharDString(tempString, length, &ds);
Tcl_DecrRefCount(tempPath);
@@ -1989,12 +1989,12 @@ TclpCreateTemporaryDirectory(
*/
if (dirObj) {
- Tcl_GetString(dirObj);
+ TclGetString(dirObj);
if (dirObj->length < 1) {
goto useSystemTemp;
}
Tcl_DStringInit(&base);
- Tcl_UtfToWCharDString(Tcl_GetString(dirObj), TCL_INDEX_NONE, &base);
+ Tcl_UtfToWCharDString(TclGetString(dirObj), TCL_INDEX_NONE, &base);
if (dirObj->bytes[dirObj->length - 1] != '\\') {
Tcl_UtfToWCharDString("\\", TCL_INDEX_NONE, &base);
}
@@ -2012,7 +2012,7 @@ TclpCreateTemporaryDirectory(
#define SUFFIX_LENGTH 8
if (basenameObj) {
- Tcl_UtfToWCharDString(Tcl_GetString(basenameObj), TCL_INDEX_NONE, &base);
+ Tcl_UtfToWCharDString(TclGetString(basenameObj), TCL_INDEX_NONE, &base);
} else {
Tcl_UtfToWCharDString(DEFAULT_TEMP_DIR_PREFIX, TCL_INDEX_NONE, &base);
}
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index baf0734..fd28ca5 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -922,7 +922,7 @@ TclpMatchInDirectory(
DWORD attr;
WIN32_FILE_ATTRIBUTE_DATA data;
Tcl_Size len = 0;
- const char *str = Tcl_GetStringFromObj(norm, &len);
+ const char *str = TclGetStringFromObj(norm, &len);
native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
@@ -982,7 +982,7 @@ TclpMatchInDirectory(
*/
Tcl_DStringInit(&dsOrig);
- dirName = Tcl_GetStringFromObj(fileNamePtr, &dirLength);
+ dirName = TclGetStringFromObj(fileNamePtr, &dirLength);
Tcl_DStringAppend(&dsOrig, dirName, dirLength);
lastChar = dirName[dirLength -1];
@@ -2801,7 +2801,7 @@ TclpObjNormalizePath(
tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),
nextCheckpoint);
Tcl_AppendToObj(tmpPathPtr, lastValidPathEnd, TCL_INDEX_NONE);
- path = Tcl_GetStringFromObj(tmpPathPtr, &len);
+ path = TclGetStringFromObj(tmpPathPtr, &len);
Tcl_SetStringObj(pathPtr, path, len);
Tcl_DecrRefCount(tmpPathPtr);
} else {
@@ -2886,7 +2886,7 @@ TclWinVolumeRelativeNormalize(
*/
Tcl_Size cwdLen;
- const char *drive = Tcl_GetStringFromObj(useThisCwd, &cwdLen);
+ const char *drive = TclGetStringFromObj(useThisCwd, &cwdLen);
char drive_cur = path[0];
if (drive_cur >= 'a') {
@@ -3059,7 +3059,7 @@ TclNativeCreateNativeRep(
Tcl_IncrRefCount(validPathPtr);
}
- str = Tcl_GetStringFromObj(validPathPtr, &len);
+ str = TclGetStringFromObj(validPathPtr, &len);
if (strlen(str) != (size_t)len) {
/*
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index ca0c904..4ed5c6d 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -167,7 +167,7 @@ TclpInitLibraryPath(
TclGetProcessGlobalValue(&sourceLibraryDir));
*encodingPtr = NULL;
- bytes = Tcl_GetStringFromObj(pathPtr, &length);
+ bytes = TclGetStringFromObj(pathPtr, &length);
*lengthPtr = length++;
*valuePtr = (char *)Tcl_Alloc(length);
memcpy(*valuePtr, bytes, length);
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 1b2e946..67a96de 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -3222,7 +3222,7 @@ TclpOpenTemporaryFile(
}
namePtr += length * sizeof(WCHAR);
if (basenameObj) {
- const char *string = Tcl_GetStringFromObj(basenameObj, &length);
+ const char *string = TclGetStringFromObj(basenameObj, &length);
Tcl_DStringInit(&buf);
Tcl_UtfToWCharDString(string, length, &buf);
generated by cgit v0.12 at 2025-12-04 09:21:42 (GMT)