Changeset 453 for branches/thune/thread_safe/print.c

Timestamp:

08/25/07 22:49:09 (15 months ago)

Author:

krobillard

Message:

UTF-8 strings can now be read.
ur_makeString() now takes UCell argument.

Files:

• branches/thune/thread_safe/print.c (modified) (4 diffs)

branches/thune/thread_safe/print.c

@@ -31 +31 @@
 
 
-extern int copyUtf16ToAscii( char* dest, const uint16_t* src, int len );
+extern int copyUcs2ToUtf8( char* dest, const uint16_t* src, int len );
 
 
@@ -43 +43 @@
 
 
-void ur_strCatUtf16( UString* str, const uint16_t* cp, int len )
-{
-    if( (str->used + len) > str->avail )
-        EXPAND( str, len );
-    str->used += copyUtf16ToAscii( str->ptr.c + str->used, cp, len );
+void ur_strCatUcs2( UString* str, const uint16_t* cp, int len )
+{
+    EXPAND( str, len * 2 );
+    str->used += copyUcs2ToUtf8( str->ptr.c + str->used, cp, len );
 }
 
@@ -78 +77 @@
 
                 case UR_ENC_UTF16:
-                    ur_strCatUtf16( out, str2->ptr.u16 + si, used );
+                    ur_strCatUcs2( out, str2->ptr.u16 + si, used );
                     break;
             }
@@ -271 +270 @@
 #define APP_STR_FUNC    _appendStringUtf16
 #define APP_STR_T       uint16_t
-#define APP_STR_COPY    ur_strCatUtf16
+#define APP_STR_COPY    ur_strCatUcs2
 #include "print_string.c"