diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-01 12:31:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-01 12:31:47 (GMT) |
| commit | 11cc37e81849a5f4dd75bdbf84a5d77e8fabd8f8 (patch) | |
| tree | 3ee453a37ae6054eeda7a3149d427cd45446f653 /generic/tclMain.c | |
| parent | 95bcc538075fc86ab77313a173e2c4ce89a38f0d (diff) | |
| parent | 3311ca7d306a1bf7de8e03bac9eac81d63677899 (diff) | |
| download | tcl-11cc37e81849a5f4dd75bdbf84a5d77e8fabd8f8.zip tcl-11cc37e81849a5f4dd75bdbf84a5d77e8fabd8f8.tar.gz tcl-11cc37e81849a5f4dd75bdbf84a5d77e8fabd8f8.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index be9ec4c..f045dfa 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -43,7 +43,7 @@ # define _tcscmp strcmp #endif -static Tcl_Obj * +static inline Tcl_Obj * NewNativeObj( TCHAR *string) { @@ -517,7 +517,7 @@ Tcl_MainEx( * error messages troubles deeper in, so lop it back off. */ - TclGetStringFromObj(is.commandPtr, &length); + (void)Tcl_GetStringFromObj(is.commandPtr, &length); Tcl_SetObjLength(is.commandPtr, --length); code = Tcl_RecordAndEvalObj(interp, is.commandPtr, TCL_EVAL_GLOBAL); @@ -534,7 +534,7 @@ Tcl_MainEx( } else if (is.tty) { resultPtr = Tcl_GetObjResult(interp); Tcl_IncrRefCount(resultPtr); - TclGetStringFromObj(resultPtr, &length); + (void)Tcl_GetStringFromObj(resultPtr, &length); chan = Tcl_GetStdChannel(TCL_STDOUT); if ((length > 0) && chan) { Tcl_WriteObj(chan, resultPtr); @@ -737,7 +737,8 @@ StdinProc( ClientData clientData, /* The state of interactive cmd line */ TCL_UNUSED(int) /*mask*/) { - int code, length; + int code; + int length; InteractiveState *isPtr = (InteractiveState *)clientData; Tcl_Channel chan = isPtr->input; Tcl_Obj *commandPtr = isPtr->commandPtr; @@ -777,7 +778,7 @@ StdinProc( goto prompt; } isPtr->prompt = PROMPT_START; - TclGetStringFromObj(commandPtr, &length); + (void)Tcl_GetStringFromObj(commandPtr, &length); Tcl_SetObjLength(commandPtr, --length); /* @@ -809,7 +810,7 @@ StdinProc( chan = Tcl_GetStdChannel(TCL_STDOUT); Tcl_IncrRefCount(resultPtr); - TclGetStringFromObj(resultPtr, &length); + (void)Tcl_GetStringFromObj(resultPtr, &length); if ((length > 0) && (chan != NULL)) { Tcl_WriteObj(chan, resultPtr); Tcl_WriteChars(chan, "\n", 1); |