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

Timestamp:

2009-03-31T22:11:11Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

e1813cf

Parents:

32704cb

Message:

Semantics for 'index' parameter of utf8_encode/decode() should be more logical.

File:

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

kernel/generic/src/printf/vsnprintf.c

@@ -85 +85 @@
                 
                 while (index < size) {
-                        wchar_t uc = utf8_decode(str, &index, size - 1);
-                        
-                        if (!utf8_encode(uc, data->dst, &data->len, data->size - 2))
+                        wchar_t uc = utf8_decode(str, &index, size);
+
+                        if (!utf8_encode(uc, data->dst, &data->len, data->size - 1))
                                 break;
-                        
-                        data->len++;
-                        index++;
                 }
                 
@@ -150 +147 @@
                 }
                 
-                if (!utf8_encode(str[index], data->dst, &data->len, data->size - 2))
+                if (!utf8_encode(str[index], data->dst, &data->len, data->size - 1))
                         break;
                 
-                data->len++;
                 index++;
         }