ICU 56 update step 1

source/i18n/uspoof_impl.cpp

 /*
 **********************************************************************
-*   Copyright (C) 2008-2014, International Business Machines
+*   Copyright (C) 2008-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 
 #include "unicode/utypes.h"
 #include "unicode/uspoof.h"
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
 #include "unicode/utf16.h"
 #include "utrie2.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "identifier_info.h"
 #include "scriptset.h"
 #include "umutex.h"
 #include "udataswp.h"
 #include "uassert.h"
 #include "uspoof_impl.h"
 
 #if !UCONFIG_NO_NORMALIZATION
 
 
 U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SpoofImpl)
 
 SpoofImpl::SpoofImpl(SpoofData *data, UErrorCode &status) :
-        fMagic(0), fChecks(USPOOF_ALL_CHECKS), fSpoofData(NULL), fAllowedCharsSet(NULL) , 
+        fMagic(0), fChecks(USPOOF_ALL_CHECKS), fSpoofData(data), fAllowedCharsSet(NULL) , 
         fAllowedLocales(NULL), fCachedIdentifierInfo(NULL) {
     if (U_FAILURE(status)) {
         return;
     }
-    fSpoofData = data;
     fRestrictionLevel = USPOOF_HIGHLY_RESTRICTIVE;
 
     UnicodeSet *allowedCharsSet = new UnicodeSet(0, 0x10ffff);
     allowedCharsSet->freeze();
     fAllowedCharsSet = allowedCharsSet;
     fAllowedLocales  = uprv_strdup("");
     if (fAllowedCharsSet == NULL || fAllowedLocales == NULL) {
         status = U_MEMORY_ALLOCATION_ERROR;
         return;
     }
@@ skipping 446 matching lines @@
             uprv_memcpy(version, pInfo->dataVersion, 4);
         }
         return TRUE;
     } else {
         return FALSE;
     }
 }
 
 //
 //  SpoofData::getDefault() - return a wrapper around the spoof data that is
-//                           baked into the default ICU data.
+//                            baked into the default ICU data.
+//
+//               Called once, from the initOnce() function in uspoof_impl.cpp; the resulting
+//               SpoofData is shared by all spoof checkers using the default data.
 //
 SpoofData *SpoofData::getDefault(UErrorCode &status) {
-    // TODO:  Cache it.  Lazy create, keep until cleanup.
-
     UDataMemory *udm = udata_openChoice(NULL, "cfu", "confusables",
                                         spoofDataIsAcceptable, 
                                         NULL,       // context, would receive dataVersion if supplied.
                                         &status);
     if (U_FAILURE(status)) {
         return NULL;
     }
     SpoofData *This = new SpoofData(udm, status);
     if (U_FAILURE(status)) {
         delete This;
@@ skipping 42 matching lines @@
 
 
 // Spoof Data constructor for use from data builder.
 //   Initializes a new, empty data area that will be populated later.
 SpoofData::SpoofData(UErrorCode &status) {
     reset();
     if (U_FAILURE(status)) {
         return;
     }
     fDataOwned = true;
-    fRefCount = 1;
 
     // The spoof header should already be sized to be a multiple of 16 bytes.
     // Just in case it's not, round it up.
     uint32_t initialSize = (sizeof(SpoofDataHeader) + 15) & ~15;
     U_ASSERT(initialSize == sizeof(SpoofDataHeader));
     
     fRawData = static_cast<SpoofDataHeader *>(uprv_malloc(initialSize));
     fMemLimit = initialSize;
     if (fRawData == NULL) {
         status = U_MEMORY_ALLOCATION_ERROR;
@@ skipping 281 matching lines @@
     }
     // swap starting at fLength
     ds->swapArray32(ds, &spoofDH->fLength, sizeof(SpoofDataHeader)-8 /* minus magic and fFormatVersion[4] */, &outputDH->fLength, status);
 
     return totalSize;
 }
 
 #endif