ICU-62123.0.1.tar.gz

[apple/icu.git] / icuSources / common / uidna.cpp

diff --git a/icuSources/common/uidna.cpp b/icuSources/common/uidna.cpp
index b7780b84e6c910ac7dc462811b49467b89068ebe..7cc97a93a01459d120c1d6d6f8f67e20eac571c2 100644 (file)
--- a/icuSources/common/uidna.cpp
+++ b/icuSources/common/uidna.cpp
@@ -1,12 +1,14 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
  *******************************************************************************
  *
 /*
  *******************************************************************************
  *

- *   Copyright (C) 2003-2009, International Business Machines
+ *   Copyright (C) 2003-2014, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  uidna.cpp
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  uidna.cpp

- *   encoding:   US-ASCII
+ *   encoding:   UTF-8

  *   tab size:   8 (not used)
  *   indentation:4
  *
  *   tab size:   8 (not used)
  *   indentation:4
  *


@@ -316,7 +318,7 @@ _internal_toASCII(const UChar* src, int32_t srcLength,
     // Step 4: if the source is ASCII then proceed to step 8
     if(srcIsASCII){
         if(b1Len <= destCapacity){
     // Step 4: if the source is ASCII then proceed to step 8
     if(srcIsASCII){
         if(b1Len <= destCapacity){

-            uprv_memmove(dest, b1, b1Len * U_SIZEOF_UCHAR);
+            u_memmove(dest, b1, b1Len);

             reqLength = b1Len;
         }else{
             reqLength = b1Len;
             reqLength = b1Len;
         }else{
             reqLength = b1Len;


@@ -362,9 +364,9 @@ _internal_toASCII(const UChar* src, int32_t srcLength,
                 goto CLEANUP;
             }
             //Step 7: prepend the ACE prefix
                 goto CLEANUP;
             }
             //Step 7: prepend the ACE prefix

-            uprv_memcpy(dest,ACE_PREFIX,ACE_PREFIX_LENGTH * U_SIZEOF_UCHAR);
+            u_memcpy(dest, ACE_PREFIX, ACE_PREFIX_LENGTH);

             //Step 6: copy the contents in b2 into dest
             //Step 6: copy the contents in b2 into dest

-            uprv_memcpy(dest+ACE_PREFIX_LENGTH, b2, b2Len * U_SIZEOF_UCHAR);
+            u_memcpy(dest+ACE_PREFIX_LENGTH, b2, b2Len);

 
         }else{
             *status = U_IDNA_ACE_PREFIX_ERROR; 
 
         }else{
             *status = U_IDNA_ACE_PREFIX_ERROR; 


@@ -408,13 +410,12 @@ _internal_toUnicode(const UChar* src, int32_t srcLength,
 
     //initialize pointers to stack buffers
     UChar  *b1 = b1Stack, *b2 = b2Stack, *b1Prime=NULL, *b3=b3Stack;
 
     //initialize pointers to stack buffers
     UChar  *b1 = b1Stack, *b2 = b2Stack, *b1Prime=NULL, *b3=b3Stack;

-    int32_t b1Len, b2Len, b1PrimeLen, b3Len,
+    int32_t b1Len = 0, b2Len, b1PrimeLen, b3Len,

             b1Capacity = MAX_LABEL_BUFFER_SIZE, 
             b2Capacity = MAX_LABEL_BUFFER_SIZE,
             b3Capacity = MAX_LABEL_BUFFER_SIZE,
             reqLength=0;
 
             b1Capacity = MAX_LABEL_BUFFER_SIZE, 
             b2Capacity = MAX_LABEL_BUFFER_SIZE,
             b3Capacity = MAX_LABEL_BUFFER_SIZE,
             reqLength=0;
 

-    b1Len = 0;

     UBool* caseFlags = NULL;
 
     UBool srcIsASCII = TRUE;
     UBool* caseFlags = NULL;
 
     UBool srcIsASCII = TRUE;


@@ -542,7 +543,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength,
         //step 8: return output of step 5
         reqLength = b2Len;
         if(b2Len <= destCapacity) {
         //step 8: return output of step 5
         reqLength = b2Len;
         if(b2Len <= destCapacity) {

-            uprv_memmove(dest, b2, b2Len * U_SIZEOF_UCHAR);
+            u_memmove(dest, b2, b2Len);

         }
     }
     else{
         }
     }
     else{


@@ -571,7 +572,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength,
         // just return the source
         //copy the source to destination
         if(srcLength <= destCapacity){
         // just return the source
         //copy the source to destination
         if(srcLength <= destCapacity){

-            uprv_memmove(dest,src,srcLength * U_SIZEOF_UCHAR);
+            u_memmove(dest, src, srcLength);

         }
         reqLength = srcLength;
     }
         }
         reqLength = srcLength;
     }


@@ -598,7 +599,7 @@ CLEANUP:
         if(dest && srcLength <= destCapacity){
             // srcLength should have already been set earlier.
             U_ASSERT(srcLength >= 0);
         if(dest && srcLength <= destCapacity){
             // srcLength should have already been set earlier.
             U_ASSERT(srcLength >= 0);

-            uprv_memmove(dest,src,srcLength * U_SIZEOF_UCHAR);
+            u_memmove(dest, src, srcLength);

         }
         reqLength = srcLength;
         *status = U_ZERO_ERROR;
         }
         reqLength = srcLength;
         *status = U_ZERO_ERROR;