diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 11:44:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 11:44:49 (GMT) |
| commit | b2c080e9ae2d44b453f81bae6443f6fffaf6b052 (patch) | |
| tree | 96c798290148ac7d237058f68a1f177fe222b7b6 /generic/tclMain.c | |
| parent | 6e8238944201c02321c9c5fc20a4d95c4f5383c8 (diff) | |
| parent | a107ac202e6c6806a0690e555b1141f2d032fb41 (diff) | |
| download | tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.zip tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.gz tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.bz2 | |
Merge 8.6
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 d23cd7b..8b7331f 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -286,7 +286,7 @@ Tcl_MainEx( { int i=0; /* argv[i] index */ Tcl_Obj *path, *resultPtr, *argvPtr, *appName; - const char *encodingName = NULL; + const char *encoding = NULL; int code, exitCode = 0; Tcl_MainLoopProc *mainLoopProc; Tcl_Channel chan; @@ -336,7 +336,7 @@ Tcl_MainEx( } } - path = Tcl_GetStartupScript(&encodingName); + path = Tcl_GetStartupScript(&encoding); if (path != NULL) { appName = path; } else if (argv[0]) { @@ -398,10 +398,10 @@ Tcl_MainEx( * again, as the appInitProc might have reset it. */ - path = Tcl_GetStartupScript(&encodingName); + path = Tcl_GetStartupScript(&encoding); if (path != NULL) { Tcl_ResetResult(interp); - code = Tcl_FSEvalFileEx(interp, path, encodingName); + code = Tcl_FSEvalFileEx(interp, path, encoding); if (code != TCL_OK) { chan = Tcl_GetStdChannel(TCL_STDERR); if (chan) { |