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

1 files changed, 341 insertions, 341 deletions

diff --git a/contrib/libs/icu/common/cstring.cpp b/contrib/libs/icu/common/cstring.cpp
index 07a64dfa65..06275c4b56 100644
--- a/contrib/libs/icu/common/cstring.cpp
+++ b/contrib/libs/icu/common/cstring.cpp
@@ -1,341 +1,341 @@
-// © 2016 and later: Unicode, Inc. and others. 
-// License & terms of use: http://www.unicode.org/copyright.html 
-/* 
-****************************************************************************** 
-* 
-*   Copyright (C) 1997-2011, International Business Machines 
-*   Corporation and others.  All Rights Reserved. 
-* 
-****************************************************************************** 
-* 
-* File CSTRING.C 
-* 
-* @author       Helena Shih 
-* 
-* Modification History: 
-* 
-*   Date        Name        Description 
-*   6/18/98     hshih       Created 
-*   09/08/98    stephen     Added include for ctype, for Mac Port 
-*   11/15/99    helena      Integrated S/390 IEEE changes.  
-****************************************************************************** 
-*/ 
- 
- 
- 
-#include <stdlib.h> 
-#include <stdio.h> 
-#include "unicode/utypes.h" 
-#include "cmemory.h" 
-#include "cstring.h" 
-#include "uassert.h" 
- 
-/* 
- * We hardcode case conversion for invariant characters to match our expectation 
- * and the compiler execution charset. 
- * This prevents problems on systems 
- * - with non-default casing behavior, like Turkish system locales where 
- *   tolower('I') maps to dotless i and toupper('i') maps to dotted I 
- * - where there are no lowercase Latin characters at all, or using different 
- *   codes (some old EBCDIC codepages) 
- * 
- * This works because the compiler usually runs on a platform where the execution 
- * charset includes all of the invariant characters at their expected 
- * code positions, so that the char * string literals in ICU code match 
- * the char literals here. 
- * 
- * Note that the set of lowercase Latin letters is discontiguous in EBCDIC 
- * and the set of uppercase Latin letters is discontiguous as well. 
- */ 
- 
-U_CAPI UBool U_EXPORT2 
-uprv_isASCIILetter(char c) { 
-#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY 
-    return 
-        ('a'<=c && c<='i') || ('j'<=c && c<='r') || ('s'<=c && c<='z') || 
-        ('A'<=c && c<='I') || ('J'<=c && c<='R') || ('S'<=c && c<='Z'); 
-#else 
-    return ('a'<=c && c<='z') || ('A'<=c && c<='Z'); 
-#endif 
-} 
- 
-U_CAPI char U_EXPORT2 
-uprv_toupper(char c) { 
-#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY 
-    if(('a'<=c && c<='i') || ('j'<=c && c<='r') || ('s'<=c && c<='z')) { 
-        c=(char)(c+('A'-'a')); 
-    } 
-#else 
-    if('a'<=c && c<='z') { 
-        c=(char)(c+('A'-'a')); 
-    } 
-#endif 
-    return c; 
-} 
- 
- 
-#if 0 
-/* 
- * Commented out because cstring.h defines uprv_tolower() to be 
- * the same as either uprv_asciitolower() or uprv_ebcdictolower() 
- * to reduce the amount of code to cover with tests. 
- * 
- * Note that this uprv_tolower() definition is likely to work for most 
- * charset families, not just ASCII and EBCDIC, because its #else branch 
- * is written generically. 
- */ 
-U_CAPI char U_EXPORT2 
-uprv_tolower(char c) { 
-#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY 
-    if(('A'<=c && c<='I') || ('J'<=c && c<='R') || ('S'<=c && c<='Z')) { 
-        c=(char)(c+('a'-'A')); 
-    } 
-#else 
-    if('A'<=c && c<='Z') { 
-        c=(char)(c+('a'-'A')); 
-    } 
-#endif 
-    return c; 
-} 
-#endif 
- 
-U_CAPI char U_EXPORT2 
-uprv_asciitolower(char c) { 
-    if(0x41<=c && c<=0x5a) { 
-        c=(char)(c+0x20); 
-    } 
-    return c; 
-} 
- 
-U_CAPI char U_EXPORT2 
-uprv_ebcdictolower(char c) { 
-    if( (0xc1<=(uint8_t)c && (uint8_t)c<=0xc9) || 
-        (0xd1<=(uint8_t)c && (uint8_t)c<=0xd9) || 
-        (0xe2<=(uint8_t)c && (uint8_t)c<=0xe9) 
-    ) { 
-        c=(char)(c-0x40); 
-    } 
-    return c; 
-} 
- 
- 
-U_CAPI char* U_EXPORT2 
-T_CString_toLowerCase(char* str) 
-{ 
-    char* origPtr = str; 
- 
-    if (str) { 
-        do 
-            *str = (char)uprv_tolower(*str); 
-        while (*(str++)); 
-    } 
- 
-    return origPtr; 
-} 
- 
-U_CAPI char* U_EXPORT2 
-T_CString_toUpperCase(char* str) 
-{ 
-    char* origPtr = str; 
- 
-    if (str) { 
-        do 
-            *str = (char)uprv_toupper(*str); 
-        while (*(str++)); 
-    } 
- 
-    return origPtr; 
-} 
- 
-/* 
- * Takes a int32_t and fills in  a char* string with that number "radix"-based. 
- * Does not handle negative values (makes an empty string for them). 
- * Writes at most 12 chars ("-2147483647" plus NUL). 
- * Returns the length of the string (not including the NUL). 
- */ 
-U_CAPI int32_t U_EXPORT2 
-T_CString_integerToString(char* buffer, int32_t v, int32_t radix) 
-{ 
-    char      tbuf[30]; 
-    int32_t   tbx    = sizeof(tbuf); 
-    uint8_t   digit; 
-    int32_t   length = 0; 
-    uint32_t  uval; 
-     
-    U_ASSERT(radix>=2 && radix<=16); 
-    uval = (uint32_t) v; 
-    if(v<0 && radix == 10) { 
-        /* Only in base 10 do we conside numbers to be signed. */ 
-        uval = (uint32_t)(-v);  
-        buffer[length++] = '-'; 
-    } 
-     
-    tbx = sizeof(tbuf)-1; 
-    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */ 
-    do { 
-        digit = (uint8_t)(uval % radix); 
-        tbuf[--tbx] = (char)(T_CString_itosOffset(digit)); 
-        uval  = uval / radix; 
-    } while (uval != 0); 
-     
-    /* copy converted number into user buffer  */ 
-    uprv_strcpy(buffer+length, tbuf+tbx); 
-    length += sizeof(tbuf) - tbx -1; 
-    return length; 
-} 
- 
- 
- 
-/* 
- * Takes a int64_t and fills in  a char* string with that number "radix"-based. 
- * Writes at most 21: chars ("-9223372036854775807" plus NUL). 
- * Returns the length of the string, not including the terminating NULL. 
- */ 
-U_CAPI int32_t U_EXPORT2 
-T_CString_int64ToString(char* buffer, int64_t v, uint32_t radix) 
-{ 
-    char      tbuf[30]; 
-    int32_t   tbx    = sizeof(tbuf); 
-    uint8_t   digit; 
-    int32_t   length = 0; 
-    uint64_t  uval; 
-     
-    U_ASSERT(radix>=2 && radix<=16); 
-    uval = (uint64_t) v; 
-    if(v<0 && radix == 10) { 
-        /* Only in base 10 do we conside numbers to be signed. */ 
-        uval = (uint64_t)(-v);  
-        buffer[length++] = '-'; 
-    } 
-     
-    tbx = sizeof(tbuf)-1; 
-    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */ 
-    do { 
-        digit = (uint8_t)(uval % radix); 
-        tbuf[--tbx] = (char)(T_CString_itosOffset(digit)); 
-        uval  = uval / radix; 
-    } while (uval != 0); 
-     
-    /* copy converted number into user buffer  */ 
-    uprv_strcpy(buffer+length, tbuf+tbx); 
-    length += sizeof(tbuf) - tbx -1; 
-    return length; 
-} 
- 
- 
-U_CAPI int32_t U_EXPORT2 
-T_CString_stringToInteger(const char *integerString, int32_t radix) 
-{ 
-    char *end; 
-    return uprv_strtoul(integerString, &end, radix); 
- 
-} 
- 
-U_CAPI int U_EXPORT2 
-uprv_stricmp(const char *str1, const char *str2) { 
-    if(str1==NULL) { 
-        if(str2==NULL) { 
-            return 0; 
-        } else { 
-            return -1; 
-        } 
-    } else if(str2==NULL) { 
-        return 1; 
-    } else { 
-        /* compare non-NULL strings lexically with lowercase */ 
-        int rc; 
-        unsigned char c1, c2; 
- 
-        for(;;) { 
-            c1=(unsigned char)*str1; 
-            c2=(unsigned char)*str2; 
-            if(c1==0) { 
-                if(c2==0) { 
-                    return 0; 
-                } else { 
-                    return -1; 
-                } 
-            } else if(c2==0) { 
-                return 1; 
-            } else { 
-                /* compare non-zero characters with lowercase */ 
-                rc=(int)(unsigned char)uprv_tolower(c1)-(int)(unsigned char)uprv_tolower(c2); 
-                if(rc!=0) { 
-                    return rc; 
-                } 
-            } 
-            ++str1; 
-            ++str2; 
-        } 
-    } 
-} 
- 
-U_CAPI int U_EXPORT2 
-uprv_strnicmp(const char *str1, const char *str2, uint32_t n) { 
-    if(str1==NULL) { 
-        if(str2==NULL) { 
-            return 0; 
-        } else { 
-            return -1; 
-        } 
-    } else if(str2==NULL) { 
-        return 1; 
-    } else { 
-        /* compare non-NULL strings lexically with lowercase */ 
-        int rc; 
-        unsigned char c1, c2; 
- 
-        for(; n--;) { 
-            c1=(unsigned char)*str1; 
-            c2=(unsigned char)*str2; 
-            if(c1==0) { 
-                if(c2==0) { 
-                    return 0; 
-                } else { 
-                    return -1; 
-                } 
-            } else if(c2==0) { 
-                return 1; 
-            } else { 
-                /* compare non-zero characters with lowercase */ 
-                rc=(int)(unsigned char)uprv_tolower(c1)-(int)(unsigned char)uprv_tolower(c2); 
-                if(rc!=0) { 
-                    return rc; 
-                } 
-            } 
-            ++str1; 
-            ++str2; 
-        } 
-    } 
- 
-    return 0; 
-} 
- 
-U_CAPI char* U_EXPORT2 
-uprv_strdup(const char *src) { 
-    size_t len = uprv_strlen(src) + 1; 
-    char *dup = (char *) uprv_malloc(len); 
- 
-    if (dup) { 
-        uprv_memcpy(dup, src, len); 
-    } 
- 
-    return dup; 
-} 
- 
-U_CAPI char* U_EXPORT2 
-uprv_strndup(const char *src, int32_t n) { 
-    char *dup; 
- 
-    if(n < 0) { 
-        dup = uprv_strdup(src); 
-    } else { 
-        dup = (char*)uprv_malloc(n+1); 
-        if (dup) {  
-            uprv_memcpy(dup, src, n); 
-            dup[n] = 0; 
-        } 
-    } 
- 
-    return dup; 
-} 
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+/*
+******************************************************************************
+*
+*   Copyright (C) 1997-2011, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+*
+******************************************************************************
+*
+* File CSTRING.C
+*
+* @author       Helena Shih
+*
+* Modification History:
+*
+*   Date        Name        Description
+*   6/18/98     hshih       Created
+*   09/08/98    stephen     Added include for ctype, for Mac Port
+*   11/15/99    helena      Integrated S/390 IEEE changes. 
+******************************************************************************
+*/
+
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "unicode/utypes.h"
+#include "cmemory.h"
+#include "cstring.h"
+#include "uassert.h"
+
+/*
+ * We hardcode case conversion for invariant characters to match our expectation
+ * and the compiler execution charset.
+ * This prevents problems on systems
+ * - with non-default casing behavior, like Turkish system locales where
+ *   tolower('I') maps to dotless i and toupper('i') maps to dotted I
+ * - where there are no lowercase Latin characters at all, or using different
+ *   codes (some old EBCDIC codepages)
+ *
+ * This works because the compiler usually runs on a platform where the execution
+ * charset includes all of the invariant characters at their expected
+ * code positions, so that the char * string literals in ICU code match
+ * the char literals here.
+ *
+ * Note that the set of lowercase Latin letters is discontiguous in EBCDIC
+ * and the set of uppercase Latin letters is discontiguous as well.
+ */
+
+U_CAPI UBool U_EXPORT2
+uprv_isASCIILetter(char c) {
+#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
+    return
+        ('a'<=c && c<='i') || ('j'<=c && c<='r') || ('s'<=c && c<='z') ||
+        ('A'<=c && c<='I') || ('J'<=c && c<='R') || ('S'<=c && c<='Z');
+#else
+    return ('a'<=c && c<='z') || ('A'<=c && c<='Z');
+#endif
+}
+
+U_CAPI char U_EXPORT2
+uprv_toupper(char c) {
+#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
+    if(('a'<=c && c<='i') || ('j'<=c && c<='r') || ('s'<=c && c<='z')) {
+        c=(char)(c+('A'-'a'));
+    }
+#else
+    if('a'<=c && c<='z') {
+        c=(char)(c+('A'-'a'));
+    }
+#endif
+    return c;
+}
+
+
+#if 0
+/*
+ * Commented out because cstring.h defines uprv_tolower() to be
+ * the same as either uprv_asciitolower() or uprv_ebcdictolower()
+ * to reduce the amount of code to cover with tests.
+ *
+ * Note that this uprv_tolower() definition is likely to work for most
+ * charset families, not just ASCII and EBCDIC, because its #else branch
+ * is written generically.
+ */
+U_CAPI char U_EXPORT2
+uprv_tolower(char c) {
+#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
+    if(('A'<=c && c<='I') || ('J'<=c && c<='R') || ('S'<=c && c<='Z')) {
+        c=(char)(c+('a'-'A'));
+    }
+#else
+    if('A'<=c && c<='Z') {
+        c=(char)(c+('a'-'A'));
+    }
+#endif
+    return c;
+}
+#endif
+
+U_CAPI char U_EXPORT2
+uprv_asciitolower(char c) {
+    if(0x41<=c && c<=0x5a) {
+        c=(char)(c+0x20);
+    }
+    return c;
+}
+
+U_CAPI char U_EXPORT2
+uprv_ebcdictolower(char c) {
+    if( (0xc1<=(uint8_t)c && (uint8_t)c<=0xc9) ||
+        (0xd1<=(uint8_t)c && (uint8_t)c<=0xd9) ||
+        (0xe2<=(uint8_t)c && (uint8_t)c<=0xe9)
+    ) {
+        c=(char)(c-0x40);
+    }
+    return c;
+}
+
+
+U_CAPI char* U_EXPORT2
+T_CString_toLowerCase(char* str)
+{
+    char* origPtr = str;
+
+    if (str) {
+        do
+            *str = (char)uprv_tolower(*str);
+        while (*(str++));
+    }
+
+    return origPtr;
+}
+
+U_CAPI char* U_EXPORT2
+T_CString_toUpperCase(char* str)
+{
+    char* origPtr = str;
+
+    if (str) {
+        do
+            *str = (char)uprv_toupper(*str);
+        while (*(str++));
+    }
+
+    return origPtr;
+}
+
+/*
+ * Takes a int32_t and fills in  a char* string with that number "radix"-based.
+ * Does not handle negative values (makes an empty string for them).
+ * Writes at most 12 chars ("-2147483647" plus NUL).
+ * Returns the length of the string (not including the NUL).
+ */
+U_CAPI int32_t U_EXPORT2
+T_CString_integerToString(char* buffer, int32_t v, int32_t radix)
+{
+    char      tbuf[30];
+    int32_t   tbx    = sizeof(tbuf);
+    uint8_t   digit;
+    int32_t   length = 0;
+    uint32_t  uval;
+    
+    U_ASSERT(radix>=2 && radix<=16);
+    uval = (uint32_t) v;
+    if(v<0 && radix == 10) {
+        /* Only in base 10 do we conside numbers to be signed. */
+        uval = (uint32_t)(-v); 
+        buffer[length++] = '-';
+    }
+    
+    tbx = sizeof(tbuf)-1;
+    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */
+    do {
+        digit = (uint8_t)(uval % radix);
+        tbuf[--tbx] = (char)(T_CString_itosOffset(digit));
+        uval  = uval / radix;
+    } while (uval != 0);
+    
+    /* copy converted number into user buffer  */
+    uprv_strcpy(buffer+length, tbuf+tbx);
+    length += sizeof(tbuf) - tbx -1;
+    return length;
+}
+
+
+
+/*
+ * Takes a int64_t and fills in  a char* string with that number "radix"-based.
+ * Writes at most 21: chars ("-9223372036854775807" plus NUL).
+ * Returns the length of the string, not including the terminating NULL.
+ */
+U_CAPI int32_t U_EXPORT2
+T_CString_int64ToString(char* buffer, int64_t v, uint32_t radix)
+{
+    char      tbuf[30];
+    int32_t   tbx    = sizeof(tbuf);
+    uint8_t   digit;
+    int32_t   length = 0;
+    uint64_t  uval;
+    
+    U_ASSERT(radix>=2 && radix<=16);
+    uval = (uint64_t) v;
+    if(v<0 && radix == 10) {
+        /* Only in base 10 do we conside numbers to be signed. */
+        uval = (uint64_t)(-v); 
+        buffer[length++] = '-';
+    }
+    
+    tbx = sizeof(tbuf)-1;
+    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */
+    do {
+        digit = (uint8_t)(uval % radix);
+        tbuf[--tbx] = (char)(T_CString_itosOffset(digit));
+        uval  = uval / radix;
+    } while (uval != 0);
+    
+    /* copy converted number into user buffer  */
+    uprv_strcpy(buffer+length, tbuf+tbx);
+    length += sizeof(tbuf) - tbx -1;
+    return length;
+}
+
+
+U_CAPI int32_t U_EXPORT2
+T_CString_stringToInteger(const char *integerString, int32_t radix)
+{
+    char *end;
+    return uprv_strtoul(integerString, &end, radix);
+
+}
+
+U_CAPI int U_EXPORT2
+uprv_stricmp(const char *str1, const char *str2) {
+    if(str1==NULL) {
+        if(str2==NULL) {
+            return 0;
+        } else {
+            return -1;
+        }
+    } else if(str2==NULL) {
+        return 1;
+    } else {
+        /* compare non-NULL strings lexically with lowercase */
+        int rc;
+        unsigned char c1, c2;
+
+        for(;;) {
+            c1=(unsigned char)*str1;
+            c2=(unsigned char)*str2;
+            if(c1==0) {
+                if(c2==0) {
+                    return 0;
+                } else {
+                    return -1;
+                }
+            } else if(c2==0) {
+                return 1;
+            } else {
+                /* compare non-zero characters with lowercase */
+                rc=(int)(unsigned char)uprv_tolower(c1)-(int)(unsigned char)uprv_tolower(c2);
+                if(rc!=0) {
+                    return rc;
+                }
+            }
+            ++str1;
+            ++str2;
+        }
+    }
+}
+
+U_CAPI int U_EXPORT2
+uprv_strnicmp(const char *str1, const char *str2, uint32_t n) {
+    if(str1==NULL) {
+        if(str2==NULL) {
+            return 0;
+        } else {
+            return -1;
+        }
+    } else if(str2==NULL) {
+        return 1;
+    } else {
+        /* compare non-NULL strings lexically with lowercase */
+        int rc;
+        unsigned char c1, c2;
+
+        for(; n--;) {
+            c1=(unsigned char)*str1;
+            c2=(unsigned char)*str2;
+            if(c1==0) {
+                if(c2==0) {
+                    return 0;
+                } else {
+                    return -1;
+                }
+            } else if(c2==0) {
+                return 1;
+            } else {
+                /* compare non-zero characters with lowercase */
+                rc=(int)(unsigned char)uprv_tolower(c1)-(int)(unsigned char)uprv_tolower(c2);
+                if(rc!=0) {
+                    return rc;
+                }
+            }
+            ++str1;
+            ++str2;
+        }
+    }
+
+    return 0;
+}
+
+U_CAPI char* U_EXPORT2
+uprv_strdup(const char *src) {
+    size_t len = uprv_strlen(src) + 1;
+    char *dup = (char *) uprv_malloc(len);
+
+    if (dup) {
+        uprv_memcpy(dup, src, len);
+    }
+
+    return dup;
+}
+
+U_CAPI char* U_EXPORT2
+uprv_strndup(const char *src, int32_t n) {
+    char *dup;
+
+    if(n < 0) {
+        dup = uprv_strdup(src);
+    } else {
+        dup = (char*)uprv_malloc(n+1);
+        if (dup) { 
+            uprv_memcpy(dup, src, n);
+            dup[n] = 0;
+        }
+    }
+
+    return dup;
+}