xnu-792.21.3.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 f35c1ba79993ae5b04780c59eb37182c3c1fad5c..f1093765784d10e9c71fe12eac457f6caaa77aaf 100644 (file)
--- a/bsd/kern/tty_subr.c
+++ b/bsd/kern/tty_subr.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1997 Apple Computer, Inc. All Rights Reserved */
 /*
@@ -56,7 +62,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
@@ -89,7 +94,7 @@
  * Initialize clists.
  */
 void
-cinit()
+cinit(void)
 {
 }
 
@@ -104,15 +109,15 @@ clalloc(clp, size, quot)
        int quot;
 {
 
-       MALLOC(clp->c_cs, u_char *, size, M_TTYS, M_WAITOK);
+       MALLOC_ZONE(clp->c_cs, u_char *, size, M_TTYS, M_WAITOK);
        if (!clp->c_cs)
                return (-1);
        bzero(clp->c_cs, size);
 
        if(quot) {
-               MALLOC(clp->c_cq, u_char *, QMEM(size), M_TTYS, M_WAITOK);
+               MALLOC_ZONE(clp->c_cq, u_char *, QMEM(size), M_TTYS, M_WAITOK);
                if (!clp->c_cq) {
-                       FREE(clp->c_cs, M_TTYS);
+                       FREE_ZONE(clp->c_cs, size, M_TTYS);
                        return (-1);
                }
                bzero(clp->c_cs, QMEM(size));
@@ -131,9 +136,9 @@ clfree(clp)
        struct clist *clp;
 {
        if(clp->c_cs)
-               FREE(clp->c_cs, M_TTYS);
+               FREE_ZONE(clp->c_cs, clp->c_cn, M_TTYS);
        if(clp->c_cq)
-               FREE(clp->c_cq, M_TTYS);
+               FREE_ZONE(clp->c_cq, QMEM(clp->c_cn), M_TTYS);
        clp->c_cs = clp->c_cq = (u_char *)0;
 }
 
@@ -346,10 +351,7 @@ out:
  *     clrbit(cp, off + len);
  */
 void
-clrbits(cp, off, len)
-       u_char *cp;
-       int off;
-       int len;
+clrbits(u_char *cp, int off, int len)
 {
        int sby, sbi, eby, ebi;
        register int i;
@@ -385,13 +387,10 @@ clrbits(cp, off, len)
  * Return number of bytes not transfered.
  */
 int
-b_to_q(cp, count, clp)
-       u_char *cp;
-       int count;
-       struct clist *clp;
+b_to_q(const u_char *cp, int count, struct clist *clp)
 {
-       register int cc;
-       register u_char *p = cp;
+       int cc;
+       const u_char *p = cp;
        int s;
 
        if (count <= 0)