diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2006-10-20 15:16:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2006-10-20 15:16:47 (GMT) |
| commit | d3e1aa1876716ce04f520834edee8125724daac9 (patch) | |
| tree | 6e5adffffcc577f30bfd88dbb0cfad5846a9e410 /generic/tclNamesp.c | |
| parent | 667340e02adf467adc84a317f84580be29dc5c71 (diff) | |
| download | tcl-d3e1aa1876716ce04f520834edee8125724daac9.zip tcl-d3e1aa1876716ce04f520834edee8125724daac9.tar.gz tcl-d3e1aa1876716ce04f520834edee8125724daac9.tar.bz2 | |
Undo mistaken commit to wrong branch caused by CVS fumble... :-}
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index c3d4e7c..eae2530 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -22,7 +22,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNamesp.c,v 1.102 2006/10/20 14:04:00 dkf Exp $ + * RCS: @(#) $Id: tclNamesp.c,v 1.103 2006/10/20 15:16:47 dkf Exp $ */ #include "tclInt.h" @@ -117,8 +117,8 @@ typedef struct EnsembleConfig { * all lists, and cannot be found by scanning * the list from the namespace's ensemble * field. */ - int flags; /* ORed combo of TCL_ENSEMBLE_PREFIX and - * ENS_DEAD. */ + int flags; /* ORed combo of ENS_DEAD and + * TCL_ENSEMBLE_PREFIX. */ /* OBJECT FIELDS FOR ENSEMBLE CONFIGURATION */ @@ -251,6 +251,8 @@ static void FreeEnsembleCmdRep(Tcl_Obj *objPtr); static void DupEnsembleCmdRep(Tcl_Obj *objPtr, Tcl_Obj *copyPtr); static void StringOfEnsembleCmdRep(Tcl_Obj *objPtr); static void UnlinkNsPath(Namespace *nsPtr); +static void SetNsPath(Namespace *nsPtr, int pathLength, + Tcl_Namespace *pathAry[]); /* * This structure defines a Tcl object type that contains a namespace @@ -4108,7 +4110,7 @@ NamespacePathCmd( * Now we have the list of valid namespaces, install it as the path. */ - TclSetNsPath(nsPtr, nsObjc, namespaceList); + SetNsPath(nsPtr, nsObjc, namespaceList); result = TCL_OK; badNamespace: @@ -4121,7 +4123,7 @@ NamespacePathCmd( /* *---------------------------------------------------------------------- * - * TclSetNsPath -- + * SetNsPath -- * * Sets the namespace command name resolution path to the given list of * namespaces. If the list is empty (of zero length) the path is set to @@ -4139,8 +4141,8 @@ NamespacePathCmd( */ /* EXPOSE ME? */ -void -TclSetNsPath( +static void +SetNsPath( Namespace *nsPtr, /* Namespace whose path is to be set. */ int pathLength, /* Length of pathAry */ Tcl_Namespace *pathAry[]) /* Array of namespaces that are the path. */ |