Changeset 1b0b48e0 in mainline for kernel/generic/src/printf/vprintf.c

Timestamp:

2009-04-01T19:01:39Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

06b785f

Parents:

f25b2819

Message:

Partial refactor of printf modules to reflect new string API.

File:

• kernel/generic/src/printf/vprintf.c (modified) (4 diffs)

kernel/generic/src/printf/vprintf.c

@@ -46 +46 @@
 static int vprintf_write_utf8(const char *str, size_t size, void *data)
 {
-        index_t index = 0;
-        index_t chars = 0;
-        
-        while (index < size) {
-                putchar(chr_decode(str, &index, size));
+        size_t offset = 0;
+        count_t chars = 0;
+
+        while (offset < size) {
+                putchar(chr_decode(str, &offset, size));
                 chars++;
         }
-        
+
         return chars;
 }
@@ -60 +60 @@
 {
         index_t index = 0;
-        
+
         while (index < (size / sizeof(wchar_t))) {
                 putchar(str[index]);
                 index++;
         }
-        
+
         return index;
 }
@@ -71 +71 @@
 int puts(const char *str)
 {
-        index_t index = 0;
-        index_t chars = 0;
+        size_t offset = 0;
+        count_t chars = 0;
         wchar_t uc;
-        
-        while ((uc = chr_decode(str, &index, UTF8_NO_LIMIT)) != 0) {
+
+        while ((uc = chr_decode(str, &offset, UTF8_NO_LIMIT)) != 0) {
                 putchar(uc);
                 chars++;
         }
-        
+
         return chars;
 }
@@ -90 +90 @@
                 NULL
         };
-        
+
         ipl_t ipl = interrupts_disable();
         spinlock_lock(&printf_lock);
-        
+
         int ret = printf_core(fmt, &ps, ap);
-        
+
         spinlock_unlock(&printf_lock);
         interrupts_restore(ipl);
-        
+
         return ret;
 }