X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_utf8.c;h=a6fcda86874b71e37c041ea0296ec34302d22b33;hb=00537b483d646bd04a204708ecbde708861f044e;hp=1a4ce74e467df5172e2c8f767c1d1e252ed85227;hpb=54bd147d353f7f340a48a9da5c6a568446223371;p=yaz-moved-to-github.git

diff --git a/src/icu_utf8.c b/src/icu_utf8.c
index 1a4ce74..a6fcda8 100644
--- a/src/icu_utf8.c
+++ b/src/icu_utf8.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 
@@ -28,7 +28,7 @@
 
 struct icu_buf_utf8 *icu_buf_utf8_create(size_t capacity)
 {
-    struct icu_buf_utf8 * buf8 
+    struct icu_buf_utf8 * buf8
         = (struct icu_buf_utf8 *) xmalloc(sizeof(struct icu_buf_utf8));
 
     buf8->utf8 = 0;
@@ -61,22 +61,24 @@ struct icu_buf_utf8 * icu_buf_utf8_resize(struct icu_buf_utf8 * buf8,
     if (!buf8)
         return 0;
 
-    if (capacity >  0){
+    if (capacity > 0)
+    {
         if (0 == buf8->utf8)
             buf8->utf8 = (uint8_t *) xmalloc(sizeof(uint8_t) * capacity);
         else
-            buf8->utf8 
+            buf8->utf8
                 = (uint8_t *) xrealloc(buf8->utf8, sizeof(uint8_t) * capacity);
-        
+
         buf8->utf8_cap = capacity;
-    } 
-    else { 
+    }
+    else
+    {
         xfree(buf8->utf8);
         buf8->utf8 = 0;
         buf8->utf8_len = 0;
         buf8->utf8_cap = 0;
     }
-    
+
     return buf8;
 }
 
@@ -109,11 +111,11 @@ UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
 
     *status = U_ZERO_ERROR;
     src8cstr_len = strlen(src8cstr);
-  
+
     u_strFromUTF8(dest16->utf16, dest16->utf16_cap,
                   &utf16_len,
                   src8cstr, src8cstr_len, status);
-  
+
     /* check for buffer overflow, resize and retry */
     if (*status == U_BUFFER_OVERFLOW_ERROR)
     {
@@ -124,25 +126,24 @@ UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
                       src8cstr, src8cstr_len, status);
     }
 
-    if (U_SUCCESS(*status)  
-        && utf16_len <= dest16->utf16_cap)
+    if (U_SUCCESS(*status) && utf16_len <= dest16->utf16_cap)
         dest16->utf16_len = utf16_len;
-    else 
+    else
         icu_buf_utf16_clear(dest16);
-  
+
     return *status;
 }
 
-UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 * dest8,
-                             struct icu_buf_utf16 * src16,
+UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 *dest8,
+                             const struct icu_buf_utf16 *src16,
                              UErrorCode * status)
 {
     int32_t utf8_len = 0;
-  
+
     u_strToUTF8((char *) dest8->utf8, dest8->utf8_cap,
                 &utf8_len,
                 src16->utf16, src16->utf16_len, status);
-  
+
     /* check for buffer overflow, resize and retry */
     if (*status == U_BUFFER_OVERFLOW_ERROR)
     {
@@ -153,12 +154,11 @@ UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 * dest8,
                     src16->utf16, src16->utf16_len, status);
     }
 
-    if (U_SUCCESS(*status)  
-        && utf8_len <= dest8->utf8_cap)
+    if (U_SUCCESS(*status) && utf8_len <= dest8->utf8_cap)
         dest8->utf8_len = utf8_len;
-    else 
+    else
         icu_buf_utf8_clear(dest8);
-  
+
     return *status;
 }