summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-18 12:10:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-18 12:10:26 (GMT)
commit450b6f46c96b96bec44fb0bc119e3d11f3434f4a (patch)
tree5f4ccb4d3df569fcd06e804ff1b5ebd8a72505bb /generic/tclMain.c
parent4d9fc11c2ffbcc95218111734c64397df0dfcf63 (diff)
parentedcac92c086fa48aff50db9763afecbed00c2a37 (diff)
downloadtcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.zip
tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.gz
tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.bz2
merge novem
Diffstat (limited to 'generic/tclMain.c')
-rw-r--r--generic/tclMain.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 3a09b0c..876bf61 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -536,7 +536,7 @@ Tcl_MainEx(
* error messages troubles deeper in, so lop it back off.
*/
- Tcl_GetStringFromObj(is.commandPtr, &length);
+ TclGetStringFromObj(is.commandPtr, &length);
Tcl_SetObjLength(is.commandPtr, --length);
code = Tcl_RecordAndEvalObj(interp, is.commandPtr,
TCL_EVAL_GLOBAL);
@@ -553,7 +553,7 @@ Tcl_MainEx(
} else if (is.tty) {
resultPtr = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(resultPtr);
- Tcl_GetStringFromObj(resultPtr, &length);
+ TclGetStringFromObj(resultPtr, &length);
chan = Tcl_GetStdChannel(TCL_STDOUT);
if ((length > 0) && chan) {
Tcl_WriteObj(chan, resultPtr);
@@ -797,7 +797,7 @@ StdinProc(
goto prompt;
}
isPtr->prompt = PROMPT_START;
- Tcl_GetStringFromObj(commandPtr, &length);
+ TclGetStringFromObj(commandPtr, &length);
Tcl_SetObjLength(commandPtr, --length);
/*
@@ -828,7 +828,7 @@ StdinProc(
chan = Tcl_GetStdChannel(TCL_STDOUT);
Tcl_IncrRefCount(resultPtr);
- Tcl_GetStringFromObj(resultPtr, &length);
+ TclGetStringFromObj(resultPtr, &length);
if ((length > 0) && (chan != NULL)) {
Tcl_WriteObj(chan, resultPtr);
Tcl_WriteChars(chan, "\n", 1);