Restoring authorship annotation for <mcheshkov@yandex-team.ru>. Commit 2 of 2.

1 files changed, 129 insertions, 129 deletions

diff --git a/contrib/libs/icu/i18n/numsys.cpp b/contrib/libs/icu/i18n/numsys.cpp
index aaae821e98..62d555aad2 100644
--- a/contrib/libs/icu/i18n/numsys.cpp
+++ b/contrib/libs/icu/i18n/numsys.cpp
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others. 
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
@@ -25,9 +25,9 @@
 #include "unicode/schriter.h"
 #include "unicode/numsys.h"
 #include "cstring.h"
-#include "uassert.h" 
-#include "ucln_in.h" 
-#include "umutex.h" 
+#include "uassert.h"
+#include "ucln_in.h"
+#include "umutex.h"
 #include "uresimp.h"
 #include "numsys_impl.h"
 
@@ -37,7 +37,7 @@ U_NAMESPACE_BEGIN
 
 // Useful constants
 
-#define DEFAULT_DIGITS UNICODE_STRING_SIMPLE("0123456789") 
+#define DEFAULT_DIGITS UNICODE_STRING_SIMPLE("0123456789")
 static const char gNumberingSystems[] = "numberingSystems";
 static const char gNumberElements[] = "NumberElements";
 static const char gDefault[] = "default";
@@ -81,82 +81,82 @@ NumberingSystem* U_EXPORT2
 NumberingSystem::createInstance(int32_t radix_in, UBool isAlgorithmic_in, const UnicodeString & desc_in, UErrorCode &status) {
 
     if (U_FAILURE(status)) {
-        return nullptr; 
+        return nullptr;
     }
 
     if ( radix_in < 2 ) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
-        return nullptr; 
+        return nullptr;
     }
 
     if ( !isAlgorithmic_in ) {
        if ( desc_in.countChar32() != radix_in ) {
            status = U_ILLEGAL_ARGUMENT_ERROR;
-           return nullptr; 
+           return nullptr;
        }
     }
 
-    LocalPointer<NumberingSystem> ns(new NumberingSystem(), status); 
-    if (U_FAILURE(status)) { 
-        return nullptr; 
-    } 
+    LocalPointer<NumberingSystem> ns(new NumberingSystem(), status);
+    if (U_FAILURE(status)) {
+        return nullptr;
+    }
 
     ns->setRadix(radix_in);
     ns->setDesc(desc_in);
     ns->setAlgorithmic(isAlgorithmic_in);
-    ns->setName(nullptr); 
- 
-    return ns.orphan(); 
+    ns->setName(nullptr);
+
+    return ns.orphan();
 }
 
 NumberingSystem* U_EXPORT2
 NumberingSystem::createInstance(const Locale & inLocale, UErrorCode& status) {
 
     if (U_FAILURE(status)) {
-        return nullptr; 
+        return nullptr;
     }
 
     UBool nsResolved = TRUE;
     UBool usingFallback = FALSE;
-    char buffer[ULOC_KEYWORDS_CAPACITY] = ""; 
-    int32_t count = inLocale.getKeywordValue("numbers", buffer, sizeof(buffer), status); 
-    if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING) { 
-        // the "numbers" keyword exceeds ULOC_KEYWORDS_CAPACITY; ignore and use default. 
-        count = 0; 
-        status = U_ZERO_ERROR; 
-    } 
+    char buffer[ULOC_KEYWORDS_CAPACITY] = "";
+    int32_t count = inLocale.getKeywordValue("numbers", buffer, sizeof(buffer), status);
+    if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING) {
+        // the "numbers" keyword exceeds ULOC_KEYWORDS_CAPACITY; ignore and use default.
+        count = 0;
+        status = U_ZERO_ERROR;
+    }
     if ( count > 0 ) { // @numbers keyword was specified in the locale
-        U_ASSERT(count < ULOC_KEYWORDS_CAPACITY); 
+        U_ASSERT(count < ULOC_KEYWORDS_CAPACITY);
         buffer[count] = '\0'; // Make sure it is null terminated.
         if ( !uprv_strcmp(buffer,gDefault) || !uprv_strcmp(buffer,gNative) || 
              !uprv_strcmp(buffer,gTraditional) || !uprv_strcmp(buffer,gFinance)) {
             nsResolved = FALSE;
         }
     } else {
-        uprv_strcpy(buffer, gDefault); 
+        uprv_strcpy(buffer, gDefault);
         nsResolved = FALSE;
     }
 
     if (!nsResolved) { // Resolve the numbering system ( default, native, traditional or finance ) into a "real" numbering system
         UErrorCode localStatus = U_ZERO_ERROR;
-        LocalUResourceBundlePointer resource(ures_open(nullptr, inLocale.getName(), &localStatus)); 
-        LocalUResourceBundlePointer numberElementsRes(ures_getByKey(resource.getAlias(), gNumberElements, nullptr, &localStatus)); 
-        // Don't stomp on the catastrophic failure of OOM. 
-        if (localStatus == U_MEMORY_ALLOCATION_ERROR) { 
-            status = U_MEMORY_ALLOCATION_ERROR; 
-            return nullptr; 
-        } 
+        LocalUResourceBundlePointer resource(ures_open(nullptr, inLocale.getName(), &localStatus));
+        LocalUResourceBundlePointer numberElementsRes(ures_getByKey(resource.getAlias(), gNumberElements, nullptr, &localStatus));
+        // Don't stomp on the catastrophic failure of OOM.
+        if (localStatus == U_MEMORY_ALLOCATION_ERROR) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+            return nullptr;
+        }
         while (!nsResolved) {
             localStatus = U_ZERO_ERROR;
             count = 0;
-            const UChar *nsName = ures_getStringByKeyWithFallback(numberElementsRes.getAlias(), buffer, &count, &localStatus); 
-            // Don't stomp on the catastrophic failure of OOM. 
-            if (localStatus == U_MEMORY_ALLOCATION_ERROR) { 
-                status = U_MEMORY_ALLOCATION_ERROR; 
-                return nullptr; 
-            } 
+            const UChar *nsName = ures_getStringByKeyWithFallback(numberElementsRes.getAlias(), buffer, &count, &localStatus);
+            // Don't stomp on the catastrophic failure of OOM.
+            if (localStatus == U_MEMORY_ALLOCATION_ERROR) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                return nullptr;
+            }
             if ( count > 0 && count < ULOC_KEYWORDS_CAPACITY ) { // numbering system found
-                u_UCharsToChars(nsName, buffer, count); 
+                u_UCharsToChars(nsName, buffer, count);
                 buffer[count] = '\0'; // Make sure it is null terminated.
                 nsResolved = TRUE;
             } 
@@ -177,12 +177,12 @@ NumberingSystem::createInstance(const Locale & inLocale, UErrorCode& status) {
     if (usingFallback) {
         status = U_USING_FALLBACK_WARNING;
         NumberingSystem *ns = new NumberingSystem();
-        if (ns == nullptr) { 
-            status = U_MEMORY_ALLOCATION_ERROR; 
-        } 
+        if (ns == nullptr) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+        }
         return ns;
     } else {
-        return NumberingSystem::createInstanceByName(buffer, status); 
+        return NumberingSystem::createInstanceByName(buffer, status);
     }
  }
 
@@ -196,34 +196,34 @@ NumberingSystem::createInstanceByName(const char *name, UErrorCode& status) {
     int32_t radix = 10;
     int32_t algorithmic = 0;
 
-    LocalUResourceBundlePointer numberingSystemsInfo(ures_openDirect(nullptr, gNumberingSystems, &status)); 
-    LocalUResourceBundlePointer nsCurrent(ures_getByKey(numberingSystemsInfo.getAlias(), gNumberingSystems, nullptr, &status)); 
-    LocalUResourceBundlePointer nsTop(ures_getByKey(nsCurrent.getAlias(), name, nullptr, &status)); 
+    LocalUResourceBundlePointer numberingSystemsInfo(ures_openDirect(nullptr, gNumberingSystems, &status));
+    LocalUResourceBundlePointer nsCurrent(ures_getByKey(numberingSystemsInfo.getAlias(), gNumberingSystems, nullptr, &status));
+    LocalUResourceBundlePointer nsTop(ures_getByKey(nsCurrent.getAlias(), name, nullptr, &status));
+
+    UnicodeString nsd = ures_getUnicodeStringByKey(nsTop.getAlias(), gDesc, &status);
 
-    UnicodeString nsd = ures_getUnicodeStringByKey(nsTop.getAlias(), gDesc, &status); 
+    ures_getByKey(nsTop.getAlias(), gRadix, nsCurrent.getAlias(), &status);
+    radix = ures_getInt(nsCurrent.getAlias(), &status);
 
-    ures_getByKey(nsTop.getAlias(), gRadix, nsCurrent.getAlias(), &status); 
-    radix = ures_getInt(nsCurrent.getAlias(), &status); 
+    ures_getByKey(nsTop.getAlias(), gAlgorithmic, nsCurrent.getAlias(), &status);
+    algorithmic = ures_getInt(nsCurrent.getAlias(), &status);
 
-    ures_getByKey(nsTop.getAlias(), gAlgorithmic, nsCurrent.getAlias(), &status); 
-    algorithmic = ures_getInt(nsCurrent.getAlias(), &status); 
- 
     UBool isAlgorithmic = ( algorithmic == 1 );
 
-    if (U_FAILURE(status)) { 
-        // Don't stomp on the catastrophic failure of OOM. 
-        if (status != U_MEMORY_ALLOCATION_ERROR) { 
-            status = U_UNSUPPORTED_ERROR; 
-        } 
-        return nullptr; 
-    } 
+    if (U_FAILURE(status)) {
+        // Don't stomp on the catastrophic failure of OOM.
+        if (status != U_MEMORY_ALLOCATION_ERROR) {
+            status = U_UNSUPPORTED_ERROR;
+        }
+        return nullptr;
+    }
 
-    LocalPointer<NumberingSystem> ns(NumberingSystem::createInstance(radix, isAlgorithmic, nsd, status), status); 
+    LocalPointer<NumberingSystem> ns(NumberingSystem::createInstance(radix, isAlgorithmic, nsd, status), status);
     if (U_FAILURE(status)) {
-        return nullptr; 
+        return nullptr;
     }
     ns->setName(name);
-    return ns.orphan(); 
+    return ns.orphan();
 }
 
     /**
@@ -253,99 +253,99 @@ void NumberingSystem::setAlgorithmic(UBool c) {
     algorithmic = c;
 }
 
-void NumberingSystem::setDesc(const UnicodeString &d) { 
+void NumberingSystem::setDesc(const UnicodeString &d) {
     desc.setTo(d);
 }
 void NumberingSystem::setName(const char *n) {
-    if ( n == nullptr ) { 
+    if ( n == nullptr ) {
         name[0] = (char) 0;
     } else {
-        uprv_strncpy(name,n,kInternalNumSysNameCapacity); 
-        name[kInternalNumSysNameCapacity] = '\0'; // Make sure it is null terminated. 
+        uprv_strncpy(name,n,kInternalNumSysNameCapacity);
+        name[kInternalNumSysNameCapacity] = '\0'; // Make sure it is null terminated.
     }
 }
 UBool NumberingSystem::isAlgorithmic() const {
     return ( algorithmic );
 }
 
-namespace { 
-
-UVector* gNumsysNames = nullptr; 
-UInitOnce gNumSysInitOnce = U_INITONCE_INITIALIZER; 
- 
-U_CFUNC UBool U_CALLCONV numSysCleanup() { 
-    delete gNumsysNames; 
-    gNumsysNames = nullptr; 
-    gNumSysInitOnce.reset(); 
-    return true; 
-} 
- 
-U_CFUNC void initNumsysNames(UErrorCode &status) { 
-    U_ASSERT(gNumsysNames == nullptr); 
-    ucln_i18n_registerCleanup(UCLN_I18N_NUMSYS, numSysCleanup); 
- 
-    // TODO: Simple array of UnicodeString objects, based on length of table resource? 
-    LocalPointer<UVector> numsysNames(new UVector(uprv_deleteUObject, nullptr, status), status); 
+namespace {
+
+UVector* gNumsysNames = nullptr;
+UInitOnce gNumSysInitOnce = U_INITONCE_INITIALIZER;
+
+U_CFUNC UBool U_CALLCONV numSysCleanup() {
+    delete gNumsysNames;
+    gNumsysNames = nullptr;
+    gNumSysInitOnce.reset();
+    return true;
+}
+
+U_CFUNC void initNumsysNames(UErrorCode &status) {
+    U_ASSERT(gNumsysNames == nullptr);
+    ucln_i18n_registerCleanup(UCLN_I18N_NUMSYS, numSysCleanup);
+
+    // TODO: Simple array of UnicodeString objects, based on length of table resource?
+    LocalPointer<UVector> numsysNames(new UVector(uprv_deleteUObject, nullptr, status), status);
     if (U_FAILURE(status)) {
-        return; 
+        return;
     }
 
-    UErrorCode rbstatus = U_ZERO_ERROR; 
-    UResourceBundle *numberingSystemsInfo = ures_openDirect(nullptr, "numberingSystems", &rbstatus); 
-    numberingSystemsInfo = 
-            ures_getByKey(numberingSystemsInfo, "numberingSystems", numberingSystemsInfo, &rbstatus); 
-    if (U_FAILURE(rbstatus)) { 
-        // Don't stomp on the catastrophic failure of OOM. 
-        if (rbstatus == U_MEMORY_ALLOCATION_ERROR) { 
-            status = rbstatus; 
-        } else { 
+    UErrorCode rbstatus = U_ZERO_ERROR;
+    UResourceBundle *numberingSystemsInfo = ures_openDirect(nullptr, "numberingSystems", &rbstatus);
+    numberingSystemsInfo =
+            ures_getByKey(numberingSystemsInfo, "numberingSystems", numberingSystemsInfo, &rbstatus);
+    if (U_FAILURE(rbstatus)) {
+        // Don't stomp on the catastrophic failure of OOM.
+        if (rbstatus == U_MEMORY_ALLOCATION_ERROR) {
+            status = rbstatus;
+        } else {
             status = U_MISSING_RESOURCE_ERROR;
         }
-        ures_close(numberingSystemsInfo); 
-        return; 
-    } 
-
-    while ( ures_hasNext(numberingSystemsInfo) && U_SUCCESS(status) ) { 
-        LocalUResourceBundlePointer nsCurrent(ures_getNextResource(numberingSystemsInfo, nullptr, &rbstatus)); 
-        if (rbstatus == U_MEMORY_ALLOCATION_ERROR) { 
-            status = rbstatus; // we want to report OOM failure back to the caller. 
-            break; 
+        ures_close(numberingSystemsInfo);
+        return;
+    }
+
+    while ( ures_hasNext(numberingSystemsInfo) && U_SUCCESS(status) ) {
+        LocalUResourceBundlePointer nsCurrent(ures_getNextResource(numberingSystemsInfo, nullptr, &rbstatus));
+        if (rbstatus == U_MEMORY_ALLOCATION_ERROR) {
+            status = rbstatus; // we want to report OOM failure back to the caller.
+            break;
         }
-        const char *nsName = ures_getKey(nsCurrent.getAlias()); 
-        LocalPointer<UnicodeString> newElem(new UnicodeString(nsName, -1, US_INV), status); 
-        if (U_SUCCESS(status)) { 
-            numsysNames->addElement(newElem.getAlias(), status); 
-            if (U_SUCCESS(status)) { 
-                newElem.orphan(); // on success, the numsysNames vector owns newElem. 
-            } 
+        const char *nsName = ures_getKey(nsCurrent.getAlias());
+        LocalPointer<UnicodeString> newElem(new UnicodeString(nsName, -1, US_INV), status);
+        if (U_SUCCESS(status)) {
+            numsysNames->addElement(newElem.getAlias(), status);
+            if (U_SUCCESS(status)) {
+                newElem.orphan(); // on success, the numsysNames vector owns newElem.
+            }
         }
     }
 
-    ures_close(numberingSystemsInfo); 
-    if (U_SUCCESS(status)) { 
-        gNumsysNames = numsysNames.orphan(); 
-    } 
-    return; 
+    ures_close(numberingSystemsInfo);
+    if (U_SUCCESS(status)) {
+        gNumsysNames = numsysNames.orphan();
+    }
+    return;
+}
+
+}   // end anonymous namespace
+
+StringEnumeration* NumberingSystem::getAvailableNames(UErrorCode &status) {
+    umtx_initOnce(gNumSysInitOnce, &initNumsysNames, status);
+    LocalPointer<StringEnumeration> result(new NumsysNameEnumeration(status), status);
+    return result.orphan();
 }
 
-}   // end anonymous namespace 
- 
-StringEnumeration* NumberingSystem::getAvailableNames(UErrorCode &status) { 
-    umtx_initOnce(gNumSysInitOnce, &initNumsysNames, status); 
-    LocalPointer<StringEnumeration> result(new NumsysNameEnumeration(status), status); 
-    return result.orphan(); 
+NumsysNameEnumeration::NumsysNameEnumeration(UErrorCode& status) : pos(0) {
+    (void)status;
 }
 
-NumsysNameEnumeration::NumsysNameEnumeration(UErrorCode& status) : pos(0) { 
-    (void)status; 
-} 
- 
 const UnicodeString*
 NumsysNameEnumeration::snext(UErrorCode& status) {
-    if (U_SUCCESS(status) && (gNumsysNames != nullptr) && (pos < gNumsysNames->size())) { 
-        return (const UnicodeString*)gNumsysNames->elementAt(pos++); 
+    if (U_SUCCESS(status) && (gNumsysNames != nullptr) && (pos < gNumsysNames->size())) {
+        return (const UnicodeString*)gNumsysNames->elementAt(pos++);
     }
-    return nullptr; 
+    return nullptr;
 }
 
 void
@@ -355,7 +355,7 @@ NumsysNameEnumeration::reset(UErrorCode& /*status*/) {
 
 int32_t
 NumsysNameEnumeration::count(UErrorCode& /*status*/) const {
-    return (gNumsysNames==nullptr) ? 0 : gNumsysNames->size(); 
+    return (gNumsysNames==nullptr) ? 0 : gNumsysNames->size();
 }
 
 NumsysNameEnumeration::~NumsysNameEnumeration() {