diff options
| -rw-r--r-- | generic/tclHash.c | 13 | ||||
| -rw-r--r-- | generic/tclListObj.c | 16 |
2 files changed, 12 insertions, 17 deletions
diff --git a/generic/tclHash.c b/generic/tclHash.c index af2805a..14de98a 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclHash.c,v 1.21 2004/10/06 13:43:53 dkf Exp $ + * RCS: @(#) $Id: tclHash.c,v 1.22 2004/11/11 01:17:50 das Exp $ */ #include "tclInt.h" @@ -310,6 +310,7 @@ Tcl_FindHashEntry(tablePtr, key) */ if (typePtr->compareKeysProc) { + Tcl_CompareHashKeysProc *compareKeysProc = typePtr->compareKeysProc; for (hPtr = tablePtr->buckets[index]; hPtr != NULL; hPtr = hPtr->nextPtr) { #if TCL_HASH_KEY_STORE_HASH @@ -317,7 +318,7 @@ Tcl_FindHashEntry(tablePtr, key) continue; } #endif - if (typePtr->compareKeysProc ((VOID *) key, hPtr)) { + if (compareKeysProc ((VOID *) key, hPtr)) { return hPtr; } } @@ -408,6 +409,7 @@ Tcl_CreateHashEntry(tablePtr, key, newPtr) */ if (typePtr->compareKeysProc) { + Tcl_CompareHashKeysProc *compareKeysProc = typePtr->compareKeysProc; for (hPtr = tablePtr->buckets[index]; hPtr != NULL; hPtr = hPtr->nextPtr) { #if TCL_HASH_KEY_STORE_HASH @@ -415,7 +417,7 @@ Tcl_CreateHashEntry(tablePtr, key, newPtr) continue; } #endif - if (typePtr->compareKeysProc ((VOID *) key, hPtr)) { + if (compareKeysProc ((VOID *) key, hPtr)) { *newPtr = 0; return hPtr; } @@ -701,13 +703,14 @@ Tcl_NextHashEntry(searchPtr) * Tcl_FirstHashEntry. */ { Tcl_HashEntry *hPtr; + Tcl_HashTable *tablePtr = searchPtr->tablePtr; while (searchPtr->nextEntryPtr == NULL) { - if (searchPtr->nextIndex >= searchPtr->tablePtr->numBuckets) { + if (searchPtr->nextIndex >= tablePtr->numBuckets) { return NULL; } searchPtr->nextEntryPtr = - searchPtr->tablePtr->buckets[searchPtr->nextIndex]; + tablePtr->buckets[searchPtr->nextIndex]; searchPtr->nextIndex++; } hPtr = searchPtr->nextEntryPtr; diff --git a/generic/tclListObj.c b/generic/tclListObj.c index ef88192..162101c 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.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: tclListObj.c,v 1.19 2004/09/29 22:17:30 dkf Exp $ + * RCS: @(#) $Id: tclListObj.c,v 1.20 2004/11/11 01:17:51 das Exp $ */ #include "tclInt.h" @@ -791,17 +791,9 @@ Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv) if ((numAfterLast > 0) && (shift != 0)) { Tcl_Obj **src, **dst; - if (shift < 0) { - for (src = elemPtrs + start, dst = src + shift; - numAfterLast > 0; numAfterLast--, src++, dst++) { - *dst = *src; - } - } else { - for (src = elemPtrs + numElems - 1, dst = src + shift; - numAfterLast > 0; numAfterLast--, src--, dst--) { - *dst = *src; - } - } + src = elemPtrs + start; dst = src + shift; + memmove((VOID*) dst, (VOID*) src, + (size_t) (numAfterLast * sizeof(Tcl_Obj*))); } /* |