diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-03-17 10:57:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-03-17 10:57:24 (GMT) |
| commit | 5dbf2681d7206b079a706e9db96e4cf3f43edb25 (patch) | |
| tree | 30692de3b7cd3e9f047d1c37c3b09c97b14b73db /generic/tclBasic.c | |
| parent | 709c26db6735431a77f3509d28a5c6c6309709bd (diff) | |
| download | tcl-5dbf2681d7206b079a706e9db96e4cf3f43edb25.zip tcl-5dbf2681d7206b079a706e9db96e4cf3f43edb25.tar.gz tcl-5dbf2681d7206b079a706e9db96e4cf3f43edb25.tar.bz2 | |
If Tcl is compiled with -DTCL_NO_DEPRECATED, make sure that iPtr->(resultSpace|appendResult|appendAvl|appendUsed) are not used any more.
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 32caac5..685e64c 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -510,7 +510,11 @@ Tcl_CreateInterp(void) iPtr = ckalloc(sizeof(Interp)); interp = (Tcl_Interp *) iPtr; +#ifdef TCL_NO_DEPRECATED + iPtr->result = &tclEmptyString; +#else iPtr->result = iPtr->resultSpace; +#endif iPtr->freeProc = NULL; iPtr->errorLine = 0; iPtr->objResultPtr = Tcl_NewObj(); @@ -570,9 +574,11 @@ Tcl_CreateInterp(void) iPtr->rootFramePtr = NULL; /* Initialise as soon as :: is available */ iPtr->lookupNsPtr = NULL; +#ifndef TCL_NO_DEPRECATED iPtr->appendResult = NULL; iPtr->appendAvl = 0; iPtr->appendUsed = 0; +#endif Tcl_InitHashTable(&iPtr->packageTable, TCL_STRING_KEYS); iPtr->packageUnknown = NULL; @@ -602,7 +608,9 @@ Tcl_CreateInterp(void) iPtr->emptyObjPtr = Tcl_NewObj(); /* Another empty object. */ Tcl_IncrRefCount(iPtr->emptyObjPtr); +#ifndef TCL_NO_DEPRECATED iPtr->resultSpace[0] = 0; +#endif iPtr->threadId = Tcl_GetCurrentThread(); /* TIP #378 */ @@ -1535,10 +1543,12 @@ DeleteInterpProc( if (iPtr->returnOpts) { Tcl_DecrRefCount(iPtr->returnOpts); } +#ifndef TCL_NO_DEPRECATED if (iPtr->appendResult != NULL) { ckfree(iPtr->appendResult); iPtr->appendResult = NULL; } +#endif TclFreePackageInfo(iPtr); while (iPtr->tracePtr != NULL) { Tcl_DeleteTrace((Tcl_Interp *) iPtr, (Tcl_Trace) iPtr->tracePtr); |