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

1 files changed, 77 insertions, 77 deletions

diff --git a/contrib/libs/icu/common/uresdata.cpp b/contrib/libs/icu/common/uresdata.cpp
index b3c2e2e27cc..b65ea1ff696 100644
--- a/contrib/libs/icu/common/uresdata.cpp
+++ b/contrib/libs/icu/common/uresdata.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
 /*
 *******************************************************************************
@@ -6,7 +6,7 @@
 *               and others. All Rights Reserved.
 *******************************************************************************
 *   file name:  uresdata.cpp
-*   encoding:   UTF-8
+*   encoding:   UTF-8 
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ -33,7 +33,7 @@
 #include "uinvchar.h"
 #include "uresdata.h"
 #include "uresimp.h"
-#include "utracimp.h"
+#include "utracimp.h" 
 
 /*
  * Resource access helpers
@@ -308,7 +308,7 @@ res_getPublicType(Resource res) {
 }
 
 U_CAPI const UChar * U_EXPORT2
-res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) {
+res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { 
     const UChar *p;
     uint32_t offset=RES_GET_OFFSET(res);
     int32_t length;
@@ -403,8 +403,8 @@ int32_t getStringArray(const ResourceData *pResData, const icu::ResourceArray &a
     }
     for(int32_t i = 0; i < length; ++i) {
         int32_t sLength;
-        // No tracing: handled by the caller
-        const UChar *s = res_getStringNoTrace(pResData, array.internalGetResource(pResData, i), &sLength);
+        // No tracing: handled by the caller 
+        const UChar *s = res_getStringNoTrace(pResData, array.internalGetResource(pResData, i), &sLength); 
         if(s == NULL) {
             errorCode = U_RESOURCE_TYPE_MISMATCH;
             return 0;
@@ -436,7 +436,7 @@ res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength) {
 }
 
 U_CAPI const uint8_t * U_EXPORT2
-res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) {
+res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { 
     const uint8_t *p;
     uint32_t offset=RES_GET_OFFSET(res);
     int32_t length;
@@ -456,7 +456,7 @@ res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLengt
 
 
 U_CAPI const int32_t * U_EXPORT2
-res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) {
+res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { 
     const int32_t *p;
     uint32_t offset=RES_GET_OFFSET(res);
     int32_t length;
@@ -509,7 +509,7 @@ const UChar *ResourceDataValue::getString(int32_t &length, UErrorCode &errorCode
     if(U_FAILURE(errorCode)) {
         return NULL;
     }
-    const UChar *s = res_getString(fTraceInfo, &getData(), res, &length);
+    const UChar *s = res_getString(fTraceInfo, &getData(), res, &length); 
     if(s == NULL) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
@@ -520,7 +520,7 @@ const UChar *ResourceDataValue::getAliasString(int32_t &length, UErrorCode &erro
     if(U_FAILURE(errorCode)) {
         return NULL;
     }
-    const UChar *s = res_getAlias(&getData(), res, &length);
+    const UChar *s = res_getAlias(&getData(), res, &length); 
     if(s == NULL) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
@@ -534,7 +534,7 @@ int32_t ResourceDataValue::getInt(UErrorCode &errorCode) const {
     if(RES_GET_TYPE(res) != URES_INT) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
-    return res_getInt(fTraceInfo, res);
+    return res_getInt(fTraceInfo, res); 
 }
 
 uint32_t ResourceDataValue::getUInt(UErrorCode &errorCode) const {
@@ -544,14 +544,14 @@ uint32_t ResourceDataValue::getUInt(UErrorCode &errorCode) const {
     if(RES_GET_TYPE(res) != URES_INT) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
-    return res_getUInt(fTraceInfo, res);
+    return res_getUInt(fTraceInfo, res); 
 }
 
 const int32_t *ResourceDataValue::getIntVector(int32_t &length, UErrorCode &errorCode) const {
     if(U_FAILURE(errorCode)) {
         return NULL;
     }
-    const int32_t *iv = res_getIntVector(fTraceInfo, &getData(), res, &length);
+    const int32_t *iv = res_getIntVector(fTraceInfo, &getData(), res, &length); 
     if(iv == NULL) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
@@ -562,7 +562,7 @@ const uint8_t *ResourceDataValue::getBinary(int32_t &length, UErrorCode &errorCo
     if(U_FAILURE(errorCode)) {
         return NULL;
     }
-    const uint8_t *b = res_getBinary(fTraceInfo, &getData(), res, &length);
+    const uint8_t *b = res_getBinary(fTraceInfo, &getData(), res, &length); 
     if(b == NULL) {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
     }
@@ -580,19 +580,19 @@ ResourceArray ResourceDataValue::getArray(UErrorCode &errorCode) const {
     switch(RES_GET_TYPE(res)) {
     case URES_ARRAY:
         if (offset!=0) {  // empty if offset==0
-            items32 = (const Resource *)getData().pRoot+offset;
+            items32 = (const Resource *)getData().pRoot+offset; 
             length = *items32++;
         }
         break;
     case URES_ARRAY16:
-        items16 = getData().p16BitUnits+offset;
+        items16 = getData().p16BitUnits+offset; 
         length = *items16++;
         break;
     default:
         errorCode = U_RESOURCE_TYPE_MISMATCH;
         return ResourceArray();
     }
-    return ResourceArray(items16, items32, length, fTraceInfo);
+    return ResourceArray(items16, items32, length, fTraceInfo); 
 }
 
 ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const {
@@ -608,19 +608,19 @@ ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const {
     switch(RES_GET_TYPE(res)) {
     case URES_TABLE:
         if (offset != 0) {  // empty if offset==0
-            keys16 = (const uint16_t *)(getData().pRoot+offset);
+            keys16 = (const uint16_t *)(getData().pRoot+offset); 
             length = *keys16++;
             items32 = (const Resource *)(keys16+length+(~length&1));
         }
         break;
     case URES_TABLE16:
-        keys16 = getData().p16BitUnits+offset;
+        keys16 = getData().p16BitUnits+offset; 
         length = *keys16++;
         items16 = keys16 + length;
         break;
     case URES_TABLE32:
         if (offset != 0) {  // empty if offset==0
-            keys32 = getData().pRoot+offset;
+            keys32 = getData().pRoot+offset; 
             length = *keys32++;
             items32 = (const Resource *)keys32 + length;
         }
@@ -629,22 +629,22 @@ ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const {
         errorCode = U_RESOURCE_TYPE_MISMATCH;
         return ResourceTable();
     }
-    return ResourceTable(keys16, keys32, items16, items32, length, fTraceInfo);
+    return ResourceTable(keys16, keys32, items16, items32, length, fTraceInfo); 
 }
 
 UBool ResourceDataValue::isNoInheritanceMarker() const {
-    return ::isNoInheritanceMarker(&getData(), res);
+    return ::isNoInheritanceMarker(&getData(), res); 
 }
 
 int32_t ResourceDataValue::getStringArray(UnicodeString *dest, int32_t capacity,
                                           UErrorCode &errorCode) const {
-    return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode);
+    return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode); 
 }
 
 int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, int32_t capacity,
                                                          UErrorCode &errorCode) const {
     if(URES_IS_ARRAY(res)) {
-        return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode);
+        return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode); 
     }
     if(U_FAILURE(errorCode)) {
         return 0;
@@ -658,7 +658,7 @@ int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, in
         return 1;
     }
     int32_t sLength;
-    const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength);
+    const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); 
     if(s != NULL) {
         dest[0].setTo(TRUE, s, sLength);
         return 1;
@@ -673,7 +673,7 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode)
         return us;
     }
     int32_t sLength;
-    const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength);
+    const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); 
     if(s != NULL) {
         us.setTo(TRUE, s, sLength);
         return us;
@@ -683,8 +683,8 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode)
         return us;
     }
     if(array.getSize() > 0) {
-        // Tracing is already performed above (unimportant for trace that this is an array)
-        s = res_getStringNoTrace(&getData(), array.internalGetResource(&getData(), 0), &sLength);
+        // Tracing is already performed above (unimportant for trace that this is an array) 
+        s = res_getStringNoTrace(&getData(), array.internalGetResource(&getData(), 0), &sLength); 
         if(s != NULL) {
             us.setTo(TRUE, s, sLength);
             return us;
@@ -761,9 +761,9 @@ res_getTableItemByIndex(const ResourceData *pResData, Resource table,
                         int32_t indexR, const char **key) {
     uint32_t offset=RES_GET_OFFSET(table);
     int32_t length;
-    if (indexR < 0) {
-        return RES_BOGUS;
-    }
+    if (indexR < 0) { 
+        return RES_BOGUS; 
+    } 
     switch(RES_GET_TYPE(table)) {
     case URES_TABLE: {
         if (offset != 0) { /* empty if offset==0 */
@@ -821,56 +821,56 @@ UBool icu::ResourceTable::getKeyAndValue(int32_t i,
                                          const char *&key, icu::ResourceValue &value) const {
     if(0 <= i && i < length) {
         icu::ResourceDataValue &rdValue = static_cast<icu::ResourceDataValue &>(value);
-        if (keys16 != nullptr) {
-            key = RES_GET_KEY16(&rdValue.getData(), keys16[i]);
+        if (keys16 != nullptr) { 
+            key = RES_GET_KEY16(&rdValue.getData(), keys16[i]); 
         } else {
-            key = RES_GET_KEY32(&rdValue.getData(), keys32[i]);
+            key = RES_GET_KEY32(&rdValue.getData(), keys32[i]); 
         }
         Resource res;
-        if (items16 != nullptr) {
-            res = makeResourceFrom16(&rdValue.getData(), items16[i]);
+        if (items16 != nullptr) { 
+            res = makeResourceFrom16(&rdValue.getData(), items16[i]); 
         } else {
             res = items32[i];
         }
-        // Note: the ResourceTracer keeps a reference to the field of this
-        // ResourceTable. This is OK because the ResourceTable should remain
-        // alive for the duration that fields are being read from it
-        // (including nested fields).
-        rdValue.setResource(res, ResourceTracer(fTraceInfo, key));
-        return TRUE;
-    }
-    return FALSE;
-}
-
-UBool icu::ResourceTable::findValue(const char *key, ResourceValue &value) const {
-    icu::ResourceDataValue &rdValue = static_cast<icu::ResourceDataValue &>(value);
-    const char *realKey = nullptr;
-    int32_t i;
-    if (keys16 != nullptr) {
-        i = _res_findTableItem(&rdValue.getData(), keys16, length, key, &realKey);
-    } else {
-        i = _res_findTable32Item(&rdValue.getData(), keys32, length, key, &realKey);
-    }
-    if (i >= 0) {
-        Resource res;
-        if (items16 != nullptr) {
-            res = makeResourceFrom16(&rdValue.getData(), items16[i]);
-        } else {
-            res = items32[i];
-        }
-        // Same note about lifetime as in getKeyAndValue().
-        rdValue.setResource(res, ResourceTracer(fTraceInfo, key));
+        // Note: the ResourceTracer keeps a reference to the field of this 
+        // ResourceTable. This is OK because the ResourceTable should remain 
+        // alive for the duration that fields are being read from it 
+        // (including nested fields). 
+        rdValue.setResource(res, ResourceTracer(fTraceInfo, key)); 
         return TRUE;
     }
     return FALSE;
 }
 
+UBool icu::ResourceTable::findValue(const char *key, ResourceValue &value) const { 
+    icu::ResourceDataValue &rdValue = static_cast<icu::ResourceDataValue &>(value); 
+    const char *realKey = nullptr; 
+    int32_t i; 
+    if (keys16 != nullptr) { 
+        i = _res_findTableItem(&rdValue.getData(), keys16, length, key, &realKey); 
+    } else { 
+        i = _res_findTable32Item(&rdValue.getData(), keys32, length, key, &realKey); 
+    } 
+    if (i >= 0) { 
+        Resource res; 
+        if (items16 != nullptr) { 
+            res = makeResourceFrom16(&rdValue.getData(), items16[i]); 
+        } else { 
+            res = items32[i]; 
+        } 
+        // Same note about lifetime as in getKeyAndValue(). 
+        rdValue.setResource(res, ResourceTracer(fTraceInfo, key)); 
+        return TRUE; 
+    } 
+    return FALSE; 
+} 
+ 
 U_CAPI Resource U_EXPORT2
 res_getArrayItem(const ResourceData *pResData, Resource array, int32_t indexR) {
     uint32_t offset=RES_GET_OFFSET(array);
-    if (indexR < 0) {
-        return RES_BOGUS;
-    }
+    if (indexR < 0) { 
+        return RES_BOGUS; 
+    } 
     switch(RES_GET_TYPE(array)) {
     case URES_ARRAY: {
         if (offset!=0) { /* empty if offset==0 */
@@ -905,13 +905,13 @@ uint32_t icu::ResourceArray::internalGetResource(const ResourceData *pResData, i
 UBool icu::ResourceArray::getValue(int32_t i, icu::ResourceValue &value) const {
     if(0 <= i && i < length) {
         icu::ResourceDataValue &rdValue = static_cast<icu::ResourceDataValue &>(value);
-        // Note: the ResourceTracer keeps a reference to the field of this
-        // ResourceArray. This is OK because the ResourceArray should remain
-        // alive for the duration that fields are being read from it
-        // (including nested fields).
-        rdValue.setResource(
-            internalGetResource(&rdValue.getData(), i),
-            ResourceTracer(fTraceInfo, i));
+        // Note: the ResourceTracer keeps a reference to the field of this 
+        // ResourceArray. This is OK because the ResourceArray should remain 
+        // alive for the duration that fields are being read from it 
+        // (including nested fields). 
+        rdValue.setResource( 
+            internalGetResource(&rdValue.getData(), i), 
+            ResourceTracer(fTraceInfo, i)); 
         return TRUE;
     }
     return FALSE;
@@ -963,14 +963,14 @@ res_findResource(const ResourceData *pResData, Resource r, char** path, const ch
       if(t2 == RES_BOGUS) { 
         /* if we fail to get the resource by key, maybe we got an index */
         indexR = uprv_strtol(pathP, &closeIndex, 10);
-        if(indexR >= 0 && *closeIndex == 0) {
+        if(indexR >= 0 && *closeIndex == 0) { 
           /* if we indeed have an index, try to get the item by index */
           t2 = res_getTableItemByIndex(pResData, t1, indexR, key);
-        } // else t2 is already RES_BOGUS
+        } // else t2 is already RES_BOGUS 
       }
     } else if(URES_IS_ARRAY(type)) {
       indexR = uprv_strtol(pathP, &closeIndex, 10);
-      if(indexR >= 0 && *closeIndex == 0) {
+      if(indexR >= 0 && *closeIndex == 0) { 
         t2 = res_getArrayItem(pResData, t1, indexR);
       } else {
         t2 = RES_BOGUS; /* have an array, but don't have a valid index */