summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/FileSystem.38
-rw-r--r--doc/source.n2
-rw-r--r--generic/tcl.decls2
-rw-r--r--generic/tclBinary.c18
-rw-r--r--generic/tclClock.c10
-rw-r--r--generic/tclClockFmt.c2
-rw-r--r--generic/tclCmdAH.c2
-rw-r--r--generic/tclCmdMZ.c6
-rw-r--r--generic/tclDecls.h4
-rw-r--r--generic/tclEncoding.c24
-rw-r--r--generic/tclFileName.c50
-rw-r--r--generic/tclIORTrans.c2
-rw-r--r--generic/tclIOUtil.c50
-rw-r--r--generic/tclInt.decls4
-rw-r--r--generic/tclInt.h2
-rw-r--r--generic/tclIntDecls.h8
-rw-r--r--generic/tclInterp.c60
-rw-r--r--generic/tclLink.c2
-rw-r--r--generic/tclLoad.c40
-rw-r--r--generic/tclMain.c8
-rw-r--r--generic/tclPathObj.c16
-rw-r--r--generic/tclPkg.c44
-rw-r--r--generic/tclProc.c38
-rw-r--r--generic/tclResult.c16
-rw-r--r--generic/tclScan.c28
-rw-r--r--generic/tclStrIdxTree.c2
-rw-r--r--generic/tclStringObj.c34
-rw-r--r--generic/tclStubInit.c2
-rw-r--r--generic/tclTimer.c6
-rw-r--r--generic/tclTrace.c36
-rw-r--r--generic/tclUtil.c16
-rw-r--r--generic/tclVar.c66
32 files changed, 304 insertions, 304 deletions
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index cc19ea8..f36a574 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -54,7 +54,7 @@ Tcl_Obj *
\fBTcl_FSListVolumes\fR(\fIvoid\fR)
.sp
int
-\fBTcl_FSEvalFileEx\fR(\fIinterp, pathPtr, encodingName\fR)
+\fBTcl_FSEvalFileEx\fR(\fIinterp, pathPtr, encoding\fR)
.sp
int
\fBTcl_FSEvalFile\fR(\fIinterp, pathPtr\fR)
@@ -199,7 +199,7 @@ As for \fIpathPtr\fR, but used for the destination filename for a copy or
rename operation.
.AP int recursive in
Whether to remove subdirectories and their contents as well.
-.AP "const char" *encodingName in
+.AP "const char" *encoding in
The encoding of the data stored in the
file identified by \fIpathPtr\fR and to be evaluated.
.AP "const char" *pattern in
@@ -417,10 +417,10 @@ accumulates the return values in a list which is returned to the
caller (with a reference count of 0).
.PP
\fBTcl_FSEvalFileEx\fR reads the file given by \fIpathPtr\fR using
-the encoding identified by \fIencodingName\fR and evaluates
+the encoding identified by \fIencoding\fR and evaluates
its contents as a Tcl script. It returns the same information as
\fBTcl_EvalObjEx\fR.
-If \fIencodingName\fR is NULL, the utf-8 encoding is used for
+If \fIencoding\fR is NULL, the utf-8 encoding is used for
reading the file contents.
If the file could not be read then a Tcl error is returned to describe
why the file could not be read.
diff --git a/doc/source.n b/doc/source.n
index cee1312..0364c41 100644
--- a/doc/source.n
+++ b/doc/source.n
@@ -15,7 +15,7 @@ source \- Evaluate a file or resource as a Tcl script
.SH SYNOPSIS
\fBsource \fIfileName\fR
.sp
-\fBsource\fR \fB\-encoding \fIencodingName fileName\fR
+\fBsource\fR \fB\-encoding \fIencoding fileName\fR
.BE
.SH DESCRIPTION
.PP
diff --git a/generic/tcl.decls b/generic/tcl.decls
index f3e2dca..b594cf1 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1867,7 +1867,7 @@ declare 517 {
# TIP#137 (encoding-aware source command) dgp for Anton Kovalenko
declare 518 {
int Tcl_FSEvalFileEx(Tcl_Interp *interp, Tcl_Obj *fileName,
- const char *encodingName)
+ const char *encoding)
}
# TIP#121 (exit handler) dkf for Joe Mistachkin
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 570f4d5..b5f63c5 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -435,13 +435,13 @@ Tcl_GetBytesFromObj(
irPtr = TclFetchInternalRep(objPtr, &tclByteArrayType);
baPtr = GET_BYTEARRAY(irPtr);
- nonbyte = TclUtfAtIndex(Tcl_GetString(objPtr), baPtr->bad);
+ nonbyte = TclUtfAtIndex(TclGetString(objPtr), baPtr->bad);
TclUtfToUniChar(nonbyte, &ucs4);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected byte sequence but character %d "
"was '%1s' (U+%06X)", baPtr->bad, nonbyte, ucs4));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", (char *)NULL);
}
return NULL;
}
@@ -2660,7 +2660,7 @@ BinaryDecodeHex(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid hexadecimal digit \"%c\" (U+%06X) at position %d",
ucs4, ucs4, (int) (data - datastart - 1)));
- Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
return TCL_ERROR;
}
@@ -2729,7 +2729,7 @@ BinaryEncode64(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
- "LINE_LENGTH", (void *)NULL);
+ "LINE_LENGTH", (char *)NULL);
return TCL_ERROR;
}
break;
@@ -2854,7 +2854,7 @@ BinaryEncodeUu(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
- "LINE_LENGTH", (void *)NULL);
+ "LINE_LENGTH", (char *)NULL);
return TCL_ERROR;
}
lineLength = ((lineLength - 1) & -4) + 1; /* 5, 9, 13 ... */
@@ -2883,7 +2883,7 @@ BinaryEncodeUu(
"invalid wrapchar; will defeat decoding",
-1));
Tcl_SetErrorCode(interp, "TCL", "BINARY",
- "ENCODE", "WRAPCHAR", (void *)NULL);
+ "ENCODE", "WRAPCHAR", (char *)NULL);
return TCL_ERROR;
}
}
@@ -3105,7 +3105,7 @@ BinaryDecodeUu(
shortUu:
Tcl_SetObjResult(interp, Tcl_ObjPrintf("short uuencode data"));
- Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "SHORT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "SHORT", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;
@@ -3118,7 +3118,7 @@ BinaryDecodeUu(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid uuencode character \"%c\" (U+%06X) at position %d",
ucs4, ucs4, (int) (data - datastart - 1)));
- Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;
}
@@ -3294,7 +3294,7 @@ BinaryDecode64(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid base64 character \"%c\" (U+%06X) at position %d",
ucs4, ucs4, (int) (data - datastart - 1)));
- Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;
}
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 5dcb33a..03a4a48 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -991,7 +991,7 @@ ClockConfigureObjCmd(
if (Tcl_GetIndexFromObj(interp, objv[i++], options,
"option", 0, &optionIndex) != TCL_OK) {
Tcl_SetErrorCode(interp, "CLOCK", "badOption",
- Tcl_GetString(objv[i-1]), (char *)NULL);
+ TclGetString(objv[i-1]), (char *)NULL);
return TCL_ERROR;
}
switch (optionIndex) {
@@ -3458,7 +3458,7 @@ ClockParseFmtScnArgs(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected integer but got \"%s\"",
- Tcl_GetString(baseObj)));
+ TclGetString(baseObj)));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", (char *)NULL);
i = 1;
goto badOption;
@@ -3524,7 +3524,7 @@ badOptionMsg:
badOption:
Tcl_SetErrorCode(interp, "CLOCK", "badOption",
- (i < objc) ? Tcl_GetString(objv[i]) : (char *)NULL, (char *)NULL);
+ (i < objc) ? TclGetString(objv[i]) : (char *)NULL, (char *)NULL);
return TCL_ERROR;
}
@@ -4004,13 +4004,13 @@ ClockFreeScan(
* structure, e. g. yySecondOfDay -> info->date.secondOfDay or
* yyMonth -> info->date.month (same as yydate.month)
*/
- yyInput = Tcl_GetString(strObj);
+ yyInput = TclGetString(strObj);
if (TclClockFreeScan(interp, info) != TCL_OK) {
Tcl_Obj *msg;
TclNewObj(msg);
Tcl_AppendPrintfToObj(msg, "unable to convert date-time string \"%s\": %s",
- Tcl_GetString(strObj), TclGetString(Tcl_GetObjResult(interp)));
+ TclGetString(strObj), Tcl_GetString(Tcl_GetObjResult(interp)));
Tcl_SetObjResult(interp, msg);
goto done;
}
diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c
index f9f1710..96b6db4 100644
--- a/generic/tclClockFmt.c
+++ b/generic/tclClockFmt.c
@@ -2625,7 +2625,7 @@ not_match:
"input string \"%s\" does not match supplied format \"%s\","
" locale \"%s\" - token \"%s\"",
info->dateStart, HashEntry4FmtScn(fss)->key.string,
- Tcl_GetString(opts->localeObj),
+ TclGetString(opts->localeObj),
tok && tok->tokWord.start ? tok->tokWord.start : "NULL"));
#endif
Tcl_SetErrorCode(opts->interp, "CLOCK", "badInputString", (char *)NULL);
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index e29fed7..6a87582 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1794,7 +1794,7 @@ FileAttrIsOwnedCmd(
Tcl_Obj *normPathPtr = Tcl_FSGetNormalizedPath(interp, objv[1]);
/* Note normPathPtr owned by Tcl, no need to free it */
if (normPathPtr) {
- if (TclIsZipfsPath(Tcl_GetString(normPathPtr))) {
+ if (TclIsZipfsPath(TclGetString(normPathPtr))) {
return CheckAccess(interp, objv[1], F_OK);
}
/* Not zipfs, try native. */
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 1df9dd1..abb375a 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1105,7 +1105,7 @@ TclNRSourceObjCmd(
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- const char *encodingName = NULL;
+ const char *encoding = NULL;
Tcl_Obj *fileName;
int result;
void **pkgFiles = NULL;
@@ -1128,7 +1128,7 @@ TclNRSourceObjCmd(
"option", TCL_EXACT, &index)) {
return TCL_ERROR;
}
- encodingName = TclGetString(objv[2]);
+ encoding = TclGetString(objv[2]);
} else if (objc == 3) {
/* Handle undocumented -nopkg option. This should only be
* used by the internal ::tcl::Pkg::source utility function. */
@@ -1147,7 +1147,7 @@ TclNRSourceObjCmd(
names = *pkgFiles;
*pkgFiles = NULL;
}
- result = TclNREvalFile(interp, fileName, encodingName);
+ result = TclNREvalFile(interp, fileName, encoding);
if (pkgFiles) {
/* restore "tclPkgFiles" assocdata to how it was. */
*pkgFiles = names;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 4f9ed7c..b8becd3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1563,7 +1563,7 @@ EXTERN void Tcl_GetCommandFullName(Tcl_Interp *interp,
Tcl_Command command, Tcl_Obj *objPtr);
/* 518 */
EXTERN int Tcl_FSEvalFileEx(Tcl_Interp *interp,
- Tcl_Obj *fileName, const char *encodingName);
+ Tcl_Obj *fileName, const char *encoding);
/* 519 */
EXTERN Tcl_ExitProc * Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
/* 520 */
@@ -2572,7 +2572,7 @@ typedef struct TclStubs {
Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */
Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */
void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */
- int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encodingName); /* 518 */
+ int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encoding); /* 518 */
TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") Tcl_ExitProc * (*tcl_SetExitProc) (TCL_NORETURN1 Tcl_ExitProc *proc); /* 519 */
void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */
void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData); /* 521 */
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c3bd36d..baba48a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -517,13 +517,13 @@ FillEncodingFileMap(void)
TclListObjGetElements(NULL, matchFileList, &numFiles, &filev);
for (j=0; j<numFiles; j++) {
- Tcl_Obj *encodingName, *fileObj;
+ Tcl_Obj *encoding, *fileObj;
fileObj = TclPathPart(NULL, filev[j], TCL_PATH_TAIL);
- encodingName = TclPathPart(NULL, fileObj, TCL_PATH_ROOT);
- Tcl_DictObjPut(NULL, map, encodingName, directory);
+ encoding = TclPathPart(NULL, fileObj, TCL_PATH_ROOT);
+ Tcl_DictObjPut(NULL, map, encoding, directory);
Tcl_DecrRefCount(fileObj);
- Tcl_DecrRefCount(encodingName);
+ Tcl_DecrRefCount(encoding);
}
Tcl_DecrRefCount(matchFileList);
Tcl_DecrRefCount(directory);
@@ -1333,7 +1333,7 @@ Tcl_ExternalToUtfDStringEx(
nBytesProcessed,
UCHAR(srcStart[nBytesProcessed])));
Tcl_SetErrorCode(
- interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, (void *)NULL);
+ interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, (char *)NULL);
}
}
if (result != TCL_OK) {
@@ -1625,7 +1625,7 @@ Tcl_UtfToExternalDStringEx(
pos,
ucs4));
Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
- buf, (void *)NULL);
+ buf, (char *)NULL);
}
}
if (result != TCL_OK) {
@@ -1874,7 +1874,7 @@ OpenEncodingFileChannel(
if ((NULL == chan) && (interp != NULL)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unknown encoding \"%s\"", name));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (char *)NULL);
}
Tcl_DecrRefCount(fileNameObj);
Tcl_DecrRefCount(nameObj);
@@ -1949,7 +1949,7 @@ LoadEncodingFile(
if ((encoding == NULL) && (interp != NULL)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid encoding file \"%s\"", name));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (char *)NULL);
}
Tcl_Close(NULL, chan);
@@ -4424,14 +4424,14 @@ TclEncodingProfileNameToId(
profileName);
for (i = 0; i < (numProfiles - 1); ++i) {
Tcl_AppendStringsToObj(
- errorObj, " ", encodingProfiles[i].name, ",", (void *)NULL);
+ errorObj, " ", encodingProfiles[i].name, ",", (char *)NULL);
}
Tcl_AppendStringsToObj(
- errorObj, " or ", encodingProfiles[numProfiles-1].name, (void *)NULL);
+ errorObj, " or ", encodingProfiles[numProfiles-1].name, (char *)NULL);
Tcl_SetObjResult(interp, errorObj);
Tcl_SetErrorCode(
- interp, "TCL", "ENCODING", "PROFILE", profileName, (void *)NULL);
+ interp, "TCL", "ENCODING", "PROFILE", profileName, (char *)NULL);
}
return TCL_ERROR;
}
@@ -4470,7 +4470,7 @@ TclEncodingProfileIdToName(
"Internal error. Bad profile id \"%d\".",
profileValue));
Tcl_SetErrorCode(
- interp, "TCL", "ENCODING", "PROFILEID", (void *)NULL);
+ interp, "TCL", "ENCODING", "PROFILEID", (char *)NULL);
}
return NULL;
}
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 9b9d283..5679a6c 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -884,7 +884,7 @@ TclpNativeJoinPath(
Tcl_SetObjLength(prefix, length + (int) strlen(p));
- dest = Tcl_GetString(prefix) + length;
+ dest = TclGetString(prefix) + length;
for (; *p != '\0'; p++) {
if (*p == '/') {
while (p[1] == '/') {
@@ -898,7 +898,7 @@ TclpNativeJoinPath(
needsSep = 1;
}
}
- length = dest - Tcl_GetString(prefix);
+ length = dest - TclGetString(prefix);
Tcl_SetObjLength(prefix, length);
break;
@@ -933,7 +933,7 @@ TclpNativeJoinPath(
needsSep = 1;
}
}
- length = dest - Tcl_GetString(prefix);
+ length = dest - TclGetString(prefix);
Tcl_SetObjLength(prefix, length);
break;
}
@@ -1172,7 +1172,7 @@ DoTildeSubst(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't find HOME environment "
"variable to expand path", -1));
- Tcl_SetErrorCode(interp, "TCL", "FILENAME", "NO_HOME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FILENAME", "NO_HOME", (char *)NULL);
}
return NULL;
}
@@ -1183,7 +1183,7 @@ DoTildeSubst(
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"user \"%s\" doesn't exist", user));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "USER", user, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "USER", user, (char *)NULL);
}
return NULL;
}
@@ -1265,7 +1265,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-directory\"", -1));
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
@@ -1275,7 +1275,7 @@ Tcl_GlobObjCmd(
: "\"-directory\" cannot be used with \"-path\"",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
- "BADOPTIONCOMBINATION", (void *)NULL);
+ "BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}
dir = PATH_DIR;
@@ -1293,7 +1293,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-path\"", -1));
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
@@ -1303,7 +1303,7 @@ Tcl_GlobObjCmd(
: "\"-path\" cannot be used with \"-dictionary\"",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
- "BADOPTIONCOMBINATION", (void *)NULL);
+ "BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}
dir = PATH_GENERAL;
@@ -1314,7 +1314,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-types\"", -1));
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
typePtr = objv[i+1];
@@ -1335,7 +1335,7 @@ Tcl_GlobObjCmd(
"\"-tails\" must be used with either "
"\"-directory\" or \"-path\"", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
- "BADOPTIONCOMBINATION", (void *)NULL);
+ "BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}
@@ -1403,7 +1403,7 @@ Tcl_GlobObjCmd(
* for the zipfs volume.
*/
- const char *temp = Tcl_GetString(pathOrDir);
+ const char *temp = TclGetString(pathOrDir);
if (strpbrk(temp, "\\/") == NULL) {
Tcl_AppendToObj(pathOrDir, last-1, 1);
} else if (!strcmp(temp, "//zipfs:")) {
@@ -1517,9 +1517,9 @@ Tcl_GlobObjCmd(
if ((TclListObjLength(NULL, look, &len) == TCL_OK)
&& (len == 3)) {
Tcl_ListObjIndex(interp, look, 0, &item);
- if (!strcmp("macintosh", Tcl_GetString(item))) {
+ if (!strcmp("macintosh", TclGetString(item))) {
Tcl_ListObjIndex(interp, look, 1, &item);
- if (!strcmp("type", Tcl_GetString(item))) {
+ if (!strcmp("type", TclGetString(item))) {
Tcl_ListObjIndex(interp, look, 2, &item);
if (globTypes->macType != NULL) {
goto badMacTypesArg;
@@ -1527,7 +1527,7 @@ Tcl_GlobObjCmd(
globTypes->macType = item;
Tcl_IncrRefCount(item);
continue;
- } else if (!strcmp("creator", Tcl_GetString(item))) {
+ } else if (!strcmp("creator", TclGetString(item))) {
Tcl_ListObjIndex(interp, look, 2, &item);
if (globTypes->macCreator != NULL) {
goto badMacTypesArg;
@@ -1547,8 +1547,8 @@ Tcl_GlobObjCmd(
badTypesArg:
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad argument to \"-types\": %s",
- Tcl_GetString(look)));
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (void *)NULL);
+ TclGetString(look)));
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (char *)NULL);
result = TCL_ERROR;
join = 0;
goto endOfGlob;
@@ -1558,7 +1558,7 @@ Tcl_GlobObjCmd(
"only one MacOS type or creator argument"
" to \"-types\" allowed", -1));
result = TCL_ERROR;
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (char *)NULL);
join = 0;
goto endOfGlob;
}
@@ -1611,7 +1611,7 @@ Tcl_GlobObjCmd(
Tcl_DStringFree(&str);
} else {
for (i = 0; i < objc; i++) {
- string = Tcl_GetString(objv[i]);
+ string = TclGetString(objv[i]);
if (TclGlob(interp, string, pathOrDir, globFlags,
globTypes) != TCL_OK) {
result = TCL_ERROR;
@@ -1643,14 +1643,14 @@ Tcl_GlobObjCmd(
for (i = 0; i < objc; i++) {
Tcl_AppendPrintfToObj(errorMsg, "%s%s",
- sep, Tcl_GetString(objv[i]));
+ sep, TclGetString(objv[i]));
sep = " ";
}
}
Tcl_AppendToObj(errorMsg, "\"", -1);
Tcl_SetObjResult(interp, errorMsg);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "NOMATCH",
- (void *)NULL);
+ (char *)NULL);
result = TCL_ERROR;
}
}
@@ -1844,7 +1844,7 @@ TclGlob(
Tcl_DecrRefCount(temp);
return TCL_ERROR;
}
- pathPrefix = Tcl_NewStringObj(Tcl_GetString(cwd), 3);
+ pathPrefix = Tcl_NewStringObj(TclGetString(cwd), 3);
Tcl_DecrRefCount(cwd);
if (tail[0] == '/') {
tail++;
@@ -2216,14 +2216,14 @@ DoGlob(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched open-brace in file name", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
} else if (*p == '}') {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched close-brace in file name", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
}
@@ -2336,7 +2336,7 @@ DoGlob(
for (i=0; result==TCL_OK && i<subdirc; i++) {
Tcl_Obj *copy = NULL;
- if (pathPtr == NULL && Tcl_GetString(subdirv[i])[0] == '~') {
+ if (pathPtr == NULL && TclGetString(subdirv[i])[0] == '~') {
TclListObjLength(NULL, matchesObj, &repair);
copy = subdirv[i];
subdirv[i] = Tcl_NewStringObj("./", 2);
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index 42c62a4..81345dc 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -1021,7 +1021,7 @@ ReflectClose(
if (!rtPtr->dead) {
rtmPtr = GetReflectedTransformMap(rtPtr->interp);
- hPtr = Tcl_FindHashEntry(&rtmPtr->map, Tcl_GetString(rtPtr->handle));
+ hPtr = Tcl_FindHashEntry(&rtmPtr->map, TclGetString(rtPtr->handle));
if (hPtr) {
Tcl_DeleteHashEntry(hPtr);
}
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index b3643fe..b258775 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1686,7 +1686,7 @@ Tcl_FSEvalFileEx(
Tcl_Obj *pathPtr, /* Pathname of the file to process.
* Tilde-substitution is performed on this
* pathname. */
- const char *encodingName) /* Either the name of an encoding or NULL to
+ const char *encoding) /* Either the name of an encoding or NULL to
use the utf-8 encoding. */
{
Tcl_Size length;
@@ -1706,14 +1706,14 @@ Tcl_FSEvalFileEx(
Tcl_SetErrno(errno);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
return result;
}
chan = Tcl_FSOpenFileChannel(interp, pathPtr, "r", 0644);
if (chan == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
return result;
}
@@ -1729,10 +1729,10 @@ Tcl_FSEvalFileEx(
* Otherwise use utf-8. If the encoding is unknown report an error.
*/
- if (encodingName == NULL) {
- encodingName = "utf-8";
+ if (encoding == NULL) {
+ encoding = "utf-8";
}
- if (Tcl_SetChannelOption(interp, chan, "-encoding", encodingName)
+ if (Tcl_SetChannelOption(interp, chan, "-encoding", encoding)
!= TCL_OK) {
Tcl_Close(interp,chan);
return result;
@@ -1749,10 +1749,10 @@ Tcl_FSEvalFileEx(
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
goto end;
}
- string = Tcl_GetString(objPtr);
+ string = TclGetString(objPtr);
/*
* If first character is not a BOM, append the remaining characters.
@@ -1764,7 +1764,7 @@ Tcl_FSEvalFileEx(
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
goto end;
}
@@ -1824,7 +1824,7 @@ TclNREvalFile(
Tcl_Obj *pathPtr, /* Pathname of a file containing the script to
* evaluate. Tilde-substitution is performed on
* this pathname. */
- const char *encodingName) /* The name of an encoding to use, or NULL to
+ const char *encoding) /* The name of an encoding to use, or NULL to
* use the utf-8 encoding. */
{
Tcl_StatBuf statBuf;
@@ -1841,17 +1841,17 @@ TclNREvalFile(
Tcl_SetErrno(errno);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
return TCL_ERROR;
}
chan = Tcl_FSOpenFileChannel(interp, pathPtr, "r", 0644);
if (chan == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
return TCL_ERROR;
}
- TclPkgFileSeen(interp, Tcl_GetString(pathPtr));
+ TclPkgFileSeen(interp, TclGetString(pathPtr));
/*
* The eof character is \x1A (^Z). Tcl uses it on every platform to allow
@@ -1865,10 +1865,10 @@ TclNREvalFile(
* Otherwise use utf-8. If the encoding is unknown report an error.
*/
- if (encodingName == NULL) {
- encodingName = "utf-8";
+ if (encoding == NULL) {
+ encoding = "utf-8";
}
- if (Tcl_SetChannelOption(interp, chan, "-encoding", encodingName)
+ if (Tcl_SetChannelOption(interp, chan, "-encoding", encoding)
!= TCL_OK) {
Tcl_Close(interp, chan);
return TCL_ERROR;
@@ -1885,11 +1885,11 @@ TclNREvalFile(
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
Tcl_DecrRefCount(objPtr);
return TCL_ERROR;
}
- string = Tcl_GetString(objPtr);
+ string = TclGetString(objPtr);
/*
* If first character is not a BOM, append the remaining characters.
@@ -1901,7 +1901,7 @@ TclNREvalFile(
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't read file \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
Tcl_DecrRefCount(objPtr);
return TCL_ERROR;
}
@@ -2235,7 +2235,7 @@ Tcl_FSOpenFileChannel(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"could not seek to end of file while opening \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
}
Tcl_Close(NULL, retVal);
return NULL;
@@ -2254,7 +2254,7 @@ Tcl_FSOpenFileChannel(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't open \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
}
return NULL;
}
@@ -3143,7 +3143,7 @@ skipUnlink(
*/
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
#endif /* AUFS_SUPER_MAGIC */
- if ((statfs(Tcl_GetString(shlibFile), &fs) == 0)
+ if ((statfs(TclGetString(shlibFile), &fs) == 0)
&& (fs.f_type == AUFS_SUPER_MAGIC)) {
return 1;
}
@@ -3219,7 +3219,7 @@ Tcl_LoadFile(
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't load library \"%s\": %s",
- Tcl_GetString(pathPtr), Tcl_PosixError(interp)));
+ TclGetString(pathPtr), Tcl_PosixError(interp)));
}
return TCL_ERROR;
}
@@ -3832,7 +3832,7 @@ Tcl_FSSplitPath(
if (sep != NULL) {
Tcl_IncrRefCount(sep);
- separator = Tcl_GetString(sep)[0];
+ separator = TclGetString(sep)[0];
Tcl_DecrRefCount(sep);
}
}
@@ -3844,7 +3844,7 @@ Tcl_FSSplitPath(
*/
TclNewObj(result);
- p = Tcl_GetString(pathPtr);
+ p = TclGetString(pathPtr);
Tcl_ListObjAppendElement(NULL, result,
Tcl_NewStringObj(p, driveNameLength));
p += driveNameLength;
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index e6e06d8..a18dafe 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -459,10 +459,10 @@ declare 177 {
const char *operation, const char *reason)
}
declare 178 {deprecated {}} {
- void TclSetStartupScript(Tcl_Obj *pathPtr, const char *encodingName)
+ void TclSetStartupScript(Tcl_Obj *pathPtr, const char *encoding)
}
declare 179 {deprecated {}} {
- Tcl_Obj *TclGetStartupScript(const char **encodingNamePtr)
+ Tcl_Obj *TclGetStartupScript(const char **encodingPtr)
}
declare 182 {deprecated {}} {
struct tm *TclpLocaltime(const time_t *clock)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 09c47d5..b30e96e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3211,7 +3211,7 @@ MODULE_SCOPE Tcl_Command TclNRCreateCommandInNs(Tcl_Interp *interp,
Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc,
void *clientData, Tcl_CmdDeleteProc *deleteProc);
MODULE_SCOPE int TclNREvalFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
- const char *encodingName);
+ const char *encoding);
MODULE_SCOPE int * TclGetAsyncReadyPtr(void);
MODULE_SCOPE Tcl_Obj * TclGetBgErrorHandler(Tcl_Interp *interp);
MODULE_SCOPE int TclGetChannelFromObj(Tcl_Interp *interp,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 3ebe2eb..4a15b9f 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -488,10 +488,10 @@ EXTERN void TclVarErrMsg(Tcl_Interp *interp, const char *part1,
/* 178 */
TCL_DEPRECATED("")
void TclSetStartupScript(Tcl_Obj *pathPtr,
- const char *encodingName);
+ const char *encoding);
/* 179 */
TCL_DEPRECATED("")
-Tcl_Obj * TclGetStartupScript(const char **encodingNamePtr);
+Tcl_Obj * TclGetStartupScript(const char **encodingPtr);
/* Slot 180 is reserved */
/* Slot 181 is reserved */
/* 182 */
@@ -872,8 +872,8 @@ typedef struct TclIntStubs {
int (*tclCallVarTraces) (Interp *iPtr, Var *arrayPtr, Var *varPtr, const char *part1, const char *part2, int flags, int leaveErrMsg); /* 175 */
void (*tclCleanupVar) (Var *varPtr, Var *arrayPtr); /* 176 */
void (*tclVarErrMsg) (Tcl_Interp *interp, const char *part1, const char *part2, const char *operation, const char *reason); /* 177 */
- TCL_DEPRECATED_API("") void (*tclSetStartupScript) (Tcl_Obj *pathPtr, const char *encodingName); /* 178 */
- TCL_DEPRECATED_API("") Tcl_Obj * (*tclGetStartupScript) (const char **encodingNamePtr); /* 179 */
+ TCL_DEPRECATED_API("") void (*tclSetStartupScript) (Tcl_Obj *pathPtr, const char *encoding); /* 178 */
+ TCL_DEPRECATED_API("") Tcl_Obj * (*tclGetStartupScript) (const char **encodingPtr); /* 179 */
void (*reserved180)(void);
void (*reserved181)(void);
TCL_DEPRECATED_API("") struct tm * (*tclpLocaltime) (const time_t *clock); /* 182 */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 5abda57..95b9215 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -795,7 +795,7 @@ NRInterpCmd(
childPtr = NULL;
last = 0;
for (i = 2; i < objc; i++) {
- if ((last == 0) && (Tcl_GetString(objv[i])[0] == '-')) {
+ if ((last == 0) && (TclGetString(objv[i])[0] == '-')) {
if (Tcl_GetIndexFromObj(interp, objv[i], createOptions,
"option", 0, &index) != TCL_OK) {
return TCL_ERROR;
@@ -869,7 +869,7 @@ NRInterpCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot delete the current interpreter", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "DELETESELF", (void *)NULL);
+ "DELETESELF", (char *)NULL);
return TCL_ERROR;
}
iiPtr = (InterpInfo *) ((Interp *) childInterp)->interpInfo;
@@ -1113,16 +1113,16 @@ NRInterpCmd(
"alias \"%s\" in path \"%s\" not found",
aliasName, TclGetString(objv[2])));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName,
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
if (Tcl_GetInterpPath(interp, aliasPtr->targetInterp) != TCL_OK) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"target interpreter for alias \"%s\" in path \"%s\" is "
- "not my descendant", aliasName, Tcl_GetString(objv[2])));
+ "not my descendant", aliasName, TclGetString(objv[2])));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "TARGETSHROUDED", (void *)NULL);
+ "TARGETSHROUDED", (char *)NULL);
return TCL_ERROR;
}
return TCL_OK;
@@ -1302,7 +1302,7 @@ Tcl_GetAlias(
if (hPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"alias \"%s\" not found", aliasName));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, (char *)NULL);
return TCL_ERROR;
}
aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
@@ -1364,7 +1364,7 @@ Tcl_GetAliasObj(
if (hPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"alias \"%s\" not found", aliasName));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, (char *)NULL);
return TCL_ERROR;
}
aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
@@ -1471,7 +1471,7 @@ TclPreventAliasLoop(
"cannot define or rename alias \"%s\": would create a loop",
Tcl_GetCommandName(cmdInterp, cmd)));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "ALIASLOOP", (void *)NULL);
+ "ALIASLOOP", (char *)NULL);
return TCL_ERROR;
}
@@ -1692,7 +1692,7 @@ AliasDelete(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"alias \"%s\" not found", TclGetString(namePtr)));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS",
- TclGetString(namePtr), (void *)NULL);
+ TclGetString(namePtr), (char *)NULL);
return TCL_ERROR;
}
aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
@@ -1736,7 +1736,7 @@ AliasDescribe(
*/
childPtr = &((InterpInfo *) ((Interp *) childInterp)->interpInfo)->child;
- hPtr = Tcl_FindHashEntry(&childPtr->aliasTable, Tcl_GetString(namePtr));
+ hPtr = Tcl_FindHashEntry(&childPtr->aliasTable, TclGetString(namePtr));
if (hPtr == NULL) {
return TCL_OK;
}
@@ -2344,7 +2344,7 @@ GetInterp(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"could not find interpreter \"%s\"", TclGetString(pathPtr)));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "INTERP",
- TclGetString(pathPtr), (void *)NULL);
+ TclGetString(pathPtr), (char *)NULL);
}
return searchInterp;
}
@@ -2382,7 +2382,7 @@ ChildBgerror(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cmdPrefix must be list of length >= 1", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BGERRORFORMAT", (void *)NULL);
+ "BGERRORFORMAT", (char *)NULL);
return TCL_ERROR;
}
TclSetBgErrorHandler(childInterp, objv[0]);
@@ -2954,7 +2954,7 @@ ChildExpose(
"permission denied: safe interpreter cannot expose commands",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
@@ -2999,7 +2999,7 @@ ChildRecursionLimit(
Tcl_SetObjResult(interp, Tcl_NewStringObj("permission denied: "
"safe interpreters cannot change recursion limit", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
if (TclGetIntFromObj(interp, objv[0], &limit) == TCL_ERROR) {
@@ -3009,7 +3009,7 @@ ChildRecursionLimit(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"recursion limit must be > 0", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADLIMIT",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
Tcl_SetRecursionLimit(childInterp, limit);
@@ -3017,7 +3017,7 @@ ChildRecursionLimit(
if (interp == childInterp && iPtr->numLevels > limit) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"falling back due to new recursion limit", -1));
- Tcl_SetErrorCode(interp, "TCL", "RECURSION", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "RECURSION", (char *)NULL);
return TCL_ERROR;
}
Tcl_SetObjResult(interp, objv[0]);
@@ -3060,7 +3060,7 @@ ChildHide(
"permission denied: safe interpreter cannot hide commands",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
@@ -3145,7 +3145,7 @@ ChildInvokeHidden(
"not allowed to invoke hidden commands from safe interpreter",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
@@ -3222,7 +3222,7 @@ ChildMarkTrusted(
"permission denied: safe interpreter cannot mark trusted",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
((Interp *) childInterp)->flags &= ~SAFE_INTERP;
@@ -3476,7 +3476,7 @@ Tcl_LimitCheck(
} else if (iPtr->limit.exceeded & TCL_LIMIT_COMMANDS) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command count limit exceeded", -1));
- Tcl_SetErrorCode(interp, "TCL", "LIMIT", "COMMANDS", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LIMIT", "COMMANDS", (char *)NULL);
Tcl_Release(interp);
return TCL_ERROR;
}
@@ -3502,7 +3502,7 @@ Tcl_LimitCheck(
} else if (iPtr->limit.exceeded & TCL_LIMIT_TIME) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"time limit exceeded", -1));
- Tcl_SetErrorCode(interp, "TCL", "LIMIT", "TIME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LIMIT", "TIME", (char *)NULL);
Tcl_Release(interp);
return TCL_ERROR;
}
@@ -4514,7 +4514,7 @@ ChildCommandLimitCmd(
if (interp == childInterp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"limits on current interpreter inaccessible", -1));
- Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", (char *)NULL);
return TCL_ERROR;
}
@@ -4614,7 +4614,7 @@ ChildCommandLimitCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"granularity must be at least 1", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADVALUE", (void *)NULL);
+ "BADVALUE", (char *)NULL);
return TCL_ERROR;
}
break;
@@ -4631,7 +4631,7 @@ ChildCommandLimitCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command limit value must be at least 0", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADVALUE", (void *)NULL);
+ "BADVALUE", (char *)NULL);
return TCL_ERROR;
}
break;
@@ -4703,7 +4703,7 @@ ChildTimeLimitCmd(
if (interp == childInterp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"limits on current interpreter inaccessible", -1));
- Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", (char *)NULL);
return TCL_ERROR;
}
@@ -4824,7 +4824,7 @@ ChildTimeLimitCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"granularity must be at least 1", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADVALUE", (void *)NULL);
+ "BADVALUE", (char *)NULL);
return TCL_ERROR;
}
break;
@@ -4841,7 +4841,7 @@ ChildTimeLimitCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"milliseconds must be between 0 and %ld", LONG_MAX));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADVALUE", (void *)NULL);
+ "BADVALUE", (char *)NULL);
return TCL_ERROR;
}
limitMoment.usec = ((long)tmp)*1000;
@@ -4859,7 +4859,7 @@ ChildTimeLimitCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"seconds must be between 0 and %ld", LONG_MAX));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADVALUE", (void *)NULL);
+ "BADVALUE", (char *)NULL);
return TCL_ERROR;
}
limitMoment.sec = (long)tmp;
@@ -4878,7 +4878,7 @@ ChildTimeLimitCmd(
"may only set -milliseconds if -seconds is not "
"also being reset", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADUSAGE", (void *)NULL);
+ "BADUSAGE", (char *)NULL);
return TCL_ERROR;
}
if (milliLen == 0 && (secObj == NULL || secLen > 0)) {
@@ -4886,7 +4886,7 @@ ChildTimeLimitCmd(
"may only reset -milliseconds if -seconds is "
"also being reset", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
- "BADUSAGE", (void *)NULL);
+ "BADUSAGE", (char *)NULL);
return TCL_ERROR;
}
}
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 6a5e73a..8bc738f 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -738,7 +738,7 @@ LinkTraceProc(
} else if (flags & TCL_TRACE_DESTROYED) {
Tcl_ObjSetVar2(interp, linkPtr->varName, NULL, ObjValue(linkPtr),
TCL_GLOBAL_ONLY);
- Tcl_TraceVar2(interp, Tcl_GetString(linkPtr->varName), NULL,
+ Tcl_TraceVar2(interp, TclGetString(linkPtr->varName), NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES
|TCL_TRACE_UNSETS, LinkTraceProc, linkPtr);
}
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 05883ba..b14a4a8 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -178,7 +178,7 @@ Tcl_LoadObjCmd(
if (Tcl_FSConvertToPathType(interp, objv[1]) != TCL_OK) {
return TCL_ERROR;
}
- fullFileName = Tcl_GetString(objv[1]);
+ fullFileName = TclGetString(objv[1]);
Tcl_DStringInit(&pfx);
Tcl_DStringInit(&initName);
@@ -189,7 +189,7 @@ Tcl_LoadObjCmd(
prefix = NULL;
if (objc >= 3) {
- prefix = Tcl_GetString(objv[2]);
+ prefix = TclGetString(objv[2]);
if (prefix[0] == '\0') {
prefix = NULL;
}
@@ -198,7 +198,7 @@ Tcl_LoadObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must specify either file name or prefix", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "NOLIBRARY",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -209,7 +209,7 @@ Tcl_LoadObjCmd(
target = interp;
if (objc == 4) {
- const char *childIntName = Tcl_GetString(objv[3]);
+ const char *childIntName = TclGetString(objv[3]);
target = Tcl_GetChild(interp, childIntName);
if (target == NULL) {
@@ -266,7 +266,7 @@ Tcl_LoadObjCmd(
"file \"%s\" is already loaded for prefix \"%s\"",
fullFileName, libraryPtr->prefix));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD",
- "SPLITPERSONALITY", (void *)NULL);
+ "SPLITPERSONALITY", (char *)NULL);
code = TCL_ERROR;
Tcl_MutexUnlock(&libraryMutex);
goto done;
@@ -303,7 +303,7 @@ Tcl_LoadObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"no library with prefix \"%s\" is loaded statically", prefix));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "NOTSTATIC",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -333,7 +333,7 @@ Tcl_LoadObjCmd(
splitPtr = Tcl_FSSplitPath(objv[1], &pElements);
Tcl_ListObjIndex(NULL, splitPtr, pElements -1, &pkgGuessPtr);
- pkgGuess = Tcl_GetString(pkgGuessPtr);
+ pkgGuess = TclGetString(pkgGuessPtr);
if ((pkgGuess[0] == 'l') && (pkgGuess[1] == 'i')
&& (pkgGuess[2] == 'b')) {
pkgGuess += 3;
@@ -366,7 +366,7 @@ Tcl_LoadObjCmd(
"couldn't figure out prefix for %s",
fullFileName));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD",
- "WHATLIBRARY", (void *)NULL);
+ "WHATLIBRARY", (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -462,7 +462,7 @@ Tcl_LoadObjCmd(
"can't use library in a safe interpreter: no"
" %s_SafeInit procedure", libraryPtr->prefix));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "UNSAFE",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -473,7 +473,7 @@ Tcl_LoadObjCmd(
"can't attach library to interpreter: no %s_Init procedure",
libraryPtr->prefix));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "ENTRYPOINT",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -580,7 +580,7 @@ Tcl_UnloadObjCmd(
for (i = 1; i < objc; i++) {
if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
&index) != TCL_OK) {
- fullFileName = Tcl_GetString(objv[i]);
+ fullFileName = TclGetString(objv[i]);
if (fullFileName[0] == '-') {
/*
* It looks like the command contains an option so signal an
@@ -620,13 +620,13 @@ Tcl_UnloadObjCmd(
return TCL_ERROR;
}
- fullFileName = Tcl_GetString(objv[i]);
+ fullFileName = TclGetString(objv[i]);
Tcl_DStringInit(&pfx);
Tcl_DStringInit(&tmp);
prefix = NULL;
if (objc - i >= 2) {
- prefix = Tcl_GetString(objv[i+1]);
+ prefix = TclGetString(objv[i+1]);
if (prefix[0] == '\0') {
prefix = NULL;
}
@@ -635,7 +635,7 @@ Tcl_UnloadObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must specify either file name or prefix", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "NOLIBRARY",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -646,7 +646,7 @@ Tcl_UnloadObjCmd(
target = interp;
if (objc - i == 3) {
- const char *childIntName = Tcl_GetString(objv[i + 2]);
+ const char *childIntName = TclGetString(objv[i + 2]);
target = Tcl_GetChild(interp, childIntName);
if (target == NULL) {
@@ -705,7 +705,7 @@ Tcl_UnloadObjCmd(
"library with prefix \"%s\" is loaded statically and cannot be unloaded",
prefix));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "STATIC",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -717,7 +717,7 @@ Tcl_UnloadObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"file \"%s\" has never been loaded", fullFileName));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "NEVERLOADED",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -747,7 +747,7 @@ Tcl_UnloadObjCmd(
"file \"%s\" has never been loaded in this interpreter",
fullFileName));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "NEVERLOADED",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -810,7 +810,7 @@ UnloadLibrary(
"file \"%s\" cannot be unloaded under a safe interpreter",
fullFileName));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "CANNOT",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
@@ -823,7 +823,7 @@ UnloadLibrary(
"file \"%s\" cannot be unloaded under a trusted interpreter",
fullFileName));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "CANNOT",
- (void *)NULL);
+ (char *)NULL);
code = TCL_ERROR;
goto done;
}
diff --git a/generic/tclMain.c b/generic/tclMain.c
index d23cd7b..8b7331f 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -286,7 +286,7 @@ Tcl_MainEx(
{
int i=0; /* argv[i] index */
Tcl_Obj *path, *resultPtr, *argvPtr, *appName;
- const char *encodingName = NULL;
+ const char *encoding = NULL;
int code, exitCode = 0;
Tcl_MainLoopProc *mainLoopProc;
Tcl_Channel chan;
@@ -336,7 +336,7 @@ Tcl_MainEx(
}
}
- path = Tcl_GetStartupScript(&encodingName);
+ path = Tcl_GetStartupScript(&encoding);
if (path != NULL) {
appName = path;
} else if (argv[0]) {
@@ -398,10 +398,10 @@ Tcl_MainEx(
* again, as the appInitProc might have reset it.
*/
- path = Tcl_GetStartupScript(&encodingName);
+ path = Tcl_GetStartupScript(&encoding);
if (path != NULL) {
Tcl_ResetResult(interp);
- code = Tcl_FSEvalFileEx(interp, path, encodingName);
+ code = Tcl_FSEvalFileEx(interp, path, encoding);
if (code != TCL_OK) {
chan = Tcl_GetStdChannel(TCL_STDERR);
if (chan) {
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index d448fbc..ec70add 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -925,7 +925,7 @@ TclJoinPath(
*/
if ((tclPlatform != TCL_PLATFORM_WINDOWS)
- || (strchr(Tcl_GetString(elt), '\\') == NULL)) {
+ || (strchr(TclGetString(elt), '\\') == NULL)) {
if (PATHFLAGS(elt)) {
return TclNewFSPathObj(elt, str, len);
@@ -1840,7 +1840,7 @@ Tcl_FSGetNormalizedPath(
copy = AppendPath(fsPathPtr->cwdPtr, pathPtr);
(void) TclGetStringFromObj(fsPathPtr->cwdPtr, &cwdLen);
- cwdLen += (Tcl_GetString(copy)[cwdLen] == '/');
+ cwdLen += (TclGetString(copy)[cwdLen] == '/');
/*
* Normalize the combined string, but only starting after the end
@@ -2286,7 +2286,7 @@ SetFsPathFromAny(
"couldn't find HOME environment variable to"
" expand path", -1));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
- "HOMELESS", (void *)NULL);
+ "HOMELESS", (char *)NULL);
}
return TCL_ERROR;
}
@@ -2311,7 +2311,7 @@ SetFsPathFromAny(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"user \"%s\" doesn't exist", expandedUser));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
- (void *)NULL);
+ (char *)NULL);
}
Tcl_DStringFree(&userName);
Tcl_DStringFree(&temp);
@@ -2630,7 +2630,7 @@ MakeTildeRelativePath(
"couldn't find HOME environment variable to"
" expand path", -1));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
- "HOMELESS", (void *)NULL);
+ "HOMELESS", (char *)NULL);
}
return TCL_ERROR;
}
@@ -2642,7 +2642,7 @@ MakeTildeRelativePath(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"user \"%s\" doesn't exist", user));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
}
@@ -2805,7 +2805,7 @@ TclResolveTildePathList(
* Figure out if any paths need resolving to avoid unnecessary allocations.
*/
for (i = 0; i < objc; ++i) {
- path = Tcl_GetString(objv[i]);
+ path = TclGetString(objv[i]);
if (path[0] == '~') {
break; /* At least one path needs resolution */
}
@@ -2817,7 +2817,7 @@ TclResolveTildePathList(
resolvedPaths = Tcl_NewListObj(objc, NULL);
for (i = 0; i < objc; ++i) {
Tcl_Obj *resolvedPath;
- path = Tcl_GetString(objv[i]);
+ path = TclGetString(objv[i]);
if (path[0] == 0) {
continue; /* Skip empty strings */
}
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 82860a6..ddb98fa 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -171,7 +171,7 @@ Tcl_PkgProvideEx(
return TCL_OK;
}
- if (CheckVersionAndConvert(interp, Tcl_GetString(pkgPtr->version), &pvi,
+ if (CheckVersionAndConvert(interp, TclGetString(pkgPtr->version), &pvi,
NULL) != TCL_OK) {
return TCL_ERROR;
} else if (CheckVersionAndConvert(interp, version, &vi, NULL) != TCL_OK) {
@@ -191,8 +191,8 @@ Tcl_PkgProvideEx(
}
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"conflicting versions provided for package \"%s\": %s, then %s",
- name, Tcl_GetString(pkgPtr->version), version));
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT", (void *)NULL);
+ name, TclGetString(pkgPtr->version), version));
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT", (char *)NULL);
return TCL_ERROR;
}
@@ -389,7 +389,7 @@ Tcl_PkgRequireEx(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"Cannot load package \"%s\" in standalone executable:"
" This package is not compiled with stub support", name));
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNSTUBBED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNSTUBBED", (char *)NULL);
return NULL;
}
@@ -409,7 +409,7 @@ Tcl_PkgRequireEx(
}
ov = Tcl_NewStringObj(version, -1);
if (exact) {
- Tcl_AppendStringsToObj(ov, "-", version, (void *)NULL);
+ Tcl_AppendStringsToObj(ov, "-", version, (char *)NULL);
}
Tcl_IncrRefCount(ov);
if (Tcl_PkgRequireProc(interp, name, 1, &ov, clientDataPtr) == TCL_OK) {
@@ -559,7 +559,7 @@ PkgRequireCoreStep2(
if ((result != TCL_OK) && (result != TCL_ERROR)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad return code: %d", result));
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", (char *)NULL);
result = TCL_ERROR;
}
if (result == TCL_ERROR) {
@@ -596,7 +596,7 @@ PkgRequireCoreFinal(
if (reqPtr->pkgPtr->version == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't find package %s", name));
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNFOUND", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNFOUND", (char *)NULL);
AddRequirementsToResult(interp, reqc, reqv);
return TCL_ERROR;
}
@@ -606,7 +606,7 @@ PkgRequireCoreFinal(
*/
if (reqc != 0) {
- CheckVersionAndConvert(interp, Tcl_GetString(reqPtr->pkgPtr->version),
+ CheckVersionAndConvert(interp, TclGetString(reqPtr->pkgPtr->version),
&pkgVersionI, NULL);
satisfies = SomeRequirementSatisfied(pkgVersionI, reqc, reqv);
@@ -615,9 +615,9 @@ PkgRequireCoreFinal(
if (!satisfies) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"version conflict for package \"%s\": have %s, need",
- name, Tcl_GetString(reqPtr->pkgPtr->version)));
+ name, TclGetString(reqPtr->pkgPtr->version)));
Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT",
- (void *)NULL);
+ (char *)NULL);
AddRequirementsToResult(interp, reqc, reqv);
return TCL_ERROR;
}
@@ -670,7 +670,7 @@ SelectPackage(
" attempt to provide %s %s requires %s",
name, (char *) pkgPtr->clientData, name));
AddRequirementsToResult(interp, reqc, reqv);
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", (char *)NULL);
return TCL_ERROR;
}
@@ -876,12 +876,12 @@ SelectPackageFinal(
" no version of package %s provided",
name, versionToProvide, name));
Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNPROVIDED",
- (void *)NULL);
+ (char *)NULL);
} else {
char *pvi, *vi;
if (TCL_OK != CheckVersionAndConvert(interp,
- Tcl_GetString(reqPtr->pkgPtr->version), &pvi, NULL)) {
+ TclGetString(reqPtr->pkgPtr->version), &pvi, NULL)) {
result = TCL_ERROR;
} else if (CheckVersionAndConvert(interp,
versionToProvide, &vi, NULL) != TCL_OK) {
@@ -898,9 +898,9 @@ SelectPackageFinal(
"attempt to provide package %s %s failed:"
" package %s %s provided instead",
name, versionToProvide,
- name, Tcl_GetString(reqPtr->pkgPtr->version)));
+ name, TclGetString(reqPtr->pkgPtr->version)));
Tcl_SetErrorCode(interp, "TCL", "PACKAGE",
- "WRONGPROVIDE", (void *)NULL);
+ "WRONGPROVIDE", (char *)NULL);
}
}
}
@@ -912,7 +912,7 @@ SelectPackageFinal(
"attempt to provide package %s %s failed:"
" bad return code: %s",
name, versionToProvide, TclGetString(codePtr)));
- Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", (char *)NULL);
TclDecrRefCount(codePtr);
result = TCL_ERROR;
}
@@ -1018,7 +1018,7 @@ Tcl_PkgPresentEx(
if (foundVersion == NULL) {
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "PACKAGE", name,
- (void *)NULL);
+ (char *)NULL);
}
return foundVersion;
}
@@ -1031,7 +1031,7 @@ Tcl_PkgPresentEx(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"package %s is not present", name));
}
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "PACKAGE", name, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "PACKAGE", name, (char *)NULL);
return NULL;
}
@@ -1110,7 +1110,7 @@ TclNRPackageObjCmd(
pkgFiles = (PkgFiles *) Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
if (pkgFiles) {
Tcl_HashEntry *entry =
- Tcl_FindHashEntry(&pkgFiles->table, Tcl_GetString(objv[2]));
+ Tcl_FindHashEntry(&pkgFiles->table, TclGetString(objv[2]));
if (entry) {
Tcl_SetObjResult(interp, (Tcl_Obj *)Tcl_GetHashValue(entry));
}
@@ -1351,7 +1351,7 @@ TclNRPackageObjCmd(
*/
ov = Tcl_NewStringObj(version, -1);
- Tcl_AppendStringsToObj(ov, "-", version, (void *)NULL);
+ Tcl_AppendStringsToObj(ov, "-", version, (char *)NULL);
version = NULL;
argv3 = TclGetString(objv[3]);
Tcl_IncrRefCount(objv[3]);
@@ -1753,7 +1753,7 @@ CheckVersionAndConvert(
ckfree(ibuf);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected version number but got \"%s\"", string));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSION", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSION", (char *)NULL);
return TCL_ERROR;
}
@@ -2016,7 +2016,7 @@ CheckRequirement(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected versionMin-versionMax but got \"%s\"", string));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSIONRANGE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSIONRANGE", (char *)NULL);
return TCL_ERROR;
}
diff --git a/generic/tclProc.c b/generic/tclProc.c
index a35fe60..31566da 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -182,14 +182,14 @@ Tcl_ProcObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't create procedure \"%s\": unknown namespace",
procName));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (char *)NULL);
return TCL_ERROR;
}
if (simpleName == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't create procedure \"%s\": bad procedure name",
procName));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (char *)NULL);
return TCL_ERROR;
}
@@ -497,7 +497,7 @@ TclCreateProc(
"precompiled header expects %" TCL_SIZE_MODIFIER "d", procName, numArgs,
procPtr->numArgs));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "BYTECODELIES", (void *)NULL);
+ "BYTECODELIES", (char *)NULL);
goto procError;
}
localPtr = procPtr->firstLocalPtr;
@@ -527,14 +527,14 @@ TclCreateProc(
Tcl_AppendToObj(errorObj, "\"", -1);
Tcl_SetObjResult(interp, errorObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "FORMALARGUMENTFORMAT", (void *)NULL);
+ "FORMALARGUMENTFORMAT", (char *)NULL);
goto procError;
}
if ((fieldCount == 0) || (TclGetCharLength(fieldValues[0]) == 0)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"argument with no name", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "FORMALARGUMENTFORMAT", (void *)NULL);
+ "FORMALARGUMENTFORMAT", (char *)NULL);
goto procError;
}
@@ -551,9 +551,9 @@ TclCreateProc(
if (*argnamelast == ')') { /* We have an array element. */
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"formal parameter \"%s\" is an array element",
- Tcl_GetString(fieldValues[0])));
+ TclGetString(fieldValues[0])));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "FORMALARGUMENTFORMAT", (void *)NULL);
+ "FORMALARGUMENTFORMAT", (char *)NULL);
goto procError;
}
} else if (*argnamei == ':' && *(argnamei+1) == ':') {
@@ -563,7 +563,7 @@ TclCreateProc(
Tcl_AppendToObj(errorObj, "\" is not a simple name", -1);
Tcl_SetObjResult(interp, errorObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "FORMALARGUMENTFORMAT", (void *)NULL);
+ "FORMALARGUMENTFORMAT", (char *)NULL);
goto procError;
}
argnamei++;
@@ -591,7 +591,7 @@ TclCreateProc(
"procedure \"%s\": formal parameter %" TCL_SIZE_MODIFIER "d is "
"inconsistent with precompiled body", procName, i));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "BYTECODELIES", (void *)NULL);
+ "BYTECODELIES", (char *)NULL);
goto procError;
}
@@ -614,7 +614,7 @@ TclCreateProc(
"default value inconsistent with precompiled body", -1);
Tcl_SetObjResult(interp, errorObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "BYTECODELIES", (void *)NULL);
+ "BYTECODELIES", (char *)NULL);
goto procError;
}
}
@@ -842,7 +842,7 @@ badLevel:
name = objPtr ? TclGetString(objPtr) : "1" ;
}
Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad level \"%s\"", name));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LEVEL", name, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LEVEL", name, (char *)NULL);
return -1;
}
@@ -1097,7 +1097,7 @@ ProcWrongNumArgs(
if (defPtr->value.objPtr != NULL) {
TclNewObj(argObj);
- Tcl_AppendStringsToObj(argObj, "?", TclGetString(namePtr), "?", (void *)NULL);
+ Tcl_AppendStringsToObj(argObj, "?", TclGetString(namePtr), "?", (char *)NULL);
} else if (defPtr->flags & VAR_IS_ARGS) {
numArgs--;
final = "?arg ...?";
@@ -1874,7 +1874,7 @@ InterpProcNR2(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invoked \"%s\" outside of a loop",
((result == TCL_BREAK) ? "break" : "continue")));
- Tcl_SetErrorCode(interp, "TCL", "RESULT", "UNEXPECTED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "RESULT", "UNEXPECTED", (char *)NULL);
result = TCL_ERROR;
/* FALLTHRU */
@@ -1958,7 +1958,7 @@ TclProcCompileProc(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"a precompiled script jumped interps", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
- "CROSSINTERPBYTECODE", (void *)NULL);
+ "CROSSINTERPBYTECODE", (char *)NULL);
return TCL_ERROR;
}
codePtr->compileEpoch = iPtr->compileEpoch;
@@ -1983,7 +1983,7 @@ TclProcCompileProc(
TclNewLiteralStringObj(message, "Compiling ");
Tcl_IncrRefCount(message);
- Tcl_AppendStringsToObj(message, description, " \"", (void *)NULL);
+ Tcl_AppendStringsToObj(message, description, " \"", (char *)NULL);
Tcl_AppendLimitedToObj(message, procName, TCL_INDEX_NONE, 50, NULL);
fprintf(stdout, "%s\"\n", TclGetString(message));
Tcl_DecrRefCount(message);
@@ -2469,16 +2469,16 @@ SetLambdaFromAny(
if ((result != TCL_OK) || ((objc != 2) && (objc != 3))) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't interpret \"%s\" as a lambda expression",
- Tcl_GetString(objPtr)));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "LAMBDA", (void *)NULL);
+ TclGetString(objPtr)));
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "LAMBDA", (char *)NULL);
return TCL_ERROR;
}
result = TclListObjGetElements(NULL, objPtr, &objc, &objv);
if ((result != TCL_OK) || ((objc != 2) && (objc != 3))) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't interpret \"%s\" as a lambda expression",
- Tcl_GetString(objPtr)));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "LAMBDA", (void *)NULL);
+ TclGetString(objPtr)));
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "LAMBDA", (char *)NULL);
return TCL_ERROR;
}
diff --git a/generic/tclResult.c b/generic/tclResult.c
index b35aee0..5497622 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -496,7 +496,7 @@ Tcl_GetStringResult(
*/
if (*(iPtr->result) == 0) {
- Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
+ Tcl_SetResult(interp, Tcl_GetString(Tcl_GetObjResult(interp)),
TCL_VOLATILE);
}
return iPtr->result;
@@ -1347,7 +1347,7 @@ TclProcessReturn(
if (valuePtr != NULL) {
Tcl_SetObjErrorCode(interp, valuePtr);
} else {
- Tcl_SetErrorCode(interp, "NONE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "NONE", (char *)NULL);
}
Tcl_DictObjGet(NULL, iPtr->returnOpts, keys[KEY_ERRORLINE],
@@ -1427,7 +1427,7 @@ TclMergeReturnOptions(
"bad %s value: expected dictionary but got \"%s\"",
compare, TclGetString(objv[1])));
Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_OPTIONS",
- (void *)NULL);
+ (char *)NULL);
goto error;
}
@@ -1476,7 +1476,7 @@ TclMergeReturnOptions(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad -level value: expected non-negative integer but got"
" \"%s\"", TclGetString(valuePtr)));
- Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_LEVEL", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_LEVEL", (char *)NULL);
goto error;
}
Tcl_DictObjRemove(NULL, returnOpts, keys[KEY_LEVEL]);
@@ -1499,7 +1499,7 @@ TclMergeReturnOptions(
"bad -errorcode value: expected a list but got \"%s\"",
TclGetString(valuePtr)));
Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_ERRORCODE",
- (void *)NULL);
+ (char *)NULL);
goto error;
}
}
@@ -1521,7 +1521,7 @@ TclMergeReturnOptions(
"bad -errorstack value: expected a list but got \"%s\"",
TclGetString(valuePtr)));
Tcl_SetErrorCode(interp, "TCL", "RESULT", "NONLIST_ERRORSTACK",
- (void *)NULL);
+ (char *)NULL);
goto error;
}
if (length % 2) {
@@ -1533,7 +1533,7 @@ TclMergeReturnOptions(
"forbidden odd-sized list for -errorstack: \"%s\"",
TclGetString(valuePtr)));
Tcl_SetErrorCode(interp, "TCL", "RESULT",
- "ODDSIZEDLIST_ERRORSTACK", (void *)NULL);
+ "ODDSIZEDLIST_ERRORSTACK", (char *)NULL);
goto error;
}
}
@@ -1686,7 +1686,7 @@ Tcl_SetReturnOptions(
|| (objc % 2)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected dict but got \"%s\"", TclGetString(options)));
- Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_OPTIONS", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_OPTIONS", (char *)NULL);
code = TCL_ERROR;
} else if (TCL_ERROR == TclMergeReturnOptions(interp, objc, objv,
&mergedOpts, &code, &level)) {
diff --git a/generic/tclScan.c b/generic/tclScan.c
index d2dcc70..8969240 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -341,7 +341,7 @@ ValidateFormat(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot mix \"%\" and \"%n$\" conversion specifiers",
-1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "MIXEDSPECTYPES", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "MIXEDSPECTYPES", (char *)NULL);
goto error;
}
@@ -390,7 +390,7 @@ ValidateFormat(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"field width may not be specified in %c conversion",
-1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADWIDTH", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADWIDTH", (char *)NULL);
goto error;
}
/* FALLTHRU */
@@ -404,7 +404,7 @@ ValidateFormat(
Tcl_AppendToObj(errorMsg, buf, -1);
Tcl_AppendToObj(errorMsg, " conversion", -1);
Tcl_SetObjResult(interp, errorMsg);
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADSIZE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADSIZE", (char *)NULL);
goto error;
}
/*
@@ -456,7 +456,7 @@ ValidateFormat(
badSet:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched [ in format string", -1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BRACKET", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BRACKET", (char *)NULL);
goto error;
default:
buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
@@ -465,7 +465,7 @@ ValidateFormat(
Tcl_AppendToObj(errorMsg, buf, -1);
Tcl_AppendToObj(errorMsg, "\"", -1);
Tcl_SetObjResult(interp, errorMsg);
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (char *)NULL);
goto error;
}
if (!(flags & SCAN_SUPPRESS)) {
@@ -512,7 +512,7 @@ ValidateFormat(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"variable is assigned by multiple \"%n$\" conversion specifiers",
-1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "POLYASSIGNED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "POLYASSIGNED", (char *)NULL);
goto error;
} else if (!xpgSize && (nassign[i] == 0)) {
/*
@@ -523,7 +523,7 @@ ValidateFormat(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"variable is not assigned by any conversion specifiers",
-1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "UNASSIGNED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "UNASSIGNED", (char *)NULL);
goto error;
}
}
@@ -535,12 +535,12 @@ ValidateFormat(
if (gotXpg) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"%n$\" argument index out of range", -1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "INDEXRANGE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "INDEXRANGE", (char *)NULL);
} else {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"different numbers of variable names and field specifiers",
-1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "FIELDVARMISMATCH", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "FIELDVARMISMATCH", (char *)NULL);
}
error:
@@ -590,7 +590,7 @@ Tcl_ScanObjCmd(
return TCL_ERROR;
}
- format = Tcl_GetString(objv[2]);
+ format = TclGetString(objv[2]);
numVars = objc-3;
/*
@@ -612,7 +612,7 @@ Tcl_ScanObjCmd(
}
}
- string = Tcl_GetString(objv[1]);
+ string = TclGetString(objv[1]);
baseString = string;
/*
@@ -930,7 +930,7 @@ Tcl_ScanObjCmd(
if (mp_init_u64(&big, (Tcl_WideUInt)wideValue) != MP_OKAY) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"insufficient memory to create bignum", -1));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
return TCL_ERROR;
} else {
Tcl_SetBignumObj(objPtr, &big);
@@ -958,7 +958,7 @@ Tcl_ScanObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unsigned bignum scans are invalid", -1));
Tcl_SetErrorCode(interp, "TCL", "FORMAT",
- "BADUNSIGNED", (void *)NULL);
+ "BADUNSIGNED", (char *)NULL);
return TCL_ERROR;
}
}
@@ -976,7 +976,7 @@ Tcl_ScanObjCmd(
if (mp_init_u64(&big, (unsigned long)value) != MP_OKAY) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"insufficient memory to create bignum", -1));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
return TCL_ERROR;
} else {
Tcl_SetBignumObj(objPtr, &big);
diff --git a/generic/tclStrIdxTree.c b/generic/tclStrIdxTree.c
index f764d02..2924829 100644
--- a/generic/tclStrIdxTree.c
+++ b/generic/tclStrIdxTree.c
@@ -478,7 +478,7 @@ TclStrIdxTreeTestObjCmd(
if (Tcl_GetIndexFromObj(interp, objv[1], options,
"option", 0, &optionIndex) != TCL_OK) {
Tcl_SetErrorCode(interp, "CLOCK", "badOption",
- Tcl_GetString(objv[1]), (char *)NULL);
+ TclGetString(objv[1]), (char *)NULL);
return TCL_ERROR;
}
switch (optionIndex) {
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index fc697f9..41b2428 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -659,7 +659,7 @@ Tcl_GetCharLength(
if (TclIsPureByteArray(objPtr)) {
(void) Tcl_GetByteArrayFromObj(objPtr, &numChars);
} else {
- Tcl_GetString(objPtr);
+ TclGetString(objPtr);
numChars = TclNumUtfChars(objPtr->bytes, objPtr->length);
}
@@ -2905,7 +2905,7 @@ Tcl_AppendFormatToObj(
if (interp != NULL) {
Tcl_SetObjResult(interp,
Tcl_ObjPrintf("bad field specifier \"%c\"", ch));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (char *)NULL);
}
goto error;
}
@@ -2965,7 +2965,7 @@ Tcl_AppendFormatToObj(
errorMsg:
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, (char *)NULL);
}
error:
Tcl_SetObjLength(appendObj, originalLength);
@@ -3220,7 +3220,7 @@ AppendPrintfToObjVA(
if (code != TCL_OK) {
Tcl_AppendPrintfToObj(objPtr,
"Unable to format \"%s\" with supplied arguments: %s",
- format, Tcl_GetString(list));
+ format, TclGetString(list));
}
Tcl_DecrRefCount(list);
}
@@ -3382,7 +3382,7 @@ TclStringRepeat(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"max size for a Tcl value (%" TCL_SIZE_MODIFIER
"d bytes) exceeded", TCL_SIZE_MAX));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -3419,7 +3419,7 @@ TclStringRepeat(
"string size overflow: unable to alloc %"
TCL_Z_MODIFIER "u bytes",
UNICHAR_STRING_SIZE(count*length)));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -3436,7 +3436,7 @@ TclStringRepeat(
*/
if (!inPlace || Tcl_IsShared(objPtr)) {
- objResultPtr = Tcl_NewStringObj(Tcl_GetString(objPtr), length);
+ objResultPtr = Tcl_NewStringObj(TclGetString(objPtr), length);
} else {
TclFreeInternalRep(objPtr);
objResultPtr = objPtr;
@@ -3446,7 +3446,7 @@ TclStringRepeat(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"string size overflow: unable to alloc %" TCL_SIZE_MODIFIER "d bytes",
count*length));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -3455,7 +3455,7 @@ TclStringRepeat(
Tcl_AppendObjToObj(objResultPtr, objResultPtr);
done *= 2;
}
- Tcl_AppendToObj(objResultPtr, Tcl_GetString(objResultPtr),
+ Tcl_AppendToObj(objResultPtr, TclGetString(objResultPtr),
(count - done) * length);
}
return objResultPtr;
@@ -3741,7 +3741,7 @@ TclStringCat(
"concatenation failed: unable to alloc %"
TCL_Z_MODIFIER "u bytes",
UNICHAR_STRING_SIZE(length)));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -3758,7 +3758,7 @@ TclStringCat(
"concatenation failed: unable to alloc %"
TCL_Z_MODIFIER "u bytes",
UNICHAR_STRING_SIZE(length)));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -3789,11 +3789,11 @@ TclStringCat(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"concatenation failed: unable to alloc %" TCL_SIZE_MODIFIER "d bytes",
length));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
- dst = Tcl_GetString(objResultPtr) + start;
+ dst = TclGetString(objResultPtr) + start;
TclFreeInternalRep(objResultPtr);
} else {
@@ -3804,11 +3804,11 @@ TclStringCat(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"concatenation failed: unable to alloc %" TCL_SIZE_MODIFIER "d bytes",
length));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
- dst = Tcl_GetString(objResultPtr);
+ dst = TclGetString(objResultPtr);
}
while (objc--) {
Tcl_Obj *objPtr = *objv++;
@@ -3830,7 +3830,7 @@ TclStringCat(
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"max size for a Tcl value (%" TCL_SIZE_MODIFIER "d bytes) exceeded", TCL_SIZE_MAX));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
@@ -4502,7 +4502,7 @@ TclStringReplace(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"max size for a Tcl value (%" TCL_SIZE_MODIFIER "d bytes) exceeded",
TCL_SIZE_MAX));
- Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return NULL;
}
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 2b0b44b..a3144be 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -415,7 +415,7 @@ static const char *TclGetStartupScriptFileName(void)
if (path == NULL) {
return NULL;
}
- return Tcl_GetString(path);
+ return TclGetString(path);
}
#if defined(_WIN32) || defined(__CYGWIN__)
#undef TclWinNToHS
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 954e38f..d921854 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -820,13 +820,13 @@ Tcl_AfterObjCmd(
if (Tcl_GetWideIntFromObj(NULL, objv[1], &ms) != TCL_OK) {
if (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0, &index)
!= TCL_OK) {
- const char *arg = Tcl_GetString(objv[1]);
+ const char *arg = TclGetString(objv[1]);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad argument \"%s\": must be"
" cancel, idle, info, or an integer", arg));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "INDEX", "argument",
- arg, (void *)NULL);
+ arg, (char *)NULL);
return TCL_ERROR;
}
}
@@ -965,7 +965,7 @@ Tcl_AfterObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"event \"%s\" doesn't exist", eventStr));
- Tcl_SetErrorCode(interp, "TCL","LOOKUP","EVENT", eventStr, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL","LOOKUP","EVENT", eventStr, (char *)NULL);
return TCL_ERROR;
} else {
Tcl_Obj *resultListPtr;
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 2ef358c..733685a 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -335,7 +335,7 @@ Tcl_TraceObjCmd(
return TCL_ERROR;
}
TclNewObj(resultListPtr);
- name = Tcl_GetString(objv[2]);
+ name = TclGetString(objv[2]);
FOREACH_VAR_TRACE(interp, name, clientData) {
TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
char *q = ops;
@@ -384,7 +384,7 @@ Tcl_TraceObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad operations \"%s\": should be one or more of rwua",
flagOps));
- Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "BADOPS", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "BADOPS", (char *)NULL);
return TCL_ERROR;
#endif
}
@@ -452,7 +452,7 @@ TraceExecutionObjCmd(
"bad operation list \"\": must be one or more of"
" enter, leave, enterstep, or leavestep", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
result = TclListObjGetElements(interp, objv[4], &listLen, &elemPtrs);
@@ -496,7 +496,7 @@ TraceExecutionObjCmd(
flags |= (TCL_TRACE_ENTER_EXEC | TCL_TRACE_LEAVE_EXEC);
}
memcpy(tcmdPtr->command, command, length+1);
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (Tcl_TraceCommand(interp, name, flags, TraceCommandProc,
tcmdPtr) != TCL_OK) {
ckfree(tcmdPtr);
@@ -515,7 +515,7 @@ TraceExecutionObjCmd(
* First ensure the name given is valid.
*/
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (Tcl_FindCommand(interp,name,NULL,TCL_LEAVE_ERR_MSG) == NULL) {
return TCL_ERROR;
}
@@ -576,7 +576,7 @@ TraceExecutionObjCmd(
return TCL_ERROR;
}
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
/*
* First ensure the name given is valid.
@@ -699,7 +699,7 @@ TraceCommandObjCmd(
"bad operation list \"\": must be one or more of"
" delete or rename", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
result = TclListObjGetElements(interp, objv[4], &listLen, &elemPtrs);
@@ -734,7 +734,7 @@ TraceCommandObjCmd(
tcmdPtr->refCount = 1;
flags |= TCL_TRACE_DELETE;
memcpy(tcmdPtr->command, command, length+1);
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (Tcl_TraceCommand(interp, name, flags, TraceCommandProc,
tcmdPtr) != TCL_OK) {
ckfree(tcmdPtr);
@@ -753,7 +753,7 @@ TraceCommandObjCmd(
* First ensure the name given is valid.
*/
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (Tcl_FindCommand(interp,name,NULL,TCL_LEAVE_ERR_MSG) == NULL) {
return TCL_ERROR;
}
@@ -789,7 +789,7 @@ TraceCommandObjCmd(
* First ensure the name given is valid.
*/
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (Tcl_FindCommand(interp, name, NULL, TCL_LEAVE_ERR_MSG) == NULL) {
return TCL_ERROR;
}
@@ -903,7 +903,7 @@ TraceVariableObjCmd(
"bad operation list \"\": must be one or more of"
" array, read, unset, or write", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
result = TclListObjGetElements(interp, objv[4], &listLen, &elemPtrs);
@@ -948,7 +948,7 @@ TraceVariableObjCmd(
ctvarPtr->traceInfo.traceProc = TraceVarProc;
ctvarPtr->traceInfo.clientData = &ctvarPtr->traceCmdInfo;
ctvarPtr->traceInfo.flags = flags;
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
if (TraceVarEx(interp, name, NULL, (VarTrace *) ctvarPtr)
!= TCL_OK) {
ckfree(ctvarPtr);
@@ -961,7 +961,7 @@ TraceVariableObjCmd(
* first one that matches.
*/
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
FOREACH_VAR_TRACE(interp, name, clientData) {
TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
@@ -991,7 +991,7 @@ TraceVariableObjCmd(
}
TclNewObj(resultListPtr);
- name = Tcl_GetString(objv[3]);
+ name = TclGetString(objv[3]);
FOREACH_VAR_TRACE(interp, name, clientData) {
Tcl_Obj *opObjPtr, *eachTraceObjPtr, *elemObjPtr;
TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
@@ -1854,7 +1854,7 @@ TraceExecutionProc(
Tcl_DStringInit(&sub);
for (i = 0; i < objc; i++) {
- Tcl_DStringAppendElement(&sub, Tcl_GetString(objv[i]));
+ Tcl_DStringAppendElement(&sub, TclGetString(objv[i]));
}
Tcl_DStringAppendElement(&cmd, Tcl_DStringValue(&sub));
Tcl_DStringFree(&sub);
@@ -1878,7 +1878,7 @@ TraceExecutionProc(
*/
TclNewIntObj(resultCode, code);
- resultCodeStr = Tcl_GetString(resultCode);
+ resultCodeStr = TclGetString(resultCode);
Tcl_DStringAppendElement(&cmd, resultCodeStr);
Tcl_DecrRefCount(resultCode);
@@ -2296,7 +2296,7 @@ StringTraceProc(
argv = (const char **) TclStackAlloc(interp,
(objc + 1) * sizeof(const char *));
for (i = 0; i < objc; i++) {
- argv[i] = Tcl_GetString(objv[i]);
+ argv[i] = TclGetString(objv[i]);
}
argv[objc] = 0;
@@ -2802,7 +2802,7 @@ TclCallVarTraces(
(part2 ? ")" : "") ));
if (disposeFlags & TCL_TRACE_RESULT_OBJECT) {
TclVarErrMsg((Tcl_Interp *) iPtr, part1, part2, verb,
- Tcl_GetString((Tcl_Obj *) result));
+ TclGetString((Tcl_Obj *) result));
} else {
TclVarErrMsg((Tcl_Interp *) iPtr, part1, part2, verb, result);
}
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 2219c84..c73841f 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -656,7 +656,7 @@ FindElement(
"%s element in braces followed by \"%.*s\" "
"instead of space", typeStr, (int) (p2-p), p));
Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
}
@@ -708,7 +708,7 @@ FindElement(
"%s element in quotes followed by \"%.*s\" "
"instead of space", typeStr, (int) (p2-p), p));
Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
}
@@ -741,7 +741,7 @@ FindElement(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unmatched open brace in %s", typeStr));
Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "BRACE",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
} else if (inQuotes) {
@@ -749,7 +749,7 @@ FindElement(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unmatched open quote in %s", typeStr));
Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "QUOTE",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
}
@@ -900,7 +900,7 @@ Tcl_SplitList(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"internal error in Tcl_SplitList", -1));
Tcl_SetErrorCode(interp, "TCL", "INTERNAL", "Tcl_SplitList",
- (void *)NULL);
+ (char *)NULL);
}
return TCL_ERROR;
}
@@ -2044,7 +2044,7 @@ Tcl_ConcatObj(
if (elemPtr == NULL) {
continue;
}
- if (Tcl_GetString(elemPtr)[0] == '#' || TCL_OK
+ if (TclGetString(elemPtr)[0] == '#' || TCL_OK
!= Tcl_ListObjAppendList(NULL, resPtr, objPtr)) {
/* Abandon ship! */
Tcl_DecrRefCount(resPtr);
@@ -3997,7 +3997,7 @@ GetEndOffsetFromObj(
bytes += 4;
}
TclCheckBadOctal(interp, bytes);
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", (char *)NULL);
}
return TCL_ERROR;
@@ -4807,7 +4807,7 @@ TclReToGlob(
invalidGlob:
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
- Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, (char *)NULL);
}
Tcl_DStringFree(dsPtr);
return TCL_ERROR;
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 48e8cc3..570ab99 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -337,11 +337,11 @@ NotArrayError(
Tcl_Interp *interp,
Tcl_Obj *name)
{
- const char *nameStr = Tcl_GetString(name);
+ const char *nameStr = TclGetString(name);
Tcl_SetObjResult(interp,
Tcl_ObjPrintf("\"%s\" isn't an array", nameStr));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", nameStr, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", nameStr, (char *)NULL);
return TCL_ERROR;
}
@@ -645,7 +645,7 @@ TclObjLookupVarEx(
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg,
NOSUCHVAR, -1);
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "VARNAME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "VARNAME", (char *)NULL);
}
return NULL;
}
@@ -671,7 +671,7 @@ TclObjLookupVarEx(
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg,
NEEDARRAY, -1);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "VARNAME",
- (void *)NULL);
+ (char *)NULL);
}
return NULL;
}
@@ -699,7 +699,7 @@ TclObjLookupVarEx(
if ((errMsg != NULL) && (flags & TCL_LEAVE_ERR_MSG)) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg, errMsg, -1);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- TclGetString(part1Ptr), (void *)NULL);
+ TclGetString(part1Ptr), (char *)NULL);
}
return NULL;
}
@@ -1086,7 +1086,7 @@ TclLookupArrayElement(
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
NOSUCHVAR, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- arrayNamePtr?TclGetString(arrayNamePtr):NULL, (void *)NULL);
+ arrayNamePtr?TclGetString(arrayNamePtr):NULL, (char *)NULL);
}
return NULL;
}
@@ -1101,7 +1101,7 @@ TclLookupArrayElement(
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
DANGLINGVAR, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- arrayNamePtr?TclGetString(arrayNamePtr):NULL, (void *)NULL);
+ arrayNamePtr?TclGetString(arrayNamePtr):NULL, (char *)NULL);
}
return NULL;
}
@@ -1112,7 +1112,7 @@ TclLookupArrayElement(
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg, NEEDARRAY,
index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- arrayNamePtr?TclGetString(arrayNamePtr):NULL, (void *)NULL);
+ arrayNamePtr?TclGetString(arrayNamePtr):NULL, (char *)NULL);
}
return NULL;
}
@@ -1133,7 +1133,7 @@ TclLookupArrayElement(
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
NOSUCHELEMENT, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ELEMENT",
- TclGetString(elNamePtr), (void *)NULL);
+ TclGetString(elNamePtr), (char *)NULL);
}
}
}
@@ -1496,7 +1496,7 @@ TclPtrGetVarIdx(
*/
errorReturn:
- Tcl_SetErrorCode(interp, "TCL", "READ", "VARNAME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "READ", "VARNAME", (char *)NULL);
if (TclIsVarUndefined(varPtr)) {
TclCleanupVar(varPtr, arrayPtr);
}
@@ -2021,11 +2021,11 @@ TclPtrSetVarIdx(
if (TclIsVarArrayElement(varPtr)) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "set",
DANGLINGELEMENT, index);
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ELEMENT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ELEMENT", (char *)NULL);
} else {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "set",
DANGLINGVAR, index);
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME", (char *)NULL);
}
}
goto earlyError;
@@ -2038,7 +2038,7 @@ TclPtrSetVarIdx(
if (TclIsVarArray(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "set", ISARRAY,index);
- Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
}
goto earlyError;
}
@@ -2131,7 +2131,7 @@ TclPtrSetVarIdx(
cleanup:
if (resultPtr == NULL) {
- Tcl_SetErrorCode(interp, "TCL", "WRITE", "VARNAME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "WRITE", "VARNAME", (char *)NULL);
}
if (TclIsVarUndefined(varPtr)) {
TclCleanupVar(varPtr, arrayPtr);
@@ -2606,7 +2606,7 @@ TclPtrUnsetVarIdx(
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "unset",
((arrayPtr == NULL) ? NOSUCHVAR : NOSUCHELEMENT), index);
- Tcl_SetErrorCode(interp, "TCL", "UNSET", "VARNAME", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UNSET", "VARNAME", (char *)NULL);
}
}
@@ -3195,7 +3195,7 @@ ArrayForNRCmd(
if (numVars != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must have two variable names", -1));
- Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", (char *)NULL);
return TCL_ERROR;
}
@@ -3297,7 +3297,7 @@ ArrayForLoopCallback(
if (done == TCL_ERROR) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"array changed during iteration", -1));
- Tcl_SetErrorCode(interp, "TCL", "READ", "array", "for", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "READ", "array", "for", (char *)NULL);
varPtr->flags |= TCL_LEAVE_ERR_MSG;
result = done;
}
@@ -4112,7 +4112,7 @@ ArraySetCmd(
CleanupVar(varPtr, arrayPtr);
TclObjVarErrMsg(interp, arrayNameObj, NULL, "set", NEEDARRAY, -1);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- TclGetString(arrayNameObj), (void *)NULL);
+ TclGetString(arrayNameObj), (char *)NULL);
return TCL_ERROR;
}
@@ -4179,7 +4179,7 @@ ArraySetCmd(
if (elemLen & 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"list must have an even number of elements", -1));
- Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", (char *)NULL);
return TCL_ERROR;
}
if (elemLen == 0) {
@@ -4238,7 +4238,7 @@ ArraySetCmd(
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array set",
NEEDARRAY, -1);
- Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
return TCL_ERROR;
}
}
@@ -4622,7 +4622,7 @@ ObjMakeUpvar(
"bad variable name \"%s\": can't create namespace "
"variable that refers to procedure variable",
TclGetString(myNamePtr)));
- Tcl_SetErrorCode(interp, "TCL", "UPVAR", "INVERTED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UPVAR", "INVERTED", (char *)NULL);
return TCL_ERROR;
}
}
@@ -4738,7 +4738,7 @@ TclPtrObjMakeUpvarIdx(
"bad variable name \"%s\": can't create a scalar "
"variable that looks like an array element", myName));
Tcl_SetErrorCode(interp, "TCL", "UPVAR", "LOCAL_ELEMENT",
- (void *)NULL);
+ (char *)NULL);
return TCL_ERROR;
}
}
@@ -4757,7 +4757,7 @@ TclPtrObjMakeUpvarIdx(
if (varPtr == NULL) {
TclObjVarErrMsg(interp, myNamePtr, NULL, "create", errMsg, -1);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- TclGetString(myNamePtr), (void *)NULL);
+ TclGetString(myNamePtr), (char *)NULL);
return TCL_ERROR;
}
}
@@ -4765,14 +4765,14 @@ TclPtrObjMakeUpvarIdx(
if (varPtr == otherPtr) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_NewStringObj(
"can't upvar from variable to itself", -1));
- Tcl_SetErrorCode(interp, "TCL", "UPVAR", "SELF", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UPVAR", "SELF", (char *)NULL);
return TCL_ERROR;
}
if (TclIsVarTraced(varPtr)) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_ObjPrintf(
"variable \"%s\" has traces: can't use for upvar", myName));
- Tcl_SetErrorCode(interp, "TCL", "UPVAR", "TRACED", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UPVAR", "TRACED", (char *)NULL);
return TCL_ERROR;
} else if (!TclIsVarUndefined(varPtr)) {
Var *linkPtr;
@@ -4787,7 +4787,7 @@ TclPtrObjMakeUpvarIdx(
if (!TclIsVarLink(varPtr)) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_ObjPrintf(
"variable \"%s\" already exists", myName));
- Tcl_SetErrorCode(interp, "TCL", "UPVAR", "EXISTS", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UPVAR", "EXISTS", (char *)NULL);
return TCL_ERROR;
}
@@ -5139,7 +5139,7 @@ Tcl_VariableObjCmd(
TclObjVarErrMsg(interp, varNamePtr, NULL, "define",
ISARRAYELEMENT, -1);
- Tcl_SetErrorCode(interp, "TCL", "UPVAR", "LOCAL_ELEMENT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "UPVAR", "LOCAL_ELEMENT", (char *)NULL);
return TCL_ERROR;
}
@@ -5290,7 +5290,7 @@ Tcl_UpvarObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad level \"%s\"", TclGetString(levelObj)));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LEVEL",
- TclGetString(levelObj), (void *)NULL);
+ TclGetString(levelObj), (char *)NULL);
return TCL_ERROR;
}
@@ -5381,7 +5381,7 @@ ParseSearchId(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't find search \"%s\"", handle));
}
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAYSEARCH", handle, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAYSEARCH", handle, (char *)NULL);
return NULL;
}
@@ -6021,7 +6021,7 @@ ObjFindNamespaceVar(
if ((varPtr == NULL) && (flags & TCL_LEAVE_ERR_MSG)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unknown variable \"%s\"", name));
- Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARIABLE", name, (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARIABLE", name, (char *)NULL);
}
return (Tcl_Var) varPtr;
}
@@ -6687,7 +6687,7 @@ ArrayDefaultCmd(
/* Array default must exist. */
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"array has no default value", -1));
- Tcl_SetErrorCode(interp, "TCL", "READ", "ARRAY", "DEFAULT", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "READ", "ARRAY", "DEFAULT", (char *)NULL);
return TCL_ERROR;
}
Tcl_SetObjResult(interp, defaultValueObj);
@@ -6717,7 +6717,7 @@ ArrayDefaultCmd(
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array default set",
NEEDARRAY, -1);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
- TclGetString(arrayNameObj), (void *)NULL);
+ TclGetString(arrayNameObj), (char *)NULL);
return TCL_ERROR;
}
if (!TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
@@ -6727,7 +6727,7 @@ ArrayDefaultCmd(
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array default set",
NEEDARRAY, -1);
- Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (void *)NULL);
+ Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
return TCL_ERROR;
}
generated by cgit v0.12 at 2025-12-03 22:40:13 (GMT)