diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-25 10:04:58 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-25 10:04:58 (GMT) |
commit | a8c158be4b6bd3dc3a0fc23faf26992246c8bcc4 (patch) | |
tree | 231d897e2ebe2880bb9a06d76226aa9808b7036b /generic/tclEnsemble.c | |
parent | 6859fb45c25a8eb401e7d0decab9b77b24014627 (diff) | |
parent | f09de888df51736f6e35a190ee1eef87b39048cf (diff) | |
download | tcl-novem_unversioned_stub.zip tcl-novem_unversioned_stub.tar.gz tcl-novem_unversioned_stub.tar.bz2 |
merge novem. Some more fixes.novem_unversioned_stub
Diffstat (limited to 'generic/tclEnsemble.c')
-rw-r--r-- | generic/tclEnsemble.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 88de9f3..821be3f 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -162,8 +162,8 @@ TclNamespaceEnsembleCmd( Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg ...?"); return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], ensembleSubcommands, - "subcommand", 0, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], ensembleSubcommands, + sizeof(char *), "subcommand", 0, &index) != TCL_OK) { return TCL_ERROR; } @@ -207,8 +207,8 @@ TclNamespaceEnsembleCmd( */ for (; objc>1 ; objc-=2,objv+=2) { - if (Tcl_GetIndexFromObj(interp, objv[0], ensembleCreateOptions, - "option", 0, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[0], ensembleCreateOptions, + sizeof(char *), "option", 0, &index) != TCL_OK) { if (allocatedMapFlag) { Tcl_DecrRefCount(mapObj); } @@ -381,8 +381,8 @@ TclNamespaceEnsembleCmd( if (objc == 4) { Tcl_Obj *resultObj = NULL; /* silence gcc 4 warning */ - if (Tcl_GetIndexFromObj(interp, objv[3], ensembleConfigOptions, - "option", 0, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[3], ensembleConfigOptions, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum EnsConfigOpts) index) { @@ -502,8 +502,8 @@ TclNamespaceEnsembleCmd( */ for (; objc>0 ; objc-=2,objv+=2) { - if (Tcl_GetIndexFromObj(interp, objv[0],ensembleConfigOptions, - "option", 0, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[0],ensembleConfigOptions, + sizeof(char *), "option", 0, &index) != TCL_OK) { freeMapAndError: if (allocatedMapFlag) { Tcl_DecrRefCount(mapObj); |