ICU 56 update step 1

source/common/uhash.c

 /*
 ******************************************************************************
-*   Copyright (C) 1997-2011, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   Date        Name        Description
 *   03/22/00    aliu        Adapted from original C++ ICU Hashtable.
 *   07/06/01    aliu        Modified to support int32_t keys on
 *                           platforms with sizeof(void*) < 32.
 ******************************************************************************
 */
 
 #include "uhash.h"
@@ skipping 554 matching lines @@
     return _uhash_init(fillinResult, keyHash, keyComp, valueComp, DEFAULT_PRIME_INDEX, status);
 }
 
 U_CAPI void U_EXPORT2
 uhash_close(UHashtable *hash) {
     if (hash == NULL) {
         return;
     }
     if (hash->elements != NULL) {
         if (hash->keyDeleter != NULL || hash->valueDeleter != NULL) {
-            int32_t pos=-1;
+            int32_t pos=UHASH_FIRST;
             UHashElement *e;
             while ((e = (UHashElement*) uhash_nextElement(hash, &pos)) != NULL) {
                 HASH_DELETE_KEY_VALUE(hash, e->key.pointer, e->value.pointer);
             }
         }
         uprv_free(hash->elements);
         hash->elements = NULL;
     }
     if (hash->allocated) {
         uprv_free(hash);
@@ skipping 160 matching lines @@
 U_CAPI int32_t U_EXPORT2
 uhash_iremovei(UHashtable *hash,
                int32_t key) {
     UHashTok keyholder;
     keyholder.integer = key;
     return _uhash_remove(hash, keyholder).integer;
 }
 
 U_CAPI void U_EXPORT2
 uhash_removeAll(UHashtable *hash) {
-    int32_t pos = -1;
+    int32_t pos = UHASH_FIRST;
     const UHashElement *e;
     U_ASSERT(hash != NULL);
     if (hash->count != 0) {
         while ((e = uhash_nextElement(hash, &pos)) != NULL) {
             uhash_removeElement(hash, e);
         }
     }
     U_ASSERT(hash->count == 0);
 }
 
@@ skipping 108 matching lines @@
         */
         return FALSE;
     }
 
     count1 = uhash_count(hash1);
     count2 = uhash_count(hash2);
     if(count1!=count2){
         return FALSE;
     }
     
-    pos=-1;
+    pos=UHASH_FIRST;
     for(i=0; i<count1; i++){
         const UHashElement* elem1 = uhash_nextElement(hash1, &pos);
         const UHashTok key1 = elem1->key;
         const UHashTok val1 = elem1->value;
         /* here the keys are not compared, instead the key form hash1 is used to fetch
          * value from hash2. If the hashes are equal then then both hashes should 
          * contain equal values for the same key!
          */
         const UHashElement* elem2 = _uhash_find(hash2, key1, hash2->keyHasher(key1));
         const UHashTok val2 = elem2->value;
@@ skipping 65 matching lines @@
 
 U_CAPI int32_t U_EXPORT2
 uhash_hashLong(const UHashTok key) {
     return key.integer;
 }
 
 U_CAPI UBool U_EXPORT2
 uhash_compareLong(const UHashTok key1, const UHashTok key2) {
     return (UBool)(key1.integer == key2.integer);
 }