diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 13:06:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 13:06:32 (GMT) |
| commit | 96ba124114a77f7be6cfb173ee9084c01f789512 (patch) | |
| tree | bc97fbb72c240fbdb1326228f8a17e5ab98682e3 /generic/tclMain.c | |
| parent | de370ec86362c9ec5f013683c78a0faa1e51ed75 (diff) | |
| download | tcl-96ba124114a77f7be6cfb173ee9084c01f789512.zip tcl-96ba124114a77f7be6cfb173ee9084c01f789512.tar.gz tcl-96ba124114a77f7be6cfb173ee9084c01f789512.tar.bz2 | |
Backout [0a9ae478ac], as requested
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index 725b567..3e89664 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -287,7 +287,7 @@ Tcl_MainEx( { int i=0; /* argv[i] index */ Tcl_Obj *path, *resultPtr, *argvPtr, *appName; - const char *encoding = NULL; + const char *encodingName = NULL; int code, exitCode = 0; Tcl_MainLoopProc *mainLoopProc; Tcl_Channel chan; @@ -337,7 +337,7 @@ Tcl_MainEx( } } - path = Tcl_GetStartupScript(&encoding); + path = Tcl_GetStartupScript(&encodingName); if (path != NULL) { appName = path; } else if (argv[0]) { @@ -397,10 +397,10 @@ Tcl_MainEx( * again, as the appInitProc might have reset it. */ - path = Tcl_GetStartupScript(&encoding); + path = Tcl_GetStartupScript(&encodingName); if (path != NULL) { Tcl_ResetResult(interp); - code = Tcl_FSEvalFileEx(interp, path, encoding); + code = Tcl_FSEvalFileEx(interp, path, encodingName); if (code != TCL_OK) { chan = Tcl_GetStdChannel(TCL_STDERR); if (chan) { |