diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-09-26 21:22:19 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-09-26 21:22:19 +0000 |
| commit | e5e148d15bacc36f205aa49edea0fc53df2a38c0 (patch) | |
| tree | b3daac4ea5f2db51fa5c5e10722e04f3b63a57c5 /newlib/libc/machine/powerpc/vfprintf.c | |
| parent | 1aeca89244e9560c7494792cf4524547038504e8 (diff) | |
| download | cygnal-e5e148d15bacc36f205aa49edea0fc53df2a38c0.tar.gz cygnal-e5e148d15bacc36f205aa49edea0fc53df2a38c0.tar.bz2 cygnal-e5e148d15bacc36f205aa49edea0fc53df2a38c0.zip | |
2006-09-26 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/stdio.h[_REENT_SMALL]: Do not allow macros
for clearerr, feof, or fileno.
* libc/include/sys/reent.h[_REENT_SMALL](struct _reent): Change
the dummy std stream scheme to use pointers to const external
fake files, one for each standard stream.
* libc/stdio/local.h (CHECK_INIT): Change to take a file pointer
argument. For _REENT_SMALL, reset the file pointer if it
matches one of the fake std stream pointers.
* libc/stdio/clearerr.c: Fix CHECK_INIT macro to add file pointer
argument.
* libc/stdio/fclose.c: Ditto.
* libc/stdio/feof.c: Ditto.
* libc/stdio/ferror.c: Ditto.
* libc/stdio/fflush.c: Ditto.
* libc/stdio/fgetc.c: Ditto.
* libc/stdio/fgets.c: Ditto.
* libc/stdio/fileno.c: Ditto.
* libc/stdio/findfp.c: Ditto.
* libc/stdio/fputc.c: Ditto.
* libc/stdio/fputs.c: Ditto.
* libc/stdio/fread.c: Ditto.
* libc/stdio/freopen.c: Ditto.
* libc/stdio/fseek.c: Ditto.
* libc/stdio/ftell.c: Ditto.
* libc/stdio/fwrite.c: Ditto.
* libc/stdio/getc.c: Ditto.
* libc/stdio/getdelim.c: Ditto.
* libc/stdio/putc.c: Ditto.
* libc/stdio/refill.c: Ditto.
* libc/stdio/setvbuf.c: Ditto.
* libc/stdio/ungetc.c: Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio/vfscanf.c: Ditto.
* libc/stdio/wbuf.c: Ditto.: Ditto.
* libc/stdio/wsetup.c: Ditto.
* libc/stdio64/freopen64.c: Ditto.
* libc/stdio64/fseeko64.c: Ditto.
* libc/stdio64/ftello64.c: Ditto.
* libc/machine/powerpc/vfprintf.c: Ditto.
* libc/machine/powerpc/vfscanf.c: Ditto.
Diffstat (limited to 'newlib/libc/machine/powerpc/vfprintf.c')
| -rw-r--r-- | newlib/libc/machine/powerpc/vfprintf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c index 8aadb4b15..e84be15aa 100644 --- a/newlib/libc/machine/powerpc/vfprintf.c +++ b/newlib/libc/machine/powerpc/vfprintf.c @@ -321,7 +321,7 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap), _CONST char *fmt0 _AND va_list ap) { - CHECK_INIT (_REENT); + CHECK_INIT (_REENT, fp); return _VFPRINTF_R (_REENT, fp, fmt0, ap); } @@ -875,7 +875,9 @@ reswitch: switch (ch) { if (prec || flags & ALT) size += prec + 1; } else /* "0.X" */ - size = prec + 2; + size = (prec || flags & ALT) + ? prec + 2 + : 1; } else if (expt >= ndig) { /* fixed g fmt */ size = expt; if (flags & ALT) |