From 61e52c4d60c57f520cd19de310260395add5ce97 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 20 Nov 2023 20:49:53 +0100
Subject: 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>
---
 newlib/libc/stdio/fputs.c    | 2 --
 newlib/libc/stdio/fputwc_u.c | 2 --
 newlib/libc/stdio/fputws.c   | 2 --
 newlib/libc/stdio/fwrite.c   | 2 --
 newlib/libc/stdio/getc.c     | 6 ------
 newlib/libc/stdio/putc.c     | 4 ----
 newlib/libc/stdio/puts.c     | 2 --
 7 files changed, 20 deletions(-)

(limited to 'newlib')

diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index a4f18df2a..743794943 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/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;
diff --git a/newlib/libc/stdio/fputwc_u.c b/newlib/libc/stdio/fputwc_u.c
index a5cc9a5d5..7e7403b99 100644
--- a/newlib/libc/stdio/fputwc_u.c
+++ b/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);
 }
 
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index d6963837b..f9fe4a4b3 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/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;
 
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 2d9749693..9241ea2cd 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/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;
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 12bffaf8f..c8781320e 100644
--- a/newlib/libc/stdio/getc.c
+++ b/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);
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index 925341939..6a410e216 100644
--- a/newlib/libc/stdio/putc.c
+++ b/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);
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 20d889b81..d24022b4b 100644
--- a/newlib/libc/stdio/puts.c
+++ b/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;
-- 
cgit v1.2.3