diff options
| -rwxr-xr-x | generic/tclThreadAlloc.c | 12 | ||||
| -rw-r--r-- | generic/tclThreadStorage.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c index 2cde913..52abdff 100755 --- a/generic/tclThreadAlloc.c +++ b/generic/tclThreadAlloc.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: tclThreadAlloc.c,v 1.22 2007/06/29 03:17:05 das Exp $ + * RCS: @(#) $Id: tclThreadAlloc.c,v 1.23 2007/11/18 22:00:57 dkf Exp $ */ #include "tclInt.h" @@ -426,7 +426,7 @@ TclpRealloc( { Cache *cachePtr = TclpGetAllocCache(); Block *blockPtr; - void *new; + void *newPtr; size_t size, min; int bucket; @@ -475,15 +475,15 @@ TclpRealloc( * Finally, perform an expensive malloc/copy/free. */ - new = TclpAlloc(reqSize); - if (new != NULL) { + newPtr = TclpAlloc(reqSize); + if (newPtr != NULL) { if (reqSize > blockPtr->blockReqSize) { reqSize = blockPtr->blockReqSize; } - memcpy(new, ptr, reqSize); + memcpy(newPtr, ptr, reqSize); TclpFree(ptr); } - return new; + return newPtr; } /* diff --git a/generic/tclThreadStorage.c b/generic/tclThreadStorage.c index 70a0c11..36ce257 100644 --- a/generic/tclThreadStorage.c +++ b/generic/tclThreadStorage.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclThreadStorage.c,v 1.13 2007/07/31 17:03:39 msofer Exp $ + * RCS: @(#) $Id: tclThreadStorage.c,v 1.14 2007/11/18 22:00:57 dkf Exp $ */ #include "tclInt.h" @@ -192,7 +192,7 @@ ThreadStorageGetHashTable( { int index = PTR2UINT(id) % STORAGE_CACHE_SLOTS; Tcl_HashEntry *hPtr; - int new; + int isNew; /* * It's important that we pick up the hash table pointer BEFORE comparing @@ -241,7 +241,7 @@ ThreadStorageGetHashTable( */ hPtr = Tcl_CreateHashEntry(&threadStorageHashTable, (char *) id, - &new); + &isNew); if (hPtr == NULL) { Tcl_Panic("Tcl_CreateHashEntry failed from " |