From f6019494d6d4d290425ff80a3a5fbb9b58a11c59 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 14 Apr 2025 13:43:11 +0000 Subject: Review [56f880ad7b|this] commit: Introduce TclNewNamespaceObj() to factor out a common idiom --- generic/tclNamesp.c | 13 ++++++------- generic/tclResolve.c | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 65b91f1..fed0dda 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 { /* diff --git a/generic/tclResolve.c b/generic/tclResolve.c index f321515..e8023c4 100644 --- a/generic/tclResolve.c +++ b/generic/tclResolve.c @@ -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); } -- cgit v0.12