xnu-1699.24.23.tar.gz

[apple/xnu.git] / bsd / libkern / scanc.c

diff --git a/bsd/libkern/scanc.c b/bsd/libkern/scanc.c
index 0926a31b4b835a6413b92d4604f6159c616382cd..4d2ec8f8b3e7e0c2c68f48b772662d545d0f3c1c 100644 (file)
--- a/bsd/libkern/scanc.c
+++ b/bsd/libkern/scanc.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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) 1992, 1993
@@ -60,15 +63,12 @@
 #include <libkern/libkern.h>
 
 int
-scanc(size, cp, table, mask0)
-       u_int size;
-       register u_char *cp, table[];
-       int mask0;
+scanc(u_int size, u_char *cp, const u_char table[], int mask0)
 {
-       register u_char *end;
-       register u_char mask;
+       u_char *end;
+       u_char mask;
 
        mask = mask0;
-       for (end = &cp[size]; cp < end && (table[*cp] & mask) == 0; ++cp);
+       for (end = &cp[size]; cp != end && (table[*cp] & mask) == 0; ++cp);
        return (end - cp);
 }