xnu-3789.70.16.tar.gz

[apple/xnu.git] / bsd / kern / tty_subr.c

diff --git a/bsd/kern/tty_subr.c b/bsd/kern/tty_subr.c
index c2abc010d4b27efe015519b7ebab728970f56a2e..bfac6579b780b0ee78d624584c3f98b9f7e2d9ca 100644 (file)
--- a/bsd/kern/tty_subr.c
+++ b/bsd/kern/tty_subr.c
@@ -203,8 +203,8 @@ int
 ndqb(struct clist *clp, int flag)
 {
        int count = 0;
-       register int i;
-       register int cc;
+       int i;
+       int cc;
 
        if ((cc = clp->c_cc) == 0)
                goto out;
@@ -271,7 +271,7 @@ ndflush(struct clist *clp, int count)
 int
 putc(int c, struct clist *clp)
 {
-       register int i;
+       int i;
 
        if (clp->c_cc == 0) {
                if (!clp->c_cs) {
@@ -320,7 +320,7 @@ void
 clrbits(u_char *cp, int off, int len)
 {
        int sby, sbi, eby, ebi;
-       register int i;
+       int i;
        u_char mask;
 
        if(len==1) {
@@ -340,7 +340,9 @@ clrbits(u_char *cp, int off, int len)
                cp[sby++] &= mask;
 
                mask = (1<<ebi) - 1;
-               cp[eby] &= ~mask;
+               /* handle remainder bits, if any, for a non-0 ebi value */
+               if (mask)
+                       cp[eby] &= ~mask;
 
                for (i = sby; i < eby; i++)
                        cp[i] = 0x00;