fflush -> __sflush

SCCS-vsn: lib/libc/stdio/fseek.c 5.5
SCCS-vsn: lib/libc/stdio/refill.c 5.2
SCCS-vsn: lib/libc/stdio/setvbuf.c 5.2

diff --git a/usr/src/lib/libc/stdio/fseek.c b/usr/src/lib/libc/stdio/fseek.c
index 9a9aadb..38b502f 100644 (file)
--- a/usr/src/lib/libc/stdio/fseek.c
+++ b/usr/src/lib/libc/stdio/fseek.c
@@ -9,7 +9,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)fseek.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)fseek.c    5.5 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -204,7 +204,7 @@ fseek(fp, offset, whence)
         * do it.  Allow the seek function to change fp->_bf._base.
         */
 dumb:
         * do it.  Allow the seek function to change fp->_bf._base.
         */
 dumb:

-       if (fflush(fp) ||
+       if (__sflush(fp) ||

            (*seekfn)(fp->_cookie, offset, whence) == POS_ERR) {
                return (EOF);
        }
            (*seekfn)(fp->_cookie, offset, whence) == POS_ERR) {
                return (EOF);
        }

diff --git a/usr/src/lib/libc/stdio/refill.c b/usr/src/lib/libc/stdio/refill.c
index e70bd4b..b115943 100644 (file)
--- a/usr/src/lib/libc/stdio/refill.c
+++ b/usr/src/lib/libc/stdio/refill.c
@@ -9,7 +9,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)refill.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)refill.c   5.2 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>


@@ -22,7 +22,7 @@ lflush(fp)
 {
 
        if ((fp->_flags & (__SLBF|__SWR)) == __SLBF|__SWR)
 {
 
        if ((fp->_flags & (__SLBF|__SWR)) == __SLBF|__SWR)

-               return (fflush(fp));
+               return (__sflush(fp));

        return (0);
 }
 
        return (0);
 }
 


@@ -52,7 +52,7 @@ __srefill(fp)
                }
                /* switch to reading */
                if (fp->_flags & __SWR) {
                }
                /* switch to reading */
                if (fp->_flags & __SWR) {

-                       if (fflush(fp))
+                       if (__sflush(fp))

                                return (EOF);
                        fp->_flags &= ~__SWR;
                        fp->_w = 0;
                                return (EOF);
                        fp->_flags &= ~__SWR;
                        fp->_w = 0;

diff --git a/usr/src/lib/libc/stdio/setvbuf.c b/usr/src/lib/libc/stdio/setvbuf.c
index bd66017..421b672 100644 (file)
--- a/usr/src/lib/libc/stdio/setvbuf.c
+++ b/usr/src/lib/libc/stdio/setvbuf.c
@@ -9,7 +9,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)setvbuf.c  5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)setvbuf.c  5.2 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>


@@ -41,7 +41,7 @@ setvbuf(fp, buf, mode, size)
         * Free old buffer if it was from malloc().  Clear line and
         * non buffer flags, and clear malloc flag.
         */
         * Free old buffer if it was from malloc().  Clear line and
         * non buffer flags, and clear malloc flag.
         */

-       (void) fflush(fp);
+       (void) __sflush(fp);

        fp->_r = 0;
        fp->_lbfsize = 0;
        if (fp->_flags & __SMBF)
        fp->_r = 0;
        fp->_lbfsize = 0;
        if (fp->_flags & __SMBF)