summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-23 15:55:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-23 15:55:22 (GMT)
commitae9ebe2176735ef72c34dfb900fb7ab8987af916 (patch)
tree2e61698db1a024853532babb928c1a78da91c854
parent3985945f9669690864b57255c7b246c47505fd2f (diff)
parentb726273bbea296990f6c4c7e98a213f56ce07bc5 (diff)
downloadtcl-ae9ebe2176735ef72c34dfb900fb7ab8987af916.zip
tcl-ae9ebe2176735ef72c34dfb900fb7ab8987af916.tar.gz
tcl-ae9ebe2176735ef72c34dfb900fb7ab8987af916.tar.bz2
Merge 8.7
-rw-r--r--generic/tclTest.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 74fd620..ca2d9cb 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1166,7 +1166,6 @@ CmdProc1(
return TCL_OK;
}
-
static int
CmdProc2(
void *clientData, /* String to return. */
@@ -1243,8 +1242,8 @@ TestcmdtokenCmd(
const char **argv) /* Argument strings. */
{
TestCommandTokenRef *refPtr;
- char buf[30];
int id;
+ char buf[30];
if (argc != 3) {
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
@@ -2153,19 +2152,19 @@ static int UtfExtWrapper(
Tcl_Obj *resultObjs[3];
switch (result) {
case TCL_OK:
- resultObjs[0] = Tcl_NewStringObj("ok", -1);
+ resultObjs[0] = Tcl_NewStringObj("ok", TCL_INDEX_NONE);
break;
case TCL_CONVERT_MULTIBYTE:
- resultObjs[0] = Tcl_NewStringObj("multibyte", -1);
+ resultObjs[0] = Tcl_NewStringObj("multibyte", TCL_INDEX_NONE);
break;
case TCL_CONVERT_SYNTAX:
- resultObjs[0] = Tcl_NewStringObj("syntax", -1);
+ resultObjs[0] = Tcl_NewStringObj("syntax", TCL_INDEX_NONE);
break;
case TCL_CONVERT_UNKNOWN:
- resultObjs[0] = Tcl_NewStringObj("unknown", -1);
+ resultObjs[0] = Tcl_NewStringObj("unknown", TCL_INDEX_NONE);
break;
case TCL_CONVERT_NOSPACE:
- resultObjs[0] = Tcl_NewStringObj("nospace", -1);
+ resultObjs[0] = Tcl_NewStringObj("nospace", TCL_INDEX_NONE);
break;
default:
resultObjs[0] = Tcl_NewIntObj(result);