Changeset 043eca0 in mainline for kernel/generic/src/printf/vsnprintf.c

Timestamp:

2009-04-03T07:54:27Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d1dabe1f

Parents:

b888d5f

Message:

cleanup, string changes

File:

• kernel/generic/src/printf/vsnprintf.c (modified) (6 diffs)

kernel/generic/src/printf/vsnprintf.c

@@ -45 +45 @@
 } vsnprintf_data_t;
 
-/** Write UTF-8 string to given buffer.
+/** Write string to given buffer.
  *
  * Write at most data->size plain characters including trailing zero.
@@ -53 +53 @@
  * but size of the input string.
  *
- * @param str  Source UTF-8 string to print.
+ * @param str  Source string to print.
  * @param size Number of plain characters in str.
  * @param data Structure describing destination string, counter
  *             of used space and total string size.
  *
- * @return Number of UTF-8 characters to print (not characters actually
+ * @return Number of characters to print (not characters actually
  *         printed).
  *
  */
-static int vsnprintf_write_utf8(const char *str, size_t size, vsnprintf_data_t *data)
+static int vsnprintf_str_write(const char *str, size_t size, vsnprintf_data_t *data)
 {
         size_t left = data->size - data->len;
@@ -86 +86 @@
                 
                 while (index < size) {
-                        wchar_t uc = chr_decode(str, &index, size);
-
+                        wchar_t uc = str_decode(str, &index, size);
+                        
                         if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
                                 break;
@@ -112 +112 @@
 }
 
-/** Write UTF-32 string to given buffer.
+/** Write wide string to given buffer.
  *
  * Write at most data->size plain characters including trailing zero.
@@ -120 +120 @@
  * but size of the input string.
  *
- * @param str  Source UTF-32 string to print.
+ * @param str  Source wide string to print.
  * @param size Number of bytes in str.
  * @param data Structure describing destination string, counter
  *             of used space and total string size.
  *
- * @return Number of UTF-8 characters to print (not characters actually
+ * @return Number of wide characters to print (not characters actually
  *         printed).
  *
  */
-static int vsnprintf_write_utf32(const wchar_t *str, size_t size, vsnprintf_data_t *data)
+static int vsnprintf_wstr_write(const wchar_t *str, size_t size, vsnprintf_data_t *data)
 {
         index_t index = 0;
@@ -170 +170 @@
         };
         printf_spec_t ps = {
-                (int(*) (const char *, size_t, void *)) vsnprintf_write_utf8,
-                (int(*) (const wchar_t *, size_t, void *)) vsnprintf_write_utf32,
+                (int(*) (const char *, size_t, void *)) vsnprintf_str_write,
+                (int(*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write,
                 &data
         };