diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-11-30 17:52:09 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-11-30 17:52:09 (GMT) |
| commit | 49e332ded25e7502ce49b62bb7ef6b22cdd2e90f (patch) | |
| tree | 26dbaafb612b99b197231d5759173873cbb1d4e9 /generic/tclEnsemble.c | |
| parent | 079887fe42be52a69c2b001ae3efb5dae39862e6 (diff) | |
| parent | db726dc570738b047f110645527b804c3b59d28e (diff) | |
| download | tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.zip tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.tar.gz tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 629d7a2..01c3921 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -664,12 +664,12 @@ TclNamespaceEnsembleCmd( Tcl_Command TclCreateEnsembleInNs( - Tcl_Interp *interp, - + Tcl_Interp *interp, + const char *name, /* Simple name of command to create (no */ /* namespace components). */ - Tcl_Namespace /* Name of namespace to create the command in. */ - *nameNsPtr, + Tcl_Namespace /* Name of namespace to create the command in. */ + *nameNsPtr, Tcl_Namespace *ensembleNsPtr, /* Name of the namespace for the ensemble. */ int flags @@ -747,7 +747,6 @@ Tcl_CreateEnsemble( Tcl_Namespace *namespacePtr, int flags) { - Tcl_Obj *nameObj = NULL; Namespace *nsPtr = (Namespace *)namespacePtr, *foundNsPtr, *altNsPtr, *actualNsPtr; const char * simpleName; @@ -756,11 +755,8 @@ Tcl_CreateEnsemble( nsPtr = (Namespace *) TclGetCurrentNamespace(interp); } - TclGetNamespaceForQualName(interp, name, nsPtr, 0, + TclGetNamespaceForQualName(interp, name, nsPtr, TCL_CREATE_NS_IF_UNKNOWN, &foundNsPtr, &altNsPtr, &actualNsPtr, &simpleName); - if (nameObj != NULL) { - TclDecrRefCount(nameObj); - } return TclCreateEnsembleInNs(interp, simpleName, (Tcl_Namespace *) foundNsPtr, (Tcl_Namespace *) nsPtr, flags); } @@ -2608,7 +2604,7 @@ BuildEnsembleConfig( if (ensemblePtr->subcmdList == ensemblePtr->subcommandDict) { subcmdDictCopy = Tcl_DuplicateObj(ensemblePtr->subcommandDict); } else { - subcmdDictCopy = ensemblePtr->subcommandDict; + subcmdDictCopy = ensemblePtr->subcommandDict; } Tcl_IncrRefCount(subcmdDictCopy); } |