Skip to content

Commit a7e1509

Browse files
author
jan.nijtmans
committed
objectFlags -> flags (there cannot be confusion here)
1 parent d6baccf commit a7e1509

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

generic/itclInfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ ItclInfoGuts(
387387
}
388388

389389
cPtr = (ItclCallContext *) Tcl_Alloc(sizeof(ItclCallContext));
390-
cPtr->objectFlags = ITCL_OBJECT_ROOT_METHOD;
390+
cPtr->flags = ITCL_OBJECT_ROOT_METHOD;
391391
cPtr->nsPtr = NULL;
392392
cPtr->ioPtr = ioPtr;
393393
cPtr->imPtr = NULL;

generic/itclInt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ typedef struct ItclCmdLookup {
668668
} ItclCmdLookup;
669669

670670
typedef struct ItclCallContext {
671-
ItclObjectFlags objectFlags;
671+
ItclObjectFlags flags;
672672
Tcl_Namespace *nsPtr;
673673
ItclObject *ioPtr;
674674
ItclMemberFunc *imPtr;

generic/itclMethod.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ Itcl_GetContext(
14881488

14891489
assert(contextPtr);
14901490

1491-
if (contextPtr->objectFlags & ITCL_OBJECT_ROOT_METHOD) {
1491+
if (contextPtr->flags & ITCL_OBJECT_ROOT_METHOD) {
14921492
ItclObject *ioPtr = contextPtr->ioPtr;
14931493

14941494
*iclsPtrPtr = ioPtr->iclsPtr;
@@ -2425,13 +2425,13 @@ ItclCheckCallMethod(
24252425
callContextPtr2 = (ItclCallContext *)Tcl_GetHashValue(hPtr);
24262426
if (callContextPtr2->refCount == 0) {
24272427
callContextPtr = callContextPtr2;
2428-
callContextPtr->objectFlags = ioPtr->flags;
2428+
callContextPtr->flags = ioPtr->flags;
24292429
callContextPtr->nsPtr = Tcl_GetCurrentNamespace(interp);
24302430
callContextPtr->ioPtr = ioPtr;
24312431
callContextPtr->imPtr = imPtr;
24322432
callContextPtr->refCount = 1;
24332433
} else {
2434-
if ((callContextPtr2->objectFlags == ioPtr->flags)
2434+
if ((callContextPtr2->flags == ioPtr->flags)
24352435
&& (callContextPtr2->nsPtr == currNsPtr)) {
24362436
callContextPtr = callContextPtr2;
24372437
callContextPtr->refCount++;
@@ -2443,10 +2443,10 @@ ItclCheckCallMethod(
24432443
callContextPtr = (ItclCallContext *)Tcl_Alloc(
24442444
sizeof(ItclCallContext));
24452445
if (ioPtr == NULL) {
2446-
callContextPtr->objectFlags = ITCL_OBJECT_DEFAULT;
2446+
callContextPtr->flags = ITCL_OBJECT_DEFAULT;
24472447
callContextPtr->ioPtr = NULL;
24482448
} else {
2449-
callContextPtr->objectFlags = ioPtr->flags;
2449+
callContextPtr->flags = ioPtr->flags;
24502450
callContextPtr->ioPtr = ioPtr;
24512451
}
24522452
callContextPtr->nsPtr = Tcl_GetCurrentNamespace(interp);

0 commit comments

Comments
 (0)