diff options
| author | mig <mig> | 2013-02-11 13:50:47 (GMT) |
|---|---|---|
| committer | mig <mig> | 2013-02-11 13:50:47 (GMT) |
| commit | 0055995ec13ad8f27603d140ca19d7858725ef95 (patch) | |
| tree | 14f5697a44b71bd7eb3091709c9cac4fe3868025 /generic/tclBinary.c | |
| parent | eb1adf553cfd18472faa6c11b1d46434c15e064f (diff) | |
| parent | 30f60173c4738c76675b58db3a7a5aaa62ca79ea (diff) | |
| download | tcl-mig_alloc_reform.zip tcl-mig_alloc_reform.tar.gz tcl-mig_alloc_reform.tar.bz2 | |
merge trunkmig_alloc_reform
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 455b5a6..3e9ab01 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -204,9 +204,10 @@ typedef struct ByteArray { #define BYTEARRAY_SIZE(len) \ ((unsigned) (TclOffset(ByteArray, bytes) + (len))) #define GET_BYTEARRAY(objPtr) \ - ((ByteArray *) (objPtr)->internalRep.otherValuePtr) + ((ByteArray *) (objPtr)->internalRep.twoPtrValue.ptr1) #define SET_BYTEARRAY(objPtr, baPtr) \ - (objPtr)->internalRep.otherValuePtr = (void *) (baPtr) + (objPtr)->internalRep.twoPtrValue.ptr1 = (VOID *) (baPtr) + /* *---------------------------------------------------------------------- @@ -325,7 +326,7 @@ Tcl_SetByteArrayObj( Tcl_Panic("%s called with shared object", "Tcl_SetByteArrayObj"); } TclFreeIntRep(objPtr); - Tcl_InvalidateStringRep(objPtr); + TclInvalidateStringRep(objPtr); if (length < 0) { length = 0; @@ -420,7 +421,7 @@ Tcl_SetByteArrayLength( byteArrayPtr->allocated = length; SET_BYTEARRAY(objPtr, byteArrayPtr); } - Tcl_InvalidateStringRep(objPtr); + TclInvalidateStringRep(objPtr); byteArrayPtr->used = length; return byteArrayPtr->bytes; } @@ -691,7 +692,7 @@ TclAppendBytesToByteArray( if (len > 0) { memcpy(byteArrayPtr->bytes + byteArrayPtr->used, bytes, len); byteArrayPtr->used += len; - Tcl_InvalidateStringRep(objPtr); + TclInvalidateStringRep(objPtr); } } |