Changeset 4ddeace in mainline for generic/src/printf/printf_core.c

Timestamp:

2006-06-06T11:45:42Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

99f3249

Parents:

3247f0a

Message:

Fixed printf return value.

File:

• generic/src/printf/printf_core.c (modified) (21 diffs)

generic/src/printf/printf_core.c

@@ -101 +101 @@
  * @param count 
  * @param ps output method and its data
- * @return 0 on success, EOF on fail
+ * @return number or printed characters
  */
 static int printf_putnchars(const char * buf, size_t count, struct printf_spec *ps)
 {
-        if (ps->write((void *)buf, count, ps->data) == count) {
-                return 0;
-        }
-        
-        return EOF;
+        return ps->write((void *)buf, count, ps->data);
 }
 
@@ -115 +111 @@
  * @param str string to print
  * @param ps write function specification and support data
- * @return 0 on success or EOF on fail
+ * @return number or printed characters
  */
 static int printf_putstr(const char * str, struct printf_spec *ps)
@@ -127 +123 @@
         count = strlen(str);
 
-        if (ps->write((void *) str, count, ps->data) == count) {
-                return 0;
-        }
-        
-        return EOF;
+        return ps->write((void *) str, count, ps->data);
 }
 
@@ -137 +129 @@
  * @param c one character
  * @param ps output method
- * @return printed character or EOF
+ * @return number or printed characters
  */
 static int printf_putchar(int c, struct printf_spec *ps)
@@ -143 +135 @@
         unsigned char ch = c;
         
-        if (ps->write((void *) &ch, 1, ps->data) == 1) {
-                return c;
-        }
-        
-        return EOF;
+        return ps->write((void *) &ch, 1, ps->data);
 }
 
@@ -154 +142 @@
  * @param width 
  * @param flags
- * @return number of printed characters or EOF
+ * @return number of printed characters, negative value on fail
  */
 static int print_char(char c, int width, __u64 flags, struct printf_spec *ps)
@@ -163 +151 @@
                 while (--width > 0) {   /* one space is consumed by character itself hence predecrement */
                         /* FIXME: painful slow */
-                        printf_putchar(' ', ps);        
+                        if (printf_putchar(' ', ps) > 0)        
+                                ++counter;
+                }
+        }
+        
+        if (printf_putchar(c, ps) > 0)
+                counter++;
+
+        while (--width > 0) { /* one space is consumed by character itself hence predecrement */
+                if (printf_putchar(' ', ps) > 0)
                         ++counter;
-                }
-        }
-        
-        if (printf_putchar(c, ps) == EOF) {
-                return EOF;
-        }
-
-        while (--width > 0) { /* one space is consumed by character itself hence predecrement */
-                printf_putchar(' ', ps);
-                ++counter;
         }
         
@@ -185 +172 @@
  * @param precision
  * @param flags
- * @return number of printed characters or EOF
+ * @return number of printed characters or negative value on fail
  */
                                                 
@@ -192 +179 @@
         int counter = 0;
         size_t size;
+        int retval;
 
         if (s == NULL) {
@@ -208 +196 @@
         if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
                 while (width-- > 0) {   
-                        printf_putchar(' ', ps);        
-                        counter++;
+                        if (printf_putchar(' ', ps) == 1)       
+                                counter++;
                 }
         }
@@ -215 +203 @@
         while (precision > size) {
                 precision--;
-                printf_putchar(' ', ps);        
-                ++counter;
-        }
-        
-        if (printf_putnchars(s, precision, ps) == EOF) {
-                return EOF;
-        }
-
-        counter += precision;
+                if (printf_putchar(' ', ps) == 1)       
+                        ++counter;
+        }
+        
+        if ((retval = printf_putnchars(s, precision, ps)) < 0) {
+                return -counter;
+        }
+        counter += retval;      
 
         while (width-- > 0) {
-                printf_putchar(' ', ps);        
-                ++counter;
-        }
-        
-        return ++counter;
+                if (printf_putchar(' ', ps) == 1)       
+                        ++counter;
+        }
+        
+        return counter;
 }
 
@@ -255 +242 @@
         int size = 0; /* size of number with all prefixes and signs */
         int number_size; /* size of plain number */
-        int written = 0;
         char sgn;
+        int retval;
+        int counter = 0;
         
         if (flags & __PRINTF_FLAG_BIGCHARS) 
@@ -323 +311 @@
         if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
                 while (width-- > 0) {   
-                        printf_putchar(' ', ps);        
-                        written++;
+                        if (printf_putchar(' ', ps) == 1)       
+                                counter++;
                 }
         }
+        
         
         /* print sign */
         if (sgn) {
-                printf_putchar(sgn, ps);
-                written++;
+                if (printf_putchar(sgn, ps) == 1)
+                        counter++;
         }
         
@@ -339 +328 @@
                 switch(base) {
                         case 2: /* Binary formating is not standard, but usefull */
-                                printf_putchar('0', ps);
+                                if (printf_putchar('0', ps) == 1)
+                                        counter++;
                                 if (flags & __PRINTF_FLAG_BIGCHARS) {
-                                        printf_putchar('B', ps);
+                                        if (printf_putchar('B', ps) == 1)
+                                                counter++;
                                 } else {
-                                        printf_putchar('b', ps);
+                                        if (printf_putchar('b', ps) == 1)
+                                                counter++;
                                 }
-                                written += 2;
                                 break;
                         case 8:
-                                printf_putchar('o', ps);
-                                written++;
+                                if (printf_putchar('o', ps) == 1)
+                                        counter++;
                                 break;
                         case 16:
-                                printf_putchar('0', ps);
+                                if (printf_putchar('0', ps) == 1)
+                                        counter++;
                                 if (flags & __PRINTF_FLAG_BIGCHARS) {
-                                        printf_putchar('X', ps);
+                                        if (printf_putchar('X', ps) == 1)
+                                                counter++;
                                 } else {
-                                        printf_putchar('x', ps);
+                                        if (printf_putchar('x', ps) == 1)
+                                                counter++;
                                 }
-                                written += 2;
                                 break;
                 }
@@ -366 +359 @@
         precision -= number_size;
         while (precision-- > 0) {       
-                printf_putchar('0', ps);        
-                written++;
+                if (printf_putchar('0', ps) == 1)
+                        counter++;
         }
 
@@ -373 +366 @@
         /* print number itself */
 
-        written += printf_putstr(++ptr, ps);
+        if ((retval = printf_putstr(++ptr, ps)) > 0) {
+                counter += retval;
+        }
         
         /* print ending spaces */
         
         while (width-- > 0) {   
-                printf_putchar(' ', ps);        
-                written++;
-        }
-
-        return written;
+                if (printf_putchar(' ', ps) == 1)       
+                        counter++;
+        }
+
+        return counter;
 }
 
@@ -485 +480 @@
                         /* print common characters if any processed */  
                         if (i > j) {
-                                if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */
+                                if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) < 0) { /* error */
                                         counter = -counter;
                                         goto out;
@@ -582 +577 @@
                                 */
                                 case 's':
-                                        if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) == EOF) {
+                                        if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) < 0) {
                                                 counter = -counter;
                                                 goto out;
@@ -592 +587 @@
                                 case 'c':
                                         c = va_arg(ap, unsigned int);
-                                        if ((retval = print_char(c, width, flags, ps)) == EOF) {
+                                        if ((retval = print_char(c, width, flags, ps)) < 0) {
                                                 counter = -counter;
                                                 goto out;
@@ -693 +688 @@
                         }
 
-                        if ((retval = print_number(number, width, precision, base, flags, ps)) == EOF ) {
+                        if ((retval = print_number(number, width, precision, base, flags, ps)) < 0) {
                                 counter = -counter;
                                 goto out;
@@ -707 +702 @@
         
         if (i > j) {
-                if ((retval = printf_putnchars(&fmt[j], (__native)(i - j), ps)) == EOF) { /* error */
+                if ((retval = printf_putnchars(&fmt[j], (__native)(i - j), ps)) < 0) { /* error */
                         counter = -counter;
                         goto out;