ICU 56 update step 1

source/common/ucol_swp.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2014, International Business Machines
+*   Copyright (C) 2003-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  ucol_swp.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2003sep10
 *   created by: Markus W. Scherer
@@ skipping 318 matching lines @@
             int dataCount = ds->readUInt16(*((uint16_t*)(inBytes+header.leadByteToScript + 2))); // each entry = uint16
             ds->swapArray16(ds, inBytes+header.leadByteToScript, 
                                 4 + (2 * indexCount) + (2 * dataCount),
                                 outBytes+header.leadByteToScript, pErrorCode);
         }
     }
 
     return header.size;
 }
 
-// swap formatVersion 4 ---------------------------------------------------- ***
+// swap formatVersion 4 or 5 ----------------------------------------------- ***
 
 // The following are copied from CollationDataReader, trading an awkward copy of constants
 // for an awkward relocation of the i18n collationdatareader.h file into the common library.
 // Keep them in sync!
 
 enum {
     IX_INDEXES_LENGTH,  // 0
     IX_OPTIONS,
     IX_RESERVED2,
     IX_RESERVED3,
@@ skipping 205 matching lines @@
         return swapFormatVersion3(ds, inData, length, outData, pErrorCode);
     }
 
     /* check data format and format version */
     const UDataInfo &info=*(const UDataInfo *)((const char *)inData+4);
     if(!(
         info.dataFormat[0]==0x55 &&   // dataFormat="UCol"
         info.dataFormat[1]==0x43 &&
         info.dataFormat[2]==0x6f &&
         info.dataFormat[3]==0x6c &&
-        (info.formatVersion[0]==3 || info.formatVersion[0]==4)
+        (3<=info.formatVersion[0] && info.formatVersion[0]<=5)
     )) {
         udata_printError(ds, "ucol_swap(): data format %02x.%02x.%02x.%02x "
                          "(format version %02x.%02x) is not recognized as collation data\n",
                          info.dataFormat[0], info.dataFormat[1],
                          info.dataFormat[2], info.dataFormat[3],
                          info.formatVersion[0], info.formatVersion[1]);
         *pErrorCode=U_UNSUPPORTED_ERROR;
         return 0;
     }
 
@@ skipping 99 matching lines @@
 
         /* swap the continuation table; contsSize counts UChars */
         ds->swapArray16(ds, inBytes+header.conts, header.contsSize*U_SIZEOF_UCHAR,
                            outBytes+header.conts, pErrorCode);
     }
 
     return headerSize+header.byteSize;
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */