summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-27 11:49:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-27 11:49:53 (GMT)
commite0df4408c7f0b18a5d18b0566523dfb3473084de (patch)
tree64f13983fd2942d65220c1f00f28d775db09bf92 /generic
parente1fdad425a08599ce5e492ae8087a8406c9ce268 (diff)
parent2524a62bb6b65a0b183dc413dd13ebbae997a537 (diff)
downloadtcl-e0df4408c7f0b18a5d18b0566523dfb3473084de.zip
tcl-e0df4408c7f0b18a5d18b0566523dfb3473084de.tar.gz
tcl-e0df4408c7f0b18a5d18b0566523dfb3473084de.tar.bz2
Merge 8.7
Diffstat (limited to 'generic')
-rw-r--r--generic/tclClock.c2
-rw-r--r--generic/tclCmdAH.c6
-rw-r--r--generic/tclCmdMZ.c4
-rw-r--r--generic/tclCompCmds.c6
-rw-r--r--generic/tclCompExpr.c2
-rw-r--r--generic/tclDate.c2
-rw-r--r--generic/tclDictObj.c4
-rw-r--r--generic/tclDisassemble.c2
-rw-r--r--generic/tclEncoding.c2
-rw-r--r--generic/tclEvent.c2
-rw-r--r--generic/tclExecute.c2
-rw-r--r--generic/tclFCmd.c2
-rw-r--r--generic/tclFileName.c6
-rw-r--r--generic/tclGetDate.y2
-rw-r--r--generic/tclIOCmd.c2
-rw-r--r--generic/tclIOUtil.c2
-rw-r--r--generic/tclInterp.c2
-rw-r--r--generic/tclOOBasic.c6
-rw-r--r--generic/tclOOMethod.c6
-rw-r--r--generic/tclPathObj.c4
-rw-r--r--generic/tclProc.c2
-rw-r--r--generic/tclStringObj.c14
-rw-r--r--generic/tclZipfs.c18
23 files changed, 50 insertions, 50 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c
index d1f08c1..dd3e1c9 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -1918,7 +1918,7 @@ ClockParseformatargsObjCmd(
if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
&optionIndex) != TCL_OK) {
Tcl_SetErrorCode(interp, "CLOCK", "badOption",
- Tcl_GetString(objv[i]), NULL);
+ TclGetString(objv[i]), NULL);
return TCL_ERROR;
}
switch (optionIndex) {
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 5c27bbc..2f50959 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -608,7 +608,7 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
switch (optIndex) {
case PROFILE:
if (TclEncodingProfileNameToId(interp,
- Tcl_GetString(objv[argIndex]),
+ TclGetString(objv[argIndex]),
&profile) != TCL_OK) {
return TCL_ERROR;
}
@@ -2054,7 +2054,7 @@ PathFilesystemCmd(
if (fsInfo == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("unrecognised path", -1));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
- Tcl_GetString(objv[1]), NULL);
+ TclGetString(objv[1]), NULL);
return TCL_ERROR;
}
Tcl_SetObjResult(interp, fsInfo);
@@ -2306,7 +2306,7 @@ FilesystemSeparatorCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unrecognised path", -1));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
- Tcl_GetString(objv[1]), NULL);
+ TclGetString(objv[1]), NULL);
return TCL_ERROR;
}
Tcl_SetObjResult(interp, separatorObj);
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 817416a..4a802c9 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -4793,7 +4793,7 @@ TclNRTryObjCmd(
if (TclListObjLengthM(NULL, objv[i+1], &dummy) != TCL_OK) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad prefix '%s': must be a list",
- Tcl_GetString(objv[i+1])));
+ TclGetString(objv[i+1])));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "TRAP",
"EXNFORMAT", NULL);
@@ -5333,7 +5333,7 @@ TclListLines(
Tcl_Obj *const *elems) /* The list elems as Tcl_Obj*, in need of
* derived continuation data */
{
- const char *listStr = Tcl_GetString(listObj);
+ const char *listStr = TclGetString(listObj);
const char *listHead = listStr;
int i, length = strlen(listStr);
const char *element = NULL, *next = NULL;
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index e5b20a9..dacb72a 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3187,7 +3187,7 @@ TclCompileFormatCmd(
* the format is broken). Do the format now.
*/
- tmpObj = Tcl_Format(interp, Tcl_GetString(formatObj),
+ tmpObj = Tcl_Format(interp, TclGetString(formatObj),
parsePtr->numWords-2, objv);
for (; --i>=0 ;) {
Tcl_DecrRefCount(objv[i]);
@@ -3231,7 +3231,7 @@ TclCompileFormatCmd(
* Now scan through and check for non-%s and non-%% substitutions.
*/
- for (bytes = Tcl_GetString(formatObj) ; *bytes ; bytes++) {
+ for (bytes = TclGetString(formatObj) ; *bytes ; bytes++) {
if (*bytes == '%') {
bytes++;
if (*bytes == 's') {
@@ -3264,7 +3264,7 @@ TclCompileFormatCmd(
i = 0; /* The count of things to concat. */
j = 2; /* The index into the argument tokens, for
* TIP#280 handling. */
- start = Tcl_GetString(formatObj);
+ start = TclGetString(formatObj);
/* The start of the currently-scanned literal
* in the format string. */
TclNewObj(tmpObj); /* The buffer used to accumulate the literal
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index ded32aa..8808024 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2565,7 +2565,7 @@ CompileExprTree(
Tcl_Obj *tableValue;
int numBytes;
const char *bytes
- = Tcl_GetStringFromObj(objPtr, &numBytes);
+ = TclGetStringFromObj(objPtr, &numBytes);
idx = TclRegisterLiteral(envPtr, bytes, numBytes, 0);
tableValue = TclFetchLiteral(envPtr, idx);
diff --git a/generic/tclDate.c b/generic/tclDate.c
index edf069a..97675fb 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -2760,7 +2760,7 @@ TclClockOldscanObjCmd(
return TCL_ERROR;
}
- yyInput = Tcl_GetString( objv[1] );
+ yyInput = TclGetString( objv[1] );
dateInfo.dateStart = yyInput;
yyHaveDate = 0;
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 55664ce..ab66186 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -635,7 +635,7 @@ SetDictFromAny(
* convert back.
*/
- (void) Tcl_GetString(objPtr);
+ (void) TclGetString(objPtr);
TclDecrRefCount(discardedValue);
}
@@ -3308,7 +3308,7 @@ DictUpdateCmd(
}
if (objPtr == NULL) {
/* ??? */
- Tcl_UnsetVar2(interp, Tcl_GetString(objv[i+1]), NULL, 0);
+ Tcl_UnsetVar2(interp, TclGetString(objv[i+1]), NULL, 0);
} else if (Tcl_ObjSetVar2(interp, objv[i+1], NULL, objPtr,
TCL_LEAVE_ERR_MSG) == NULL) {
TclDecrRefCount(dictPtr);
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 0bc3de1..10404e9 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -286,7 +286,7 @@ DisassembleByteCodeObj(
GetLocationInformation(codePtr->procPtr, &fileObj, &line);
if (line >= 0 && fileObj != NULL) {
Tcl_AppendPrintfToObj(bufferObj, "\n File \"%s\" Line %d",
- Tcl_GetString(fileObj), line);
+ TclGetString(fileObj), line);
}
Tcl_AppendPrintfToObj(bufferObj,
"\n Cmds %d, src %d, inst %d, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index b472db3..fc2835d 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4423,7 +4423,7 @@ InitializeEncodingSearchPath(
if (*encodingPtr) {
((Encoding *)(*encodingPtr))->refCount++;
}
- bytes = Tcl_GetStringFromObj(searchPathObj, &numBytes);
+ bytes = TclGetStringFromObj(searchPathObj, &numBytes);
*lengthPtr = numBytes;
*valuePtr = (char *)ckalloc(numBytes + 1);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 8729add..e28128f 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1522,7 +1522,7 @@ Tcl_VwaitObjCmd(
OPT_TIMEOUT, OPT_VARIABLE, OPT_WRITABLE, OPT_LAST
} index;
- if ((objc == 2) && (strcmp(Tcl_GetString(objv[1]), "--") != 0)) {
+ if ((objc == 2) && (strcmp(TclGetString(objv[1]), "--") != 0)) {
/*
* Legacy "vwait" syntax, skip option handling.
*/
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index e8aca32..4c6c088 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -3788,7 +3788,7 @@ TEBCresume(
arrayPtr = NULL;
part1Ptr = part2Ptr = NULL;
cleanup = 0;
- TRACE(("%u %s => ", opnd, Tcl_GetString(incrPtr)));
+ TRACE(("%u %s => ", opnd, TclGetString(incrPtr)));
doIncrVar:
if (TclIsVarDirectModifyable2(varPtr, arrayPtr)) {
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index ea8f715..bfc3f43 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1679,7 +1679,7 @@ TclFileHomeCmd(
Tcl_WrongNumArgs(interp, 1, objv, "?user?");
return TCL_ERROR;
}
- homeDirObj = TclGetHomeDirObj(interp, objc == 1 ? NULL : Tcl_GetString(objv[1]));
+ homeDirObj = TclGetHomeDirObj(interp, objc == 1 ? NULL : TclGetString(objv[1]));
if (homeDirObj == NULL) {
return TCL_ERROR;
}
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 3ca1ab5..7b3b03f 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -502,11 +502,11 @@ TclpNativeSplitPath(
switch (tclPlatform) {
case TCL_PLATFORM_UNIX:
- resultPtr = SplitUnixPath(Tcl_GetString(pathPtr));
+ resultPtr = SplitUnixPath(TclGetString(pathPtr));
break;
case TCL_PLATFORM_WINDOWS:
- resultPtr = SplitWinPath(Tcl_GetString(pathPtr));
+ resultPtr = SplitWinPath(TclGetString(pathPtr));
break;
}
@@ -919,7 +919,7 @@ TclpNativeJoinPath(
*/
Tcl_SetObjLength(prefix, length + (int) strlen(p));
- dest = Tcl_GetString(prefix) + length;
+ dest = TclGetString(prefix) + length;
for (; *p != '\0'; p++) {
if ((*p == '/') || (*p == '\\')) {
while ((p[1] == '/') || (p[1] == '\\')) {
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
index e85184b..08c0193 100644
--- a/generic/tclGetDate.y
+++ b/generic/tclGetDate.y
@@ -976,7 +976,7 @@ TclClockOldscanObjCmd(
return TCL_ERROR;
}
- yyInput = Tcl_GetString( objv[1] );
+ yyInput = TclGetString( objv[1] );
dateInfo.dateStart = yyInput;
yyHaveDate = 0;
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e8a534f..40f0090 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1485,7 +1485,7 @@ Tcl_SocketObjCmd(
TclInitSockets();
for (a = 1; a < objc; a++) {
- const char *arg = Tcl_GetString(objv[a]);
+ const char *arg = TclGetString(objv[a]);
if (arg[0] != '-') {
break;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index d1589c1..9a3ddfb 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1338,7 +1338,7 @@ TclFSNormalizeToUniquePath(
* We check these first to avoid useless calls to the native filesystem's
* normalizePathProc.
*/
- path = Tcl_GetStringFromObj(pathPtr, &i);
+ path = TclGetStringFromObj(pathPtr, &i);
if ( (i >= 3) && ( (path[0] == '/' && path[1] == '/')
|| (path[0] == '\\' && path[1] == '\\') ) ) {
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 70cf8fa..e743931 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -1111,7 +1111,7 @@ NRInterpCmd(
if (hPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"alias \"%s\" in path \"%s\" not found",
- aliasName, Tcl_GetString(objv[2])));
+ aliasName, TclGetString(objv[2])));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName,
NULL);
return TCL_ERROR;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 3593193..9b72060 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -208,7 +208,7 @@ TclOO_Class_Create(
"objectName ?arg ...?");
return TCL_ERROR;
}
- objName = Tcl_GetStringFromObj(
+ objName = TclGetStringFromObj(
objv[Tcl_ObjectContextSkippedArgs(context)], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -273,7 +273,7 @@ TclOO_Class_CreateNs(
"objectName namespaceName ?arg ...?");
return TCL_ERROR;
}
- objName = Tcl_GetStringFromObj(
+ objName = TclGetStringFromObj(
objv[Tcl_ObjectContextSkippedArgs(context)], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -281,7 +281,7 @@ TclOO_Class_CreateNs(
Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
return TCL_ERROR;
}
- nsName = Tcl_GetStringFromObj(
+ nsName = TclGetStringFromObj(
objv[Tcl_ObjectContextSkippedArgs(context)+1], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 73368e4..a613fb4 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -1286,7 +1286,7 @@ MethodErrorHandler(
kindName = "class";
}
- objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+ objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
&objectNameLen);
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (%s \"%.*s%s\" method \"%.*s%s\" line %d)",
@@ -1317,7 +1317,7 @@ ConstructorErrorHandler(
kindName = "class";
}
- objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+ objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
&objectNameLen);
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (%s \"%.*s%s\" constructor line %d)", kindName,
@@ -1347,7 +1347,7 @@ DestructorErrorHandler(
kindName = "class";
}
- objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+ objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
&objectNameLen);
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (%s \"%.*s%s\" destructor line %d)", kindName,
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 02afb55..e67ae64 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2350,7 +2350,7 @@ SetFsPathFromAny(
fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath));
if (transPtr == pathPtr) {
- TclGetString(pathPtr);
+ (void)TclGetString(pathPtr);
TclFreeInternalRep(pathPtr);
transPtr = Tcl_DuplicateObj(pathPtr);
fsPathPtr->filesystemEpoch = 0;
@@ -2691,7 +2691,7 @@ TclResolveTildePath(
int split;
Tcl_DString resolvedPath;
- path = Tcl_GetStringFromObj(pathObj, &len);
+ path = TclGetStringFromObj(pathObj, &len);
if (path[0] != '~') {
return pathObj;
}
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 3ada9ea..d02cac2 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -538,7 +538,7 @@ TclCreateProc(
goto procError;
}
- argname = Tcl_GetStringFromObj(fieldValues[0], &nameLength);
+ argname = TclGetStringFromObj(fieldValues[0], &nameLength);
/*
* Check that the formal parameter name is a scalar.
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 708c157..e1f5160 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3368,7 +3368,7 @@ TclStringRepeat(
TclGetUnicodeFromObj_(objPtr, &length);
} else {
/* Result will be concat of string reps. Pre-size it. */
- Tcl_GetStringFromObj(objPtr, &length);
+ TclGetStringFromObj(objPtr, &length);
}
if (length == 0) {
@@ -3618,7 +3618,7 @@ TclStringCat(
/* No string rep; Take the chance we can avoid making it */
pendingPtr = objPtr;
} else {
- Tcl_GetStringFromObj(objPtr, &length); /* PANIC? */
+ TclGetStringFromObj(objPtr, &length); /* PANIC? */
}
} while (--oc && (length == 0) && (pendingPtr == NULL));
@@ -3644,14 +3644,14 @@ TclStringCat(
do {
Tcl_Obj *objPtr = *ov++;
- Tcl_GetStringFromObj(objPtr, &numBytes); /* PANIC? */
+ TclGetStringFromObj(objPtr, &numBytes); /* PANIC? */
} while (--oc && numBytes == 0 && pendingPtr->bytes == NULL);
if (numBytes) {
last = objc -oc -1;
}
if (oc || numBytes) {
- Tcl_GetStringFromObj(pendingPtr, &length);
+ TclGetStringFromObj(pendingPtr, &length);
}
if (length == 0) {
if (numBytes) {
@@ -3670,7 +3670,7 @@ TclStringCat(
/* assert ( length > 0 && pendingPtr == NULL ) */
- Tcl_GetStringFromObj(objPtr, &numBytes); /* PANIC? */
+ TclGetStringFromObj(objPtr, &numBytes); /* PANIC? */
if (numBytes) {
last = objc - oc;
if (numBytes > INT_MAX - length) {
@@ -3785,7 +3785,7 @@ TclStringCat(
objResultPtr = *objv++; objc--;
- Tcl_GetStringFromObj(objResultPtr, &start);
+ TclGetStringFromObj(objResultPtr, &start);
if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3818,7 +3818,7 @@ TclStringCat(
if ((objPtr->bytes == NULL) || (objPtr->length)) {
int more;
- char *src = Tcl_GetStringFromObj(objPtr, &more);
+ char *src = TclGetStringFromObj(objPtr, &more);
memcpy(dst, src, more);
dst += more;
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 1b602ea..d834847 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -2415,7 +2415,7 @@ ZipFSMkKeyObjCmd(
Tcl_WrongNumArgs(interp, 1, objv, "password");
return TCL_ERROR;
}
- pw = Tcl_GetStringFromObj(objv[1], &len);
+ pw = TclGetStringFromObj(objv[1], &len);
if (len == 0) {
return TCL_OK;
}
@@ -2942,7 +2942,7 @@ ComputeNameInArchive(
if (directNameObj) {
name = Tcl_GetString(directNameObj);
} else {
- name = Tcl_GetStringFromObj(pathObj, &len);
+ name = TclGetStringFromObj(pathObj, &len);
if (slen > 0) {
if ((len <= slen) || (strncmp(strip, name, slen) != 0)) {
/*
@@ -3028,7 +3028,7 @@ ZipFSMkZipOrImg(
passBuf[0] = 0;
if (passwordObj != NULL) {
- pw = Tcl_GetStringFromObj(passwordObj, &pwlen);
+ pw = TclGetStringFromObj(passwordObj, &pwlen);
if (IsPasswordValid(interp, pw, pwlen) != TCL_OK) {
return TCL_ERROR;
}
@@ -3188,7 +3188,7 @@ ZipFSMkZipOrImg(
Tcl_InitHashTable(&fileHash, TCL_STRING_KEYS);
if (mappingList == NULL && stripPrefix != NULL) {
- strip = Tcl_GetStringFromObj(stripPrefix, &slen);
+ strip = TclGetStringFromObj(stripPrefix, &slen);
if (!slen) {
strip = NULL;
}
@@ -5045,13 +5045,13 @@ ZipFSMatchInDirectoryProc(
* The prefix that gets prepended to results.
*/
- prefix = Tcl_GetStringFromObj(pathPtr, &prefixLen);
+ prefix = TclGetStringFromObj(pathPtr, &prefixLen);
/*
* The (normalized) path we're searching.
*/
- path = Tcl_GetStringFromObj(normPathPtr, &len);
+ path = TclGetStringFromObj(normPathPtr, &len);
Tcl_DStringInit(&dsPref);
if (strcmp(prefix, path) == 0) {
@@ -5166,7 +5166,7 @@ ZipFSMatchMountPoints(
Tcl_HashEntry *hPtr;
Tcl_HashSearch search;
int l, normLength;
- const char *path = Tcl_GetStringFromObj(normPathPtr, &normLength);
+ const char *path = TclGetStringFromObj(normPathPtr, &normLength);
size_t len = (size_t) normLength;
if (len < 1) {
@@ -5253,7 +5253,7 @@ ZipFSPathInFilesystemProc(
if (!pathPtr) {
return -1;
}
- path = Tcl_GetStringFromObj(pathPtr, &len);
+ path = TclGetStringFromObj(pathPtr, &len);
if (strncmp(path, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN) != 0) {
return -1;
}
@@ -5401,7 +5401,7 @@ ZipFSFileAttrsGetProc(
if (!pathPtr) {
return -1;
}
- path = Tcl_GetStringFromObj(pathPtr, &len);
+ path = TclGetStringFromObj(pathPtr, &len);
ReadLock();
z = ZipFSLookup(path);
if (!z) {