ICU 56 update step 1

source/i18n/tmutfmt.cpp

 /*
  *******************************************************************************
  * Copyright (C) 2008-2014, Google, International Business Machines Corporation
  * and others. All Rights Reserved.
  *******************************************************************************
  */
 
 #include "unicode/tmutfmt.h"
 
 #if !UCONFIG_NO_FORMATTING
@@ skipping 171 matching lines @@
     char res[1000];
     source.extract(0, source.length(), res, "UTF-8");
     std::cout << "parse source: " << res << "\n";           
 #endif
     // parse by iterating through all available patterns
     // and looking for the longest match.
     for (TimeUnit::UTimeUnitFields i = TimeUnit::UTIMEUNIT_YEAR;
          i < TimeUnit::UTIMEUNIT_FIELD_COUNT;
          i = (TimeUnit::UTimeUnitFields)(i+1)) {
         Hashtable* countToPatterns = fTimeUnitToCountToPatterns[i];
-        int32_t elemPos = -1;
+        int32_t elemPos = UHASH_FIRST;
         const UHashElement* elem = NULL;
         while ((elem = countToPatterns->nextElement(elemPos)) != NULL){
             const UHashTok keyTok = elem->key;
             UnicodeString* count = (UnicodeString*)keyTok.pointer;
 #ifdef TMUTFMT_DEBUG
             count->extract(0, count->length(), res, "UTF-8");
             std::cout << "parse plural count: " << res << "\n";           
 #endif
             const UHashTok valueTok = elem->value;
             // the value is a pair of MessageFormat*
@@ skipping 476 matching lines @@
 TimeUnitFormat::setNumberFormat(const NumberFormat& format, UErrorCode& status){
     if (U_FAILURE(status)) {
         return;
     }
     adoptNumberFormat((NumberFormat *)format.clone(), status);
 }
 
 
 void
 TimeUnitFormat::deleteHash(Hashtable* htable) {
-    int32_t pos = -1;
+    int32_t pos = UHASH_FIRST;
     const UHashElement* element = NULL;
     if ( htable ) {
         while ( (element = htable->nextElement(pos)) != NULL ) {
             const UHashTok valueTok = element->value;
             const MessageFormat** value = (const MessageFormat**)valueTok.pointer;
             delete value[UTMUTFMT_FULL_STYLE];
             delete value[UTMUTFMT_ABBREVIATED_STYLE];
             //delete[] value;
             uprv_free(value);
         }
     }
     delete htable;
 }
 
 
 void
 TimeUnitFormat::copyHash(const Hashtable* source, Hashtable* target, UErrorCode& status) {
     if ( U_FAILURE(status) ) {
         return;
     }
-    int32_t pos = -1;
+    int32_t pos = UHASH_FIRST;
     const UHashElement* element = NULL;
     if ( source ) {
         while ( (element = source->nextElement(pos)) != NULL ) {
             const UHashTok keyTok = element->key;
             const UnicodeString* key = (UnicodeString*)keyTok.pointer;
             const UHashTok valueTok = element->value;
             const MessageFormat** value = (const MessageFormat**)valueTok.pointer;
             MessageFormat** newVal = (MessageFormat**)uprv_malloc(UTMUTFMT_FORMAT_STYLE_COUNT*sizeof(MessageFormat*));
             newVal[0] = (MessageFormat*)value[0]->clone();
             newVal[1] = (MessageFormat*)value[1]->clone();
@@ skipping 71 matching lines @@
         return gTimeUnitSecond;
       default:
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return NULL;
     }
 }
 
 U_NAMESPACE_END
 
 #endif