diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
| commit | ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8 (patch) | |
| tree | 030ee9cf12979f70eb1ad6b6b4a9f837d16df58e /generic/tclCompile.c | |
| parent | bc213f0ba3bb7a24f5590a18ac322b79c04a9b99 (diff) | |
| parent | f256ed021d99bae8aba1ef9b86f347f91d5e6574 (diff) | |
| download | tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.zip tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.tar.gz tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclCompile.c')
| -rw-r--r-- | generic/tclCompile.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index d20940c..e0208fc 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -766,7 +766,8 @@ TclSetByteCodeFromAny( Interp *iPtr = (Interp *) interp; CompileEnv compEnv; /* Compilation environment structure allocated * in frame. */ - int length, result = TCL_OK; + size_t length; + int result = TCL_OK; const char *stringPtr; Proc *procPtr = iPtr->compiledProcPtr; ContLineLoc *clLocPtr; @@ -781,7 +782,8 @@ TclSetByteCodeFromAny( } #endif - stringPtr = TclGetStringFromObj(objPtr, &length); + stringPtr = TclGetString(objPtr); + length = objPtr->length; /* * TIP #280: Pick up the CmdFrame in which the BC compiler was invoked and @@ -2982,7 +2984,8 @@ TclFindCompiledLocal( varNamePtr = &cachePtr->varName0; for (i=0; i < cachePtr->numVars; varNamePtr++, i++) { if (*varNamePtr) { - localName = TclGetStringFromObj(*varNamePtr, &len); + localName = TclGetString(*varNamePtr); + len = (*varNamePtr)->length; if ((len == nameBytes) && !strncmp(name, localName, len)) { return i; } |