BSD 4_4 release

[unix-history] / usr / src / sys / libkern / scanc.c

diff --git a/usr/src/sys/libkern/scanc.c b/usr/src/sys/libkern/scanc.c
index cbebd6e..2d8b6a0 100644 (file)
--- a/usr/src/sys/libkern/scanc.c
+++ b/usr/src/sys/libkern/scanc.c
@@ -1,20 +1,50 @@
 /*-
 /*-

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)scanc.c     7.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)scanc.c     8.1 (Berkeley) 6/10/93

  */
 
  */
 

+#include <libkern/libkern.h>
+

 int
 int

-scanc(size, cp, table, mask)
-       unsigned int size;
-       register unsigned char *cp, table[];
-       register unsigned char mask;
+scanc(size, cp, table, mask0)
+       u_int size;
+       register u_char *cp, table[];
+       int mask0;

 {
 {

-       register unsigned char *end;
+       register u_char *end;
+       register u_char mask;

 
 

+       mask = mask0;

        for (end = &cp[size]; cp < end && (table[*cp] & mask) == 0; ++cp);
        return (end - cp);
 }
        for (end = &cp[size]; cp < end && (table[*cp] & mask) == 0; ++cp);
        return (end - cp);
 }