summaryrefslogtreecommitdiffstats
path: root/generic/tclLoad.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-14 21:01:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-14 21:01:49 (GMT)
commit9789186ef27f7911d934a8dfea08cf62366dbe10 (patch)
tree3152885a00fb561c458f608a593bf7ab1a934f49 /generic/tclLoad.c
parent41d8cf345e8f44e640143563972fe0c32eef34a2 (diff)
parente34e0c9025185dd77c8523a86219e0615b86b6c5 (diff)
downloadtcl-9789186ef27f7911d934a8dfea08cf62366dbe10.zip
tcl-9789186ef27f7911d934a8dfea08cf62366dbe10.tar.gz
tcl-9789186ef27f7911d934a8dfea08cf62366dbe10.tar.bz2
Merge 9.0
Diffstat (limited to 'generic/tclLoad.c')
-rw-r--r--generic/tclLoad.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 23372d9..7713db5 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -141,14 +141,14 @@ Tcl_LoadObjCmd(
Tcl_LoadHandle loadHandle;
Tcl_UniChar ch = 0;
size_t len;
- int index, flags = 0;
+ int flags = 0;
Tcl_Obj *const *savedobjv = objv;
static const char *const options[] = {
"-global", "-lazy", "--", NULL
};
enum loadOptionsEnum {
LOAD_GLOBAL, LOAD_LAZY, LOAD_LAST
- };
+ } index;
while (objc > 2) {
if (TclGetString(objv[1])[0] != '-') {
@@ -159,9 +159,9 @@ Tcl_LoadObjCmd(
return TCL_ERROR;
}
++objv; --objc;
- if (LOAD_GLOBAL == (enum loadOptionsEnum) index) {
+ if (LOAD_GLOBAL == index) {
flags |= TCL_LOAD_GLOBAL;
- } else if (LOAD_LAZY == (enum loadOptionsEnum) index) {
+ } else if (LOAD_LAZY == index) {
flags |= TCL_LOAD_LAZY;
} else {
break;
@@ -559,7 +559,7 @@ Tcl_UnloadObjCmd(
LoadedLibrary *libraryPtr;
Tcl_DString pfx, tmp;
InterpLibrary *ipFirstPtr, *ipPtr;
- int i, index, code, complain = 1, keepLibrary = 0;
+ int i, code, complain = 1, keepLibrary = 0;
const char *fullFileName = "";
const char *prefix;
static const char *const options[] = {
@@ -567,7 +567,7 @@ Tcl_UnloadObjCmd(
};
enum unloadOptionsEnum {
UNLOAD_NOCOMPLAIN, UNLOAD_KEEPLIB, UNLOAD_LAST
- };
+ } index;
for (i = 1; i < objc; i++) {
if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
@@ -590,7 +590,7 @@ Tcl_UnloadObjCmd(
break;
}
}
- switch ((enum unloadOptionsEnum)index) {
+ switch (index) {
case UNLOAD_NOCOMPLAIN: /* -nocomplain */
complain = 0;
break;