diff options
author | dgp <dgp@users.sourceforge.net> | 2003-05-12 19:32:41 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2003-05-12 19:32:41 (GMT) |
commit | 83b3d7bbd3e11747ab0a311934e0ea8790bb2435 (patch) | |
tree | ea11d3d968be87c8b4d71b613dbf34f5170cf534 | |
parent | e053444350d8c7765e32dac046af7423e3e82c63 (diff) | |
download | tcl-83b3d7bbd3e11747ab0a311934e0ea8790bb2435.zip tcl-83b3d7bbd3e11747ab0a311934e0ea8790bb2435.tar.gz tcl-83b3d7bbd3e11747ab0a311934e0ea8790bb2435.tar.bz2 |
* generic/tclObj.c (tclCmdNameType): Corrected variable use of the
otherValuePtr or the twoPtrValue.ptr1 fields to store a
(ResolvedCmdName *) as the internal rep. [Bug 726018].
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | generic/tclObj.c | 11 |
2 files changed, 8 insertions, 7 deletions
@@ -1,5 +1,9 @@ 2003-05-12 Don Porter <dgp@users.sourceforge.net> + * generic/tclObj.c (tclCmdNameType): Corrected variable use of the + otherValuePtr or the twoPtrValue.ptr1 fields to store a + (ResolvedCmdName *) as the internal rep. [Bug 726018]. + * doc/Eval.3: Corrected prototype for Tcl_GlobalEvalObj [Bug 727622]. 2003-05-12 Miguel Sofer <msofer@users.sf.net> diff --git a/generic/tclObj.c b/generic/tclObj.c index 4f5d784..cf536a3 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclObj.c,v 1.45 2003/04/16 23:33:44 dgp Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.46 2003/05/12 19:32:43 dgp Exp $ */ #include "tclInt.h" @@ -2992,8 +2992,7 @@ TclSetCmdNameObj(interp, objPtr, cmdPtr) if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) { oldTypePtr->freeIntRepProc(objPtr); } - objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr; - objPtr->internalRep.twoPtrValue.ptr2 = NULL; + objPtr->internalRep.otherValuePtr = (VOID *) resPtr; objPtr->typePtr = &tclCmdNameType; } @@ -3075,8 +3074,7 @@ DupCmdNameInternalRep(srcPtr, copyPtr) register ResolvedCmdName *resPtr = (ResolvedCmdName *) srcPtr->internalRep.otherValuePtr; - copyPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr; - copyPtr->internalRep.twoPtrValue.ptr2 = NULL; + copyPtr->internalRep.otherValuePtr = (VOID *) resPtr; if (resPtr != NULL) { resPtr->refCount++; } @@ -3171,8 +3169,7 @@ SetCmdNameFromAny(interp, objPtr) objPtr->typePtr->freeIntRepProc(objPtr); } - objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr; - objPtr->internalRep.twoPtrValue.ptr2 = NULL; + objPtr->internalRep.otherValuePtr = (VOID *) resPtr; objPtr->typePtr = &tclCmdNameType; return TCL_OK; } |