summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2004-07-16 22:38:36 (GMT)
committerandreas_kupries <akupries@shaw.ca>2004-07-16 22:38:36 (GMT)
commitd03d0ed2481529c1670ed26cee493f9c6abffb40 (patch)
tree2c9a88cb862377499b2d0e5c18221bd511501c5f
parent554d0e544dd8f6c9678f730a8ebce9a517ad7813 (diff)
downloadtcl-d03d0ed2481529c1670ed26cee493f9c6abffb40.zip
tcl-d03d0ed2481529c1670ed26cee493f9c6abffb40.tar.gz
tcl-d03d0ed2481529c1670ed26cee493f9c6abffb40.tar.bz2
* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Corrected a typo in the
generation of error messages and simplified by reusing data in a variable instead of retrieving the string again. Fixes [Tcl SF Bug 835289].
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclIOCmd.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60876f5..a39b0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-07-16 Andreas Kupries <andreask@activestate.com>
+ * generic/tclIOCmd.c (Tcl_FcopyObjCmd): Corrected a typo in the
+ generation of error messages and simplified by reusing data in a
+ variable instead of retrieving the string again. Fixes [Tcl SF Bug 835289].
+
* doc/OpenFileChnl.3: Added description of the behaviour of
Tcl_ReadChars when its 'charsToRead' argument is set to
-1. Fixes [Tcl SF Bug 934511].
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index affa53b..d49193b 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOCmd.c,v 1.15.2.1 2004/07/15 20:17:48 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.15.2.2 2004/07/16 22:38:37 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -1515,7 +1515,7 @@ Tcl_FcopyObjCmd(dummy, interp, objc, objv)
}
if ((mode & TCL_READABLE) == 0) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
- Tcl_GetString(objv[1]),
+ arg,
"\" wasn't opened for reading", (char *) NULL);
return TCL_ERROR;
}
@@ -1526,7 +1526,7 @@ Tcl_FcopyObjCmd(dummy, interp, objc, objv)
}
if ((mode & TCL_WRITABLE) == 0) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
- Tcl_GetString(objv[1]),
+ arg,
"\" wasn't opened for writing", (char *) NULL);
return TCL_ERROR;
}