scan: Don't fflush manually. Let stdio care for this.

[mmh] / uip / termsbr.c

diff --git a/uip/termsbr.c b/uip/termsbr.c
index ce1420c..3c45eb2 100644 (file)
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -1,10 +1,10 @@
 /*
- * termsbr.c -- termcap support
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** termsbr.c -- termcap support
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 
@@ -42,9 +42,9 @@
 #endif
 
 /*
- * These variables are sometimes defined in,
- * and needed by the termcap library.
- */
+** These variables are sometimes defined in,
+** and needed by the termcap library.
+*/
 #ifdef HAVE_OSPEED
 # ifdef MUST_DEFINE_OSPEED
 extern short ospeed;
@@ -95,17 +95,17 @@ read_termcap(void)
        if (inited++)
                return;
 
-       if (!(term = getenv ("TERM")))
+       if (!(term = getenv("TERM")))
                return;
 
 /*
- * If possible, we let tgetent allocate its own termcap buffer
- */
+** If possible, we let tgetent allocate its own termcap buffer
+*/
 #ifdef TGETENT_ACCEPTS_NULL
-       if (tgetent (NULL, term) != TGETENT_SUCCESS)
+       if (tgetent(NULL, term) != TGETENT_SUCCESS)
                return;
 #else
-       if (tgetent (termbuf, term) != TGETENT_SUCCESS)
+       if (tgetent(termbuf, term) != TGETENT_SUCCESS)
                return;
 #endif
 
@@ -113,38 +113,40 @@ read_termcap(void)
        speedcode = cfgetospeed(&tio);
 #else
 # ifdef HAVE_TERMIO_H
-       speedcode = ioctl(fileno(stdout), TCGETA, &tio) != NOTOK ? tio.c_cflag & CBAUD : 0;
+       speedcode = ioctl(fileno(stdout), TCGETA, &tio) != NOTOK ?
+                       tio.c_cflag & CBAUD : 0;
 # else
-       speedcode = ioctl(fileno(stdout), TIOCGETP, (char *) &tio) != NOTOK ? tio.sg_ospeed : 0;
+       speedcode = ioctl(fileno(stdout), TIOCGETP, (char *) &tio) != NOTOK ?
+                       tio.sg_ospeed : 0;
 # endif
 #endif
 
-       HC = tgetflag ("hc");
+       HC = tgetflag("hc");
 
-       if (!initCO && (CO = tgetnum ("co")) <= 0)
+       if (!initCO && (CO = tgetnum("co")) <= 0)
                CO = 80;
-       if (!initLI && (LI = tgetnum ("li")) <= 0)
+       if (!initLI && (LI = tgetnum("li")) <= 0)
                LI = 24;
 
        cp = termcap;
-       CL = tgetstr ("cl", &cp);
-       if ((bp = tgetstr ("pc", &cp)))
+       CL = tgetstr("cl", &cp);
+       if ((bp = tgetstr("pc", &cp)))
                PC = *bp;
-       if (tgetnum ("sg") <= 0) {
-               SE = tgetstr ("se", &cp);
-               SO = tgetstr ("so", &cp);
+       if (tgetnum("sg") <= 0) {
+               SE = tgetstr("se", &cp);
+               SO = tgetstr("so", &cp);
        }
 }
 
 
 int
-sc_width (void)
+sc_width(void)
 {
 #ifdef TIOCGWINSZ
        struct winsize win;
        int width;
 
-       if (ioctl (fileno (stderr), TIOCGWINSZ, &win) != NOTOK
+       if (ioctl(fileno(stderr), TIOCGWINSZ, &win) != NOTOK
                        && (width = win.ws_col) > 0) {
                CO = width;
                initCO++;
@@ -157,12 +159,12 @@ sc_width (void)
 
 
 int
-sc_length (void)
+sc_length(void)
 {
 #ifdef TIOCGWINSZ
        struct winsize win;
 
-       if (ioctl (fileno (stderr), TIOCGWINSZ, &win) != NOTOK
+       if (ioctl(fileno(stderr), TIOCGWINSZ, &win) != NOTOK
                        && (LI = win.ws_row) > 0)
                initLI++;
        else
@@ -173,56 +175,49 @@ sc_length (void)
 }
 
 
-static int
-outc (int c)
-{
-       return putchar(c);
-}
-
-
 void
-clear_screen (void)
+clear_screen(void)
 {
-       read_termcap ();
+       read_termcap();
 
        if (CL && speedcode)
-               tputs (CL, LI, outc);
+               tputs(CL, LI, putchar);
        else {
-               printf ("\f");
+               printf("\f");
                if (speedcode)
-                       printf ("\200");
+                       printf("\200");
        }
 
-       fflush (stdout);
+       fflush(stdout);
 }
 
 
 /*
- * print in standout mode
- */
+** print in standout mode
+*/
 int
-SOprintf (char *fmt, ...)
+SOprintf(char *fmt, ...)
 {
        va_list ap;
 
-       read_termcap ();
+       read_termcap();
        if (!(SO && SE))
                return NOTOK;
 
-       tputs (SO, 1, outc);
+       tputs(SO, 1, putchar);
 
        va_start(ap, fmt);
-       vprintf (fmt, ap);
+       vprintf(fmt, ap);
        va_end(ap);
 
-       tputs (SE, 1, outc);
+       tputs(SE, 1, putchar);
 
        return OK;
 }
 
 /*
- * Is this a hardcopy terminal?
- */
+** Is this a hardcopy terminal?
+*/
 
 int
 sc_hardcopy(void)