Browse Source

stdio: drop unnecessary calls to ORIENT

Now that the low-level functions set and test stream orientation,
a few calls in API functions are redundant.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
users/vapier/wip
Corinna Vinschen 3 years ago
parent
commit
61e52c4d60
  1. 2
      newlib/libc/stdio/fputs.c
  2. 2
      newlib/libc/stdio/fputwc_u.c
  3. 2
      newlib/libc/stdio/fputws.c
  4. 2
      newlib/libc/stdio/fwrite.c
  5. 6
      newlib/libc/stdio/getc.c
  6. 4
      newlib/libc/stdio/putc.c
  7. 2
      newlib/libc/stdio/puts.c

2
newlib/libc/stdio/fputs.c

@ -115,8 +115,6 @@ _fputs_r (struct _reent * ptr,
CHECK_INIT(ptr, fp);
_newlib_flockfile_start (fp);
if (ORIENT (fp, -1) != -1)
goto error;
/* Make sure we can write. */
if (cantwrite (ptr, fp))
goto error;

2
newlib/libc/stdio/fputwc_u.c

@ -34,8 +34,6 @@ _fputwc_unlocked_r (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
if (ORIENT(fp, 1) != 1)
return WEOF;
return __fputwc(ptr, wc, fp);
}

2
newlib/libc/stdio/fputws.c

@ -130,8 +130,6 @@ error:
return (-1);
#else
_newlib_flockfile_start (fp);
if (ORIENT (fp, 1) != 1)
goto error;
if (cantwrite (ptr, fp) != 0)
goto error;

2
newlib/libc/stdio/fwrite.c

@ -152,8 +152,6 @@ _fwrite_r (struct _reent * ptr,
CHECK_INIT (ptr, fp);
_newlib_flockfile_start (fp);
if (ORIENT (fp, -1) != -1)
goto ret;
/* Make sure we can write. */
if (cantwrite (ptr, fp))
goto ret;

6
newlib/libc/stdio/getc.c

@ -81,9 +81,6 @@ _getc_r (struct _reent *ptr,
{
int result;
CHECK_INIT (ptr, fp);
if (ORIENT (fp, -1) != -1)
return EOF;
_newlib_flockfile_start (fp);
result = __sgetc_r (ptr, fp);
_newlib_flockfile_end (fp);
@ -99,9 +96,6 @@ getc (register FILE *fp)
struct _reent *reent = _REENT;
CHECK_INIT (reent, fp);
if (ORIENT (fp, -1) != -1)
return EOF;
_newlib_flockfile_start (fp);
result = __sgetc_r (reent, fp);
_newlib_flockfile_end (fp);

4
newlib/libc/stdio/putc.c

@ -84,8 +84,6 @@ _putc_r (struct _reent *ptr,
{
int result;
CHECK_INIT (ptr, fp);
if (ORIENT (fp, -1) != -1)
return EOF;
_newlib_flockfile_start (fp);
result = __sputc_r (ptr, c, fp);
_newlib_flockfile_end (fp);
@ -102,8 +100,6 @@ putc (int c,
struct _reent *reent = _REENT;
CHECK_INIT (reent, fp);
if (ORIENT (fp, -1) != -1)
return EOF;
_newlib_flockfile_start (fp);
result = __sputc_r (reent, c, fp);
_newlib_flockfile_end (fp);

2
newlib/libc/stdio/puts.c

@ -102,8 +102,6 @@ _puts_r (struct _reent *ptr,
fp = _stdout_r (ptr);
CHECK_INIT (ptr, fp);
_newlib_flockfile_start (fp);
if (ORIENT (fp, -1) != -1)
goto err;
/* Make sure we can write. */
if (cantwrite (ptr, fp))
goto err;

Loading…
Cancel
Save