misc cleanups

SCCS-vsn: sys/kern/tty_subr.c 7.8

diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index fd22d6f..9713d0f 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)tty_subr.c  7.7 (Berkeley) %G%
+ *     @(#)tty_subr.c  7.8 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -96,10 +96,10 @@ getc(p)
 q_to_b(q, cp, cc)
        register struct clist *q;
        register char *cp;
 q_to_b(q, cp, cc)
        register struct clist *q;
        register char *cp;

+       int cc;

 {
        register struct cblock *bp;
 {
        register struct cblock *bp;

-       register int s;
-       register nc;
+       register int s, nc;

        char *acp;
 
        if (cc <= 0)
        char *acp;
 
        if (cc <= 0)


@@ -159,9 +159,9 @@ q_to_b(q, cp, cc)
  */
 ndqb(q, flag)
        register struct clist *q;
  */
 ndqb(q, flag)
        register struct clist *q;

+       int flag;

 {
 {

-       register cc;
-       int s;
+       register int cc, s;

 
        s = spltty();
        if (q->c_cc <= 0) {
 
        s = spltty();
        if (q->c_cc <= 0) {


@@ -197,7 +197,7 @@ out:
  */
 ndflush(q, cc)
        register struct clist *q;
  */
 ndflush(q, cc)
        register struct clist *q;

-       register cc;
+       register int cc;

 {
        register struct cblock *bp;
        char *end;
 {
        register struct cblock *bp;
        char *end;


@@ -250,11 +250,12 @@ out:
 
 
 putc(c, p)
 
 
 putc(c, p)

+       int c;

        register struct clist *p;
 {
        register struct cblock *bp;
        register char *cp;
        register struct clist *p;
 {
        register struct cblock *bp;
        register char *cp;

-       register s;
+       register int s;

 
        s = spltty();
        if ((cp = p->c_cl) == NULL || p->c_cc < 0 ) {   /* no cblocks yet */
 
        s = spltty();
        if ((cp = p->c_cl) == NULL || p->c_cc < 0 ) {   /* no cblocks yet */


@@ -299,7 +300,7 @@ b_to_q(cp, cc, q)
 {
        register char *cq;
        register struct cblock *bp;
 {
        register char *cq;
        register struct cblock *bp;

-       register s, nc;
+       register int s, nc;

        int acc;
 
        if (cc <= 0)
        int acc;
 
        if (cc <= 0)


@@ -422,7 +423,7 @@ catq(from, to)
 #ifdef notdef
        char bbuf[CBSIZE*4];
 #endif
 #ifdef notdef
        char bbuf[CBSIZE*4];
 #endif

-       register s, c;
+       register int s, c;

 
        s = spltty();
        if (to->c_cc == 0) {
 
        s = spltty();
        if (to->c_cc == 0) {


@@ -507,7 +508,7 @@ putw(c, p)
        register struct clist *p;
        word_t c;
 {
        register struct clist *p;
        word_t c;
 {

-       register s;
+       register int s;

        register struct cblock *bp;
        register char *cp;
 
        register struct cblock *bp;
        register char *cp;