X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vm%2FHash.cpp;h=cd4530a5df5f476ab2a7bc5e73278fce0cbe6492;hb=0de562cd943004840b450deb71c5892a50da13d0;hp=bf57ae1b293284845011a0f6880705a5cbb358d3;hpb=ce00cbe5fb3ead585b97b257d0cfb7973ca4ab01;p=android-x86%2Fdalvik.git diff --git a/vm/Hash.cpp b/vm/Hash.cpp index bf57ae1b2..cd4530a5d 100644 --- a/vm/Hash.cpp +++ b/vm/Hash.cpp @@ -290,9 +290,11 @@ bool dvmHashTableRemove(HashTable* pHashTable, u4 itemHash, void* item) */ int dvmHashForeachRemove(HashTable* pHashTable, HashForeachRemoveFunc func) { - int i, val; + int i, val, tableSize; - for (i = 0; i < pHashTable->tableSize; i++) { + tableSize = pHashTable->tableSize; + + for (i = 0; i < tableSize; i++) { HashEntry* pEnt = &pHashTable->pEntries[i]; if (pEnt->data != NULL && pEnt->data != HASH_TOMBSTONE) { @@ -318,9 +320,11 @@ int dvmHashForeachRemove(HashTable* pHashTable, HashForeachRemoveFunc func) */ int dvmHashForeach(HashTable* pHashTable, HashForeachFunc func, void* arg) { - int i, val; + int i, val, tableSize; - for (i = 0; i < pHashTable->tableSize; i++) { + tableSize = pHashTable->tableSize; + + for (i = 0; i < tableSize; i++) { HashEntry* pEnt = &pHashTable->pEntries[i]; if (pEnt->data != NULL && pEnt->data != HASH_TOMBSTONE) {