--- xnu/xnu-1504.3.12/iokit/Kernel/IOStringFuncs.c
+++ xnu/xnu-517/iokit/Kernel/IOStringFuncs.c
@@ -1,19 +1,16 @@
 /*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * 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.
- * 
- * 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. 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
@@ -23,11 +20,9 @@
  * 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 +35,7 @@
  *      Commented out references to errno.
  */
 
-/*
+/*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -81,15 +76,6 @@
 #include <sys/types.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;
 
 static inline BOOL
@@ -124,7 +110,10 @@
  * alphabets and digits are each contiguous.
  */
 long
-strtol(const char *nptr, char **endptr, int base)
+strtol(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
 {
 	register const char *s = nptr;
 	register unsigned long acc;
@@ -202,21 +191,15 @@
 	} 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)
+strtoul(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
 {
 	register const char *s = nptr;
 	register unsigned long acc;
@@ -273,17 +256,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,7 +267,10 @@
  * alphabets and digits are each contiguous.
  */
 quad_t
-strtoq(const char *nptr, char **endptr, int base)
+strtoq(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
 {
 	register const char *s;
 	register u_quad_t acc;
@@ -359,7 +335,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 +349,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,9 +361,10 @@
  * alphabets and digits are each contiguous.
  */
 u_quad_t
-strtouq(const char *nptr,
-	char **endptr,
-	register int base)
+strtouq(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
 {
 	register const char *s = nptr;
 	register u_quad_t acc;
@@ -440,7 +407,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 +421,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 +434,7 @@
 {
     do {
 	if (*str == ch)
-	    return(__CAST_AWAY_QUALIFIER(str, const, char *));
+	    return((char *)str);
     } while (*str++);
     return ((char *) 0);
 }