Changeset 8565a42 in mainline for uspace/lib/c/generic/io/printf_core.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/lib/c/generic/io/printf_core.c (modified) (58 diffs)

uspace/lib/c/generic/io/printf_core.c

@@ -211 +211 @@
         if (str == NULL)
                 return printf_putnchars(nullstr, str_size(nullstr), ps);
-        
+
         return ps->str_write((void *) str, str_size(str), ps->data);
 }
@@ -227 +227 @@
         if (!ascii_check(ch))
                 return ps->str_write((void *) &invalch, 1, ps->data);
-        
+
         return ps->str_write(&ch, 1, ps->data);
 }
@@ -243 +243 @@
         if (!chr_check(ch))
                 return ps->str_write((void *) &invalch, 1, ps->data);
-        
+
         return ps->wstr_write(&ch, sizeof(wchar_t), ps->data);
 }
@@ -269 +269 @@
                 }
         }
-        
+
         if (printf_putchar(ch, ps) > 0)
                 counter++;
-        
+
         while (--width > 0) {
                 /*
@@ -281 +281 @@
                         counter++;
         }
-        
+
         return (int) (counter);
 }
@@ -307 +307 @@
                 }
         }
-        
+
         if (printf_putwchar(ch, ps) > 0)
                 counter++;
-        
+
         while (--width > 0) {
                 /*
@@ -319 +319 @@
                         counter++;
         }
-        
+
         return (int) (counter);
 }
@@ -337 +337 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-        
+
         size_t strw = str_length(str);
 
@@ -343 +343 @@
         if ((precision == 0) || (precision > strw))
                 precision = strw;
-        
+
         /* Left padding */
         size_t counter = 0;
@@ -353 +353 @@
                 }
         }
-        
+
         /* Part of @a str fitting into the alloted space. */
         int retval;
@@ -386 +386 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-        
+
         size_t strw = wstr_length(str);
 
@@ -392 +392 @@
         if ((precision == 0) || (precision > strw))
                 precision = strw;
-        
+
         /* Left padding */
         size_t counter = 0;
@@ -402 +402 @@
                 }
         }
-        
+
         /* Part of @a wstr fitting into the alloted space. */
         int retval;
@@ -408 +408 @@
         if ((retval = printf_wputnchars(str, size, ps)) < 0)
                 return -counter;
-        
+
         counter += retval;
-        
+
         /* Right padding */
         while (width-- > 0) {
@@ -440 +440 @@
                 precision = 0;
         }
-        
+
         const char *digits;
         if (flags & __PRINTF_FLAG_BIGCHARS)
@@ -446 +446 @@
         else
                 digits = digits_small;
-        
+
         char data[PRINT_NUMBER_BUFFER_SIZE];
         char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1];
-        
+
         /* Size of number with all prefixes and signs */
         int size = 0;
-        
+
         /* Put zero at end of string */
         *ptr-- = 0;
-        
+
         if (num == 0) {
                 *ptr-- = '0';
@@ -465 +465 @@
                 } while (num /= base);
         }
-        
+
         /* Size of plain number */
         int number_size = size;
-        
+
         /*
          * Collect the sum of all prefixes/signs/etc. to calculate padding and
@@ -487 +487 @@
                 }
         }
-        
+
         char sgn = 0;
         if (flags & __PRINTF_FLAG_SIGNED) {
@@ -501 +501 @@
                 }
         }
-        
+
         if (flags & __PRINTF_FLAG_LEFTALIGNED)
                 flags &= ~__PRINTF_FLAG_ZEROPADDED;
-        
+
         /*
          * If the number is left-aligned or precision is specified then
@@ -513 +513 @@
                         precision = width - size + number_size;
         }
-        
+
         /* Print leading spaces */
         if (number_size > precision) {
@@ -519 +519 @@
                 precision = number_size;
         }
-        
+
         width -= precision + size - number_size;
         size_t counter = 0;
-        
+
         if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
                 while (width-- > 0) {
@@ -529 +529 @@
                 }
         }
-        
+
         /* Print sign */
         if (sgn) {
@@ -535 +535 @@
                         counter++;
         }
-        
+
         /* Print prefix */
         if (flags & __PRINTF_FLAG_PREFIX) {
@@ -568 +568 @@
                 }
         }
-        
+
         /* Print leading zeroes */
         precision -= number_size;
@@ -575 +575 @@
                         counter++;
         }
-        
+
         /* Print the number itself */
         int retval;
         if ((retval = printf_putstr(++ptr, ps)) > 0)
                 counter += retval;
-        
+
         /* Print trailing spaces */
-        
+
         while (width-- > 0) {
                 if (printf_putchar(' ', ps) == 1)
                         counter++;
         }
-        
+
         return ((int) counter);
 }
@@ -601 +601 @@
         const int str_len = 3;
         const char *str;
-        
+
         if (flags & __PRINTF_FLAG_BIGCHARS) {
                 str = val.is_infinity ? "INF" : "NAN";
@@ -624 +624 @@
                 if ((ret = ps->str_write(&sign, 1, ps->data)) < 0)
                         return -1;
-                
+
                 counter += ret;
         }
@@ -630 +630 @@
         if ((ret = ps->str_write(str, str_len, ps->data)) < 0)
                 return -1;
-        
+
         counter += ret;
 
@@ -751 +751 @@
                 if ((ret = ps->str_write(&sign, 1, ps->data)) < 0)
                         return -1;
-                
+
                 counter += ret;
         }
@@ -783 +783 @@
 
         counter += ret;
-        
+
         /* Print the decimal point and the fractional part. */
         if (has_decimal_pt) {
@@ -790 +790 @@
                 if ((ret = ps->str_write(&ch, 1, ps->data)) < 0)
                         return -1;
-                
+
                 counter += ret;
 
@@ -885 +885 @@
                 /* Let the implementation figure out the proper precision. */
                 val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp);
-                
+
                 /* Precision needed for the last significant digit. */
                 precision = max(0, -val_str.dec_exp);
@@ -903 +903 @@
         if ((ret = ps->str_write(&exp_ch, 1, ps->data)) < 0)
                 return -1;
-        
+
         counter += ret;
 
@@ -915 +915 @@
         /* Print the exponent. */
         exp_val = abs(exp_val);
-        
+
         char exp_str[4] = { 0 };
 
@@ -921 +921 @@
         exp_str[1] = '0' + (exp_val % 100) / 10 ;
         exp_str[2] = '0' + (exp_val % 10);
-        
+
         int exp_len = (exp_str[0] == '0') ? 2 : 3;
         const char *exp_str_start = &exp_str[3] - exp_len;
@@ -981 +981 @@
                 if ((ret = ps->str_write(&sign, 1, ps->data)) < 0)
                         return -1;
-                
+
                 counter += ret;
         }
@@ -1004 +1004 @@
                 if ((ret = ps->str_write(&ch, 1, ps->data)) < 0)
                         return -1;
-                
+
                 counter += ret;
 
@@ -1104 +1104 @@
                 /* Let the implementation figure out the proper precision. */
                 val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp);
-                
+
                 /* Use all produced digits. */
                 precision = val_str.len - 1;
@@ -1223 +1223 @@
                 precision = (precision < 0) ? 6 : precision;
                 return print_double_fixed(g, precision, width, flags, ps);
-        
+
         case 'E':
                 flags |= __PRINTF_FLAG_BIGCHARS;
@@ -1230 +1230 @@
                 precision = (precision < 0) ? 6 : precision;
                 return print_double_scientific(g, precision, width, flags, ps);
-        
+
         case 'G':
                 flags |= __PRINTF_FLAG_BIGCHARS;
@@ -1236 +1236 @@
         case 'g':
                 return print_double_generic(g, precision, width, flags, ps);
-        
+
         default:
                 assert(false);
@@ -1337 +1337 @@
         size_t nxt = 0;  /* Index of the next character from fmt */
         size_t j = 0;    /* Index to the first not printed nonformating character */
-        
+
         size_t counter = 0;   /* Number of characters printed */
         int retval;           /* Return values from nested functions */
-        
+
         while (true) {
                 i = nxt;
                 wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                
+
                 if (uc == 0)
                         break;
-                
+
                 /* Control character */
                 if (uc == '%') {
@@ -1359 +1359 @@
                                 counter += retval;
                         }
-                        
+
                         j = i;
-                        
+
                         /* Parse modifiers */
                         uint32_t flags = 0;
                         bool end = false;
-                        
+
                         do {
                                 i = nxt;
@@ -1390 +1390 @@
                                 };
                         } while (!end);
-                        
+
                         /* Width & '*' operator */
                         int width = 0;
@@ -1397 +1397 @@
                                         width *= 10;
                                         width += uc - '0';
-                                        
+
                                         i = nxt;
                                         uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -1416 +1416 @@
                                 }
                         }
-                        
+
                         /* Precision and '*' operator */
                         int precision = -1;
@@ -1427 +1427 @@
                                                 precision *= 10;
                                                 precision += uc - '0';
-                                                
+
                                                 i = nxt;
                                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -1446 +1446 @@
                                 }
                         }
-                        
+
                         qualifier_t qualifier;
-                        
+
                         switch (uc) {
                         case 't':
@@ -1495 +1495 @@
                                 qualifier = PrintfQualifierInt;
                         }
-                        
+
                         unsigned int base = 10;
-                        
+
                         switch (uc) {
                         /*
@@ -1504 +1504 @@
                         case 's':
                                 precision = max(0,  precision);
-                                
+
                                 if (qualifier == PrintfQualifierLong)
                                         retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps);
                                 else
                                         retval = print_str(va_arg(ap, char *), width, precision, flags, ps);
-                                
+
                                 if (retval < 0) {
                                         counter = -counter;
                                         goto out;
                                 }
-                                
+
                                 counter += retval;
                                 j = nxt;
@@ -1523 +1523 @@
                                 else
                                         retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
-                                
+
                                 if (retval < 0) {
                                         counter = -counter;
                                         goto out;
                                 };
-                                
+
                                 counter += retval;
                                 j = nxt;
                                 goto next_char;
-                                
+
                         /*
                          * Floating point values
@@ -1544 +1544 @@
                                 retval = print_double(va_arg(ap, double), uc, precision,
                                         width, flags, ps);
-                                
+
                                 if (retval < 0) {
                                         counter = -counter;
                                         goto out;
                                 }
-                                
+
                                 counter += retval;
                                 j = nxt;
                                 goto next_char;
-                        
+
                         /*
                          * Integer values
@@ -1585 +1585 @@
                                 base = 16;
                                 break;
-                        
+
                         /* Percentile itself */
                         case '%':
                                 j = i;
                                 goto next_char;
-                        
+
                         /*
                          * Bad formatting.
@@ -1601 +1601 @@
                                 goto next_char;
                         }
-                        
+
                         /* Print integers */
                         size_t size;
                         uint64_t number;
-                        
+
                         switch (qualifier) {
                         case PrintfQualifierByte:
@@ -1645 +1645 @@
                                 goto out;
                         }
-                        
+
                         if ((retval = print_number(number, width, precision,
                             base, flags, ps)) < 0) {
@@ -1651 +1651 @@
                                 goto out;
                         }
-                        
+
                         counter += retval;
                         j = nxt;
@@ -1658 +1658 @@
                 ;
         }
-        
+
         if (i > j) {
                 if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
@@ -1667 +1667 @@
                 counter += retval;
         }
-        
+
 out:
         return ((int) counter);