summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-15 13:01:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-15 13:01:43 (GMT)
commite1bfb4b3a06ef2a5199b7587116f35242d185e98 (patch)
tree8d457751baabd7840d15061acf0648e391baba39
parent49d6f7665369c30b02e1abe548c335ef72ece203 (diff)
downloadtcl-e1bfb4b3a06ef2a5199b7587116f35242d185e98.zip
tcl-e1bfb4b3a06ef2a5199b7587116f35242d185e98.tar.gz
tcl-e1bfb4b3a06ef2a5199b7587116f35242d185e98.tar.bz2
Eliminate last use of Tcl_SetResult (except the use in the Test suite)
Fix depreciation message in tcl.h
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclLoadNone.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 2556a9a..0f79e4b 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -504,11 +504,11 @@ typedef struct Tcl_Interp
/* TIP #330: Strongly discourage extensions from using the string
* result. */
#ifdef USE_INTERP_RESULT
- char *result TCL_DEPRECATED_API("use Tcl_GetResult/Tcl_SetResult");
+ char *result TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
/* If the last command returned a string
* result, this points to it. */
void (*freeProc) (char *blockPtr)
- TCL_DEPRECATED_API("use Tcl_GetResult/Tcl_SetResult");
+ TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
/* Zero means the string result is statically
* allocated. TCL_DYNAMIC means it was
* allocated with ckalloc and should be freed
diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
index 5a2dc53..c22c4c4 100644
--- a/generic/tclLoadNone.c
+++ b/generic/tclLoadNone.c
@@ -107,8 +107,8 @@ TclpLoadMemory(
Tcl_FSUnloadFileProc **unloadProcPtr)
/* Dummy: unused by this implementation */
{
- Tcl_SetResult(interp, "dynamic loading from memory is not available "
- "on this system", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj("dynamic loading from memory "
+ "is not available on this system", -1));
return TCL_ERROR;
}