--- xnu/xnu-1228/iokit/Kernel/IOStringFuncs.c
+++ xnu/xnu-4570.41.2/iokit/Kernel/IOStringFuncs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,7 +25,9 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*      Copyright (c) 1995 NeXT Computer, Inc.  All rights reserved.
+
+/*      
+ *      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
@@ -38,7 +40,7 @@
  *      Commented out references to errno.
  */
 
-/*-
+/*
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -79,6 +81,14 @@
 #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 *strncat(char *s1, const char *s2, unsigned long n);
+
+
 typedef int BOOL;
 
 static inline BOOL
@@ -115,11 +125,11 @@
 long
 strtol(const char *nptr, char **endptr, int base)
 {
-	register const char *s = nptr;
-	register unsigned long acc;
-	register int c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s = nptr;
+	unsigned long acc;
+	char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
@@ -191,18 +201,27 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-		*endptr = (char *)(any ? s - 1 : nptr);
+	{
+		if(any)
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+		}
+		else
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+		}
+	}
 	return (acc);
 }
 
 unsigned long
 strtoul(const char *nptr, char **endptr, int base)
 {
-	register const char *s = nptr;
-	register unsigned long acc;
-	register int c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s = nptr;
+	unsigned long acc;
+	char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/*
 	 * See strtol for comments as to the logic used.
@@ -253,7 +272,17 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-		*endptr = (char *)(any ? s - 1 : nptr);
+	{
+		if(any)
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+		}
+		else
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+		}
+	}
+
 	return (acc);
 }
 
@@ -266,11 +295,11 @@
 quad_t
 strtoq(const char *nptr, char **endptr, 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;
+	const char *s;
+	u_quad_t acc;
+	char c;
+	u_quad_t qbase, cutoff;
+	int neg, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
@@ -329,7 +358,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;
@@ -343,7 +372,17 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-		*endptr = (char *)(any ? s - 1 : nptr);
+	{
+		if(any)
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+		}
+		else
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+		}
+	}
+
 	return (acc);
 }
 
@@ -357,13 +396,13 @@
 u_quad_t
 strtouq(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;
+	int base)
+{
+	const char *s = nptr;
+	u_quad_t acc;
+	char c;
+	u_quad_t qbase, cutoff;
+	int neg, any, cutlim;
 
 	/*
 	 * See strtoq for comments as to the logic used.
@@ -400,7 +439,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;
@@ -414,23 +453,20 @@
 	} else if (neg)
 		acc = -acc;
 	if (endptr != 0)
-		*endptr = (char *)(any ? s - 1 : nptr);
+	{
+		if(any)
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+		}
+		else
+		{
+			*endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+		}
+	}
+
 	return (acc);
 }
 
-
-/*
- *
- */
-
-char *strchr(const char *str, int ch)
-{
-    do {
-	if (*str == ch)
-	    return((char *)str);
-    } while (*str++);
-    return ((char *) 0);
-}
 
 /*
  *