summaryrefslogtreecommitdiffstats
path: root/generic/tclEnsemble.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-01-24 15:23:21 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-01-24 15:23:21 (GMT)
commit875e3b392ba9b930fa009077b451b08f15b4ea72 (patch)
treeafae8bec56f97b204eec4b7bc70855fd26f76d46 /generic/tclEnsemble.c
parent8997eb06b951e71416f99c512ebed977f8cb61fb (diff)
downloadtcl-875e3b392ba9b930fa009077b451b08f15b4ea72.zip
tcl-875e3b392ba9b930fa009077b451b08f15b4ea72.tar.gz
tcl-875e3b392ba9b930fa009077b451b08f15b4ea72.tar.bz2
change signature for Tcl_DictObjPutKeyList and Tcl_DictObjRemoveKeyList too
Diffstat (limited to 'generic/tclEnsemble.c')
-rw-r--r--generic/tclEnsemble.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 49ac9af..4131651 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -940,11 +940,12 @@ Tcl_SetEnsembleMappingDict(
return TCL_ERROR;
}
if (mapDict != NULL) {
- int size, done;
+ size_t size;
+ int done;
Tcl_DictSearch search;
Tcl_Obj *valuePtr;
- if (TclDictObjSize_(interp, mapDict, &size) != TCL_OK) {
+ if (Tcl_DictObjSize(interp, mapDict, &size) != TCL_OK) {
return TCL_ERROR;
}
@@ -3377,8 +3378,8 @@ CompileToInvokedCommand(
Tcl_Token *tokPtr;
Tcl_Obj *objPtr, **words;
const char *bytes;
- int i, numWords, cmdLit, extraLiteralFlags = LITERAL_CMD_NAME;
- size_t length;
+ int i, cmdLit, extraLiteralFlags = LITERAL_CMD_NAME;
+ size_t numWords, length;
/*
* Push the words of the command. Take care; the command words may be
@@ -3386,10 +3387,10 @@ CompileToInvokedCommand(
* difference. Hence the call to TclContinuationsEnterDerived...
*/
- TclListObjGetElements_(NULL, replacements, &numWords, &words);
+ Tcl_ListObjGetElements(NULL, replacements, &numWords, &words);
for (i = 0, tokPtr = parsePtr->tokenPtr; i < parsePtr->numWords;
i++, tokPtr = TokenAfter(tokPtr)) {
- if (i > 0 && i < numWords+1) {
+ if (i > 0 && (size_t)i <= numWords) {
bytes = Tcl_GetStringFromObj(words[i-1], &length);
PushLiteral(envPtr, bytes, length);
continue;