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/tclCmdMZ.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/tclCmdMZ.c')
| -rw-r--r-- | generic/tclCmdMZ.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index 1df9dd1..abb375a 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -1105,7 +1105,7 @@ TclNRSourceObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - const char *encodingName = NULL; + const char *encoding = NULL; Tcl_Obj *fileName; int result; void **pkgFiles = NULL; @@ -1128,7 +1128,7 @@ TclNRSourceObjCmd( "option", TCL_EXACT, &index)) { return TCL_ERROR; } - encodingName = TclGetString(objv[2]); + encoding = TclGetString(objv[2]); } else if (objc == 3) { /* Handle undocumented -nopkg option. This should only be * used by the internal ::tcl::Pkg::source utility function. */ @@ -1147,7 +1147,7 @@ TclNRSourceObjCmd( names = *pkgFiles; *pkgFiles = NULL; } - result = TclNREvalFile(interp, fileName, encodingName); + result = TclNREvalFile(interp, fileName, encoding); if (pkgFiles) { /* restore "tclPkgFiles" assocdata to how it was. */ *pkgFiles = names; |