diff options
| -rw-r--r-- | generic/tclNamesp.c | 23 | ||||
| -rw-r--r-- | generic/tclResolve.c | 4 |
2 files changed, 13 insertions, 14 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 8e95f89..3b34dd6 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -199,18 +199,18 @@ static const EnsembleImplMap defaultNamespaceMap[] = { static inline Tcl_HashEntry * CreateChildEntry( Namespace *nsPtr, /* Parent namespace. */ - const char *name, /* Simple name to look for. */ - int *isNewPtr) /* Pointer to var with whether this is new. */ + const char *name) /* Simple name to look for. */ { + int newEntry; #ifndef BREAK_NAMESPACE_COMPAT - return Tcl_CreateHashEntry(&nsPtr->childTable, name, isNewPtr); + return Tcl_CreateHashEntry(&nsPtr->childTable, name, &newEntry); #else - if )nsPtr->childTablePtr == NULL) { + if (nsPtr->childTablePtr == NULL) { nsPtr->childTablePtr = (Tcl_HashTable *) Tcl_Alloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(nsPtr->childTablePtr, TCL_STRING_KEYS); } - return Tcl_CreateHashEntry(nsPtr->childTablePtr, name, isNewPtr); + return Tcl_CreateHashEntry(nsPtr->childTablePtr, name, &newEntry); #endif } @@ -786,7 +786,6 @@ Tcl_CreateNamespace( Tcl_HashEntry *entryPtr; Tcl_DString buffer1, buffer2; Tcl_DString *namePtr, *buffPtr; - int newEntry; size_t nameLen; ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); const char *nameStr; @@ -916,7 +915,7 @@ Tcl_CreateNamespace( nsPtr->earlyDeleteProc = NULL; if (parentPtr != NULL) { - entryPtr = CreateChildEntry(parentPtr, simpleName, &newEntry); + entryPtr = CreateChildEntry(parentPtr, simpleName); Tcl_SetHashValue(entryPtr, nsPtr); } else { /* @@ -2029,8 +2028,7 @@ Tcl_ForgetImport( */ Command *cmdPtr = (Command *) token; - ImportedCmdData *dataPtr = (ImportedCmdData *) - cmdPtr->objClientData; + ImportedCmdData *dataPtr = (ImportedCmdData *)cmdPtr->objClientData; Tcl_Command firstToken = (Tcl_Command) dataPtr->realCmdPtr; if (firstToken == origin) { @@ -3745,7 +3743,8 @@ NamespaceForgetCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { const char *pattern; - int i, result; + int i; + int result; if (objc < 1) { Tcl_WrongNumArgs(interp, 1, objv, "?pattern pattern...?"); @@ -3811,8 +3810,8 @@ NamespaceImportCmd( { int allowOverwrite = 0; const char *string, *pattern; - int i, result; - int firstArg; + int i, firstArg; + int result; if (objc < 1) { Tcl_WrongNumArgs(interp, 1, objv, "?-force? ?pattern pattern...?"); diff --git a/generic/tclResolve.c b/generic/tclResolve.c index f321515..16872cc 100644 --- a/generic/tclResolve.c +++ b/generic/tclResolve.c @@ -65,7 +65,7 @@ Tcl_AddInterpResolvers( { Interp *iPtr = (Interp *) interp; ResolverScheme *resPtr; - unsigned len; + size_t len; /* * Since we're adding a new name resolution scheme, we must force all code @@ -273,7 +273,7 @@ BumpCmdRefEpochs( if (nsPtr->childTablePtr != NULL) { for (entry = Tcl_FirstHashEntry(nsPtr->childTablePtr, &search); entry != NULL; entry = Tcl_NextHashEntry(&search)) { - Namespace *childNsPtr = Tcl_GetHashValue(entry); + Namespace *childNsPtr = (Namespace *)Tcl_GetHashValue(entry); BumpCmdRefEpochs(childNsPtr); } |