Changeset b54d2f1 in mainline for kernel/generic/src/printf/printf_core.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/printf_core.c (modified) (13 diffs)

kernel/generic/src/printf/printf_core.c

@@ -258 +258 @@
         if (precision == 0)
                 precision = size;
-        
+
         count_t counter = 0;
         width -= precision;
@@ -267 +267 @@
                 }
         }
-        
+
         int retval;
         size_t bytes = utf8_count_bytes(str, min(size, precision));
@@ -279 +279 @@
                         counter++;
         }
-        
+
         return ((int) counter);
 }
@@ -586 +586 @@
 {
         index_t i = 0;  /* Index of the currently processed character from fmt */
+        index_t nxt = 0;
         index_t j = 0;  /* Index to the first not printed nonformating character */
         
@@ -592 +593 @@
         int retval;           /* Return values from nested functions */
         
-        while ((uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT)) != 0) {
+        while (true) {
+                i = nxt;
+                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
+
+                if (uc == '\0') break;
+
                 /* Control character */
                 if (uc == '%') {
@@ -612 +618 @@
                         
                         do {
-                                i++;
-                                uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                i = nxt;
+                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                 switch (uc) {
                                 case '#':
@@ -638 +644 @@
                         int width = 0;
                         if (isdigit(uc)) {
-                                while ((uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT)) != 0) {
+                                while (true) {
+                                        width *= 10;
+                                        width += uc - '0';
+
+                                        i = nxt;
+                                        uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
+                                        if (uc == '\0')
+                                                break;
                                         if (!isdigit(uc))
                                                 break;
-                                        
-                                        width *= 10;
-                                        width += uc - '0';
-                                        i++;
                                 }
                         } else if (uc == '*') {
                                 /* Get width value from argument list */
-                                i++;
-                                uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                i = nxt;
+                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                 width = (int) va_arg(ap, int);
                                 if (width < 0) {
@@ -661 +670 @@
                         int precision = 0;
                         if (uc == '.') {
-                                i++;
-                                uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                i = nxt;
+                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                 if (isdigit(uc)) {
-                                        while ((uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT)) != 0) {
+                                        while (true) {
+                                                precision *= 10;
+                                                precision += uc - '0';
+
+                                                i = nxt;
+                                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
+                                                if (uc == '\0')
+                                                        break;
                                                 if (!isdigit(uc))
                                                         break;
-                                                
-                                                precision *= 10;
-                                                precision += uc - '0';
-                                                i++;
                                         }
-                                } else if (fmt[i] == '*') {
+                                } else if (uc == '*') {
                                         /* Get precision value from the argument list */
-                                        i++;
-                                        uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                        i = nxt;
+                                        uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                         precision = (int) va_arg(ap, int);
                                         if (precision < 0) {
@@ -693 +705 @@
                                 /* Char or short */
                                 qualifier = PrintfQualifierShort;
-                                i++;
-                                uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                i = nxt;
+                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                 if (uc == 'h') {
-                                        i++;
-                                        uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                        i = nxt;
+                                        uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                         qualifier = PrintfQualifierByte;
                                 }
@@ -704 +716 @@
                                 /* Long or long long */
                                 qualifier = PrintfQualifierLong;
-                                i++;
-                                uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                i = nxt;
+                                uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                 if (uc == 'l') {
-                                        i++;
-                                        uc = utf8_decode(fmt, &i, UTF8_NO_LIMIT);
+                                        i = nxt;
+                                        uc = utf8_decode(fmt, &nxt, UTF8_NO_LIMIT);
                                         qualifier = PrintfQualifierLongLong;
                                 }
@@ -735 +747 @@
                                 
                                 counter += retval;
-                                j = i + 1;
+                                j = nxt;
                                 goto next_char;
                         case 'c':
@@ -749 +761 @@
                                 
                                 counter += retval;
-                                j = i + 1;
+                                j = nxt;
                                 goto next_char;
                         
@@ -853 +865 @@
                         
                         counter += retval;
-                        j = i + 1;
+                        j = nxt;
                 }
 next_char:
-                
-                i++;
+                ;
         }