diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/printf_fp.c | 20 | ||||
| -rw-r--r-- | stdio-common/tst-fileno.c | 6 | ||||
| -rw-r--r-- | stdio-common/vfprintf-internal.c | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 8c6e434d2a..ec2b086260 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -459,8 +459,8 @@ __printf_fp_l (FILE *fp, locale_t loc, } else { - cy = __mpn_lshift (p.frac + - (p.exponent + to_shift) / BITS_PER_MP_LIMB, + cy = __mpn_lshift (p.frac + + (p.exponent + to_shift) / BITS_PER_MP_LIMB, fp_input, p.fracsize, (p.exponent + to_shift) % BITS_PER_MP_LIMB); p.fracsize += (p.exponent + to_shift) / BITS_PER_MP_LIMB; @@ -533,8 +533,8 @@ __printf_fp_l (FILE *fp, locale_t loc, &__tens[powers->arrayoff + _FPIO_CONST_OFFSET], powers->arraysize - _FPIO_CONST_OFFSET); - p.tmpsize = p.scalesize + - powers->arraysize - _FPIO_CONST_OFFSET; + p.tmpsize = p.scalesize + + powers->arraysize - _FPIO_CONST_OFFSET; if (cy == 0) --p.tmpsize; } @@ -717,10 +717,10 @@ __printf_fp_l (FILE *fp, locale_t loc, multiplication was not valid. This is because we cannot determine the number of bits in the result in advance. */ if (incr < p.exponent + 3 - || (incr == p.exponent + 3 && - (p.tmp[p.tmpsize - 1] < topval[1] - || (p.tmp[p.tmpsize - 1] == topval[1] - && p.tmp[p.tmpsize - 2] < topval[0])))) + || (incr == p.exponent + 3 + && (p.tmp[p.tmpsize - 1] < topval[1] + || (p.tmp[p.tmpsize - 1] == topval[1] + && p.tmp[p.tmpsize - 2] < topval[0])))) { /* The factor is right. Adapt binary and decimal exponents. */ @@ -809,8 +809,8 @@ __printf_fp_l (FILE *fp, locale_t loc, numbers are in the range of 1.0 <= |fp| < 8.0. We simply shift it to the right place and divide it by 1.0 to get the leading digit. (Of course this division is not really made.) */ - assert (0 <= p.exponent && p.exponent < 3 && - p.exponent + to_shift < BITS_PER_MP_LIMB); + assert (0 <= p.exponent && p.exponent < 3 + && p.exponent + to_shift < BITS_PER_MP_LIMB); /* Now shift the input value to its right place. */ cy = __mpn_lshift (p.frac, fp_input, p.fracsize, (p.exponent + to_shift)); diff --git a/stdio-common/tst-fileno.c b/stdio-common/tst-fileno.c index a77f0aa4c5..cc682c013d 100644 --- a/stdio-common/tst-fileno.c +++ b/stdio-common/tst-fileno.c @@ -31,9 +31,9 @@ check (const char *name, FILE *stream, int fd) static int do_test (void) { - return (check ("stdin", stdin, STDIN_FILENO) || - check ("stdout", stdout, STDOUT_FILENO) || - check ("stderr", stderr, STDERR_FILENO)); + return (check ("stdin", stdin, STDIN_FILENO) + || check ("stdout", stdout, STDOUT_FILENO) + || check ("stderr", stderr, STDERR_FILENO)); } #define TEST_FUNCTION do_test () diff --git a/stdio-common/vfprintf-internal.c b/stdio-common/vfprintf-internal.c index c124a9507b..ead2b04cb9 100644 --- a/stdio-common/vfprintf-internal.c +++ b/stdio-common/vfprintf-internal.c @@ -1290,8 +1290,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap, unsigned int mode_flags) #ifdef ORIENT /* Check for correct orientation. */ - if (_IO_vtable_offset (s) == 0 && - _IO_fwide (s, sizeof (CHAR_T) == 1 ? -1 : 1) + if (_IO_vtable_offset (s) == 0 + && _IO_fwide (s, sizeof (CHAR_T) == 1 ? -1 : 1) != (sizeof (CHAR_T) == 1 ? -1 : 1)) /* The stream is already oriented otherwise. */ return EOF; |