diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:34:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:34:55 (GMT) |
| commit | 4783b95fdf1f9e23fb3ed20b5a6163fc755f3ee3 (patch) | |
| tree | b4d529834d9a0918a35da3c1b8b599102b22193a /generic/tclEnsemble.c | |
| parent | 276fee0021d4a330665cee2e7d874ee4ffecf35b (diff) | |
| parent | d8785b835887dc0c3e6669537d6afbc4389b2153 (diff) | |
| download | tcl-4783b95fdf1f9e23fb3ed20b5a6163fc755f3ee3.zip tcl-4783b95fdf1f9e23fb3ed20b5a6163fc755f3ee3.tar.gz tcl-4783b95fdf1f9e23fb3ed20b5a6163fc755f3ee3.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index a829b59..e735532 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -1771,7 +1771,7 @@ NsEnsembleImplementationCmdNR( int tableLength = ensemblePtr->subcommandTable.numEntries; Tcl_Obj *fix; - subcmdName = Tcl_GetStringFromObj(subObj, &stringLength); + subcmdName = TclGetStringFromObj(subObj, &stringLength); for (i=0 ; i<tableLength ; i++) { register int cmp = strncmp(subcmdName, ensemblePtr->subcommandArrayPtr[i], @@ -2913,7 +2913,7 @@ TclCompileEnsemble( goto failed; } for (i=0 ; i<len ; i++) { - str = Tcl_GetStringFromObj(elems[i], &sclen); + str = TclGetStringFromObj(elems[i], &sclen); if ((sclen == (int) numBytes) && !memcmp(word, str, numBytes)) { /* * Exact match! Excellent! @@ -3315,7 +3315,7 @@ CompileToInvokedCommand( for (i = 0, tokPtr = parsePtr->tokenPtr; i < parsePtr->numWords; i++, tokPtr = TokenAfter(tokPtr)) { if (i > 0 && i < numWords+1) { - bytes = Tcl_GetStringFromObj(words[i-1], &length); + bytes = TclGetStringFromObj(words[i-1], &length); PushLiteral(envPtr, bytes, length); continue; } @@ -3344,7 +3344,7 @@ CompileToInvokedCommand( objPtr = Tcl_NewObj(); Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr); - bytes = Tcl_GetStringFromObj(objPtr, &length); + bytes = TclGetStringFromObj(objPtr, &length); cmdLit = TclRegisterNewCmdLiteral(envPtr, bytes, length); TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLit), cmdPtr); TclEmitPush(cmdLit, envPtr); |