--- xnu/xnu-3789.70.16/iokit/Kernel/IOStringFuncs.c
+++ xnu/xnu-201/iokit/Kernel/IOStringFuncs.c
@@ -1,33 +1,25 @@
 /*
- * Copyright (c) 1998-2016 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_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. 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.
+ * 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.
  * 
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*      
- *      Copyright (c) 1995 NeXT Computer, Inc.  All rights reserved.
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*      Copyright (c) 1995 NeXT Computer, Inc.  All rights reserved.
  *
  * strol.c - The functions strtol() & strtoul() are exported as public API
  *           via the header file ~driverkit/generalFuncs.h
@@ -40,7 +32,7 @@
  *      Commented out references to errno.
  */
 
-/*
+/*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -79,16 +71,8 @@
 #include <limits.h>
 */
 #include <sys/types.h>
+#include <stddef.h>
 #include <machine/limits.h>
-
-
-long strtol(const char *nptr, char **endptr, int base);
-unsigned long strtoul(const char *nptr, char **endptr, int base);
-quad_t strtoq(const char *nptr, char **endptr, int base);
-u_quad_t strtouq(const char *nptr, char **endptr, int base);
-char *strchr(const char *str, int ch);
-char *strncat(char *s1, const char *s2, unsigned long n);
-
 
 typedef int BOOL;
 
@@ -124,13 +108,16 @@
  * alphabets and digits are each contiguous.
  */
 long
-strtol(const char *nptr, char **endptr, int base)
-{
-	const char *s = nptr;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg = 0, any, cutlim;
+strtol(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
+{
+	register const char *s = nptr;
+	register unsigned long acc;
+	register int c;
+	register unsigned long cutoff;
+	register int neg = 0, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
@@ -202,27 +189,21 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-	{
-		if(any)
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
-		}
-		else
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
-		}
-	}
+		*endptr = (char *)(any ? s - 1 : nptr);
 	return (acc);
 }
 
 unsigned long
-strtoul(const char *nptr, char **endptr, int base)
-{
-	const char *s = nptr;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg = 0, any, cutlim;
+strtoul(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
+{
+	register const char *s = nptr;
+	register unsigned long acc;
+	register int c;
+	register unsigned long cutoff;
+	register int neg = 0, any, cutlim;
 
 	/*
 	 * See strtol for comments as to the logic used.
@@ -273,17 +254,7 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-	{
-		if(any)
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
-		}
-		else
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
-		}
-	}
-
+		*endptr = (char *)(any ? s - 1 : nptr);
 	return (acc);
 }
 
@@ -294,13 +265,16 @@
  * alphabets and digits are each contiguous.
  */
 quad_t
-strtoq(const char *nptr, char **endptr, int base)
-{
-	const char *s;
-	u_quad_t acc;
-	char c;
-	u_quad_t qbase, cutoff;
-	int neg, any, cutlim;
+strtoq(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
+{
+	register const char *s;
+	register u_quad_t acc;
+	register int c;
+	register u_quad_t qbase, cutoff;
+	register int neg, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
@@ -359,7 +333,7 @@
 			break;
 		if (c >= base)
 			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+		if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
 			any = -1;
 		else {
 			any = 1;
@@ -373,17 +347,7 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-	{
-		if(any)
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
-		}
-		else
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
-		}
-	}
-
+		*endptr = (char *)(any ? s - 1 : nptr);
 	return (acc);
 }
 
@@ -395,15 +359,16 @@
  * alphabets and digits are each contiguous.
  */
 u_quad_t
-strtouq(const char *nptr,
-	char **endptr,
-	int base)
-{
-	const char *s = nptr;
-	u_quad_t acc;
-	char c;
-	u_quad_t qbase, cutoff;
-	int neg, any, cutlim;
+strtouq(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
+{
+	register const char *s = nptr;
+	register u_quad_t acc;
+	register int c;
+	register u_quad_t qbase, cutoff;
+	register int neg, any, cutlim;
 
 	/*
 	 * See strtoq for comments as to the logic used.
@@ -440,7 +405,7 @@
 			break;
 		if (c >= base)
 			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+		if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
 			any = -1;
 		else {
 			any = 1;
@@ -454,17 +419,7 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-	{
-		if(any)
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
-		}
-		else
-		{
-			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
-		}
-	}
-
+		*endptr = (char *)(any ? s - 1 : nptr);
 	return (acc);
 }
 
@@ -477,7 +432,7 @@
 {
     do {
 	if (*str == ch)
-	    return(__CAST_AWAY_QUALIFIER(str, const, char *));
+	    return((char *)str);
     } while (*str++);
     return ((char *) 0);
 }