ICU 56 update step 1

source/tools/toolutil/pkgitems.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2014, International Business Machines
+*   Copyright (C) 2003-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  pkgitems.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2005sep18
 *   created by: Markus W. Scherer
@@ skipping 388 matching lines @@
             // check() already printed a complaint.
             return;
         }
         // TODO: Cache the native version in the Item itself.
         nativePool.setItem(pkg->getItem(index), ures_swap);
         const UDataInfo *poolInfo=nativePool.getDataInfo();
         if(poolInfo->formatVersion[0]<=1) {
             fprintf(stderr, "icupkg: %s is not a pool bundle\n", poolName);
             return;
         }
-        const int32_t *poolIndexes=(const int32_t *)nativePool.getBytes()+1;
+        const int32_t *poolRoot=(const int32_t *)nativePool.getBytes();
+        const int32_t *poolIndexes=poolRoot+1;
         int32_t poolIndexLength=poolIndexes[URES_INDEX_LENGTH]&0xff;
         if(!(poolIndexLength>URES_INDEX_POOL_CHECKSUM &&
              (poolIndexes[URES_INDEX_ATTRIBUTES]&URES_ATT_IS_POOL_BUNDLE))
         ) {
             fprintf(stderr, "icupkg: %s is not a pool bundle\n", poolName);
             return;
         }
         if(resData.pRoot[1+URES_INDEX_POOL_CHECKSUM]==poolIndexes[URES_INDEX_POOL_CHECKSUM]) {
             resData.poolBundleKeys=(const char *)(poolIndexes+poolIndexLength);
+            resData.poolBundleStrings=(const uint16_t *)(poolRoot+poolIndexes[URES_INDEX_KEYS_TOP]);
         } else {
             fprintf(stderr, "icupkg: %s has mismatched checksum for %s\n", poolName, itemName);
             return;
         }
     }
 
     ures_enumDependencies(
         itemName, &resData,
         resData.rootRes, NULL, NULL, 0,
         check, context,
@@ skipping 188 matching lines @@
             break;
         }
 
         if(U_FAILURE(errorCode)) {
             exit(errorCode);
         }
     }
 }
 
 U_NAMESPACE_END