summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-25 23:19:01 (GMT)
committernijtmans <nijtmans>2008-11-25 23:19:01 (GMT)
commit00452d9d7d4d961a4659fc21e69febb307d184f0 (patch)
tree30839af6e8ba95ccd3b3546349a8e12b36608a0b /generic
parent27413e2e6be699ec19189b0c87894f786205deb5 (diff)
downloadtcl-00452d9d7d4d961a4659fc21e69febb307d184f0.zip
tcl-00452d9d7d4d961a4659fc21e69febb307d184f0.tar.gz
tcl-00452d9d7d4d961a4659fc21e69febb307d184f0.tar.bz2
Eliminate 3 calls to Tcl_SetResult, as
examples how it should have been done. purpose: contribute in the TIP #340 discussion.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c11
-rw-r--r--generic/tclIndexObj.c4
-rw-r--r--generic/tclTestObj.c5
3 files changed, 6 insertions, 14 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b7c7b02..fdd6cba 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIO.c,v 1.149 2008/11/25 22:13:34 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.150 2008/11/25 23:19:01 nijtmans Exp $
*/
#include "tclInt.h"
@@ -2383,14 +2383,7 @@ FlushChannel(
Tcl_SetErrno(errorCode);
if (interp != NULL && !TclChanCaughtErrorBypass(interp,
(Tcl_Channel) chanPtr)) {
- /*
- * Casting away const here is safe because the
- * TCL_VOLATILE flag guarantees const treatment of the
- * Posix error string.
- */
-
- Tcl_SetResult(interp, (char *) Tcl_PosixError(interp),
- TCL_VOLATILE);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_PosixError(interp), -1));
}
/*
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index f04db71..d0fb382 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIndexObj.c,v 1.46 2008/10/14 22:37:53 nijtmans Exp $
+ * RCS: @(#) $Id: tclIndexObj.c,v 1.47 2008/11/25 23:19:02 nijtmans Exp $
*/
#include "tclInt.h"
@@ -1263,7 +1263,7 @@ Tcl_ParseArgsObjv(
sprintf(buf, "bad argument type %d in Tcl_ArgvInfo",
infoPtr->type);
- Tcl_SetResult(interp, buf, TCL_VOLATILE);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1));
goto error;
}
}
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 842cbd0..c643822 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTestObj.c,v 1.25 2008/10/16 22:34:19 nijtmans Exp $
+ * RCS: @(#) $Id: tclTestObj.c,v 1.26 2008/11/25 23:19:02 nijtmans Exp $
*/
#include "tclInt.h"
@@ -930,8 +930,7 @@ TestobjCmd(
if (CheckIfVarUnset(interp, varIndex)) {
return TCL_ERROR;
}
- TclFormatInt(buf, varPtr[varIndex]->refCount);
- Tcl_SetResult(interp, buf, TCL_VOLATILE);
+ Tcl_SetObjResult(interp, Tcl_NewIntObj(varPtr[varIndex]->refCount));
} else if (strcmp(subCmd, "type") == 0) {
if (objc != 3) {
goto wrongNumArgs;