X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3903760236c30e3b5ace7a4eefac3a269d68957c..e8c3f78193f1895ea514044358b93b1add9322f3:/iokit/Kernel/IOStringFuncs.c

diff --git a/iokit/Kernel/IOStringFuncs.c b/iokit/Kernel/IOStringFuncs.c
index d536b7243..6890305d6 100644
--- a/iokit/Kernel/IOStringFuncs.c
+++ b/iokit/Kernel/IOStringFuncs.c
@@ -86,7 +86,6 @@ 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);
 
 
@@ -469,19 +468,6 @@ strtouq(const char *nptr,
 }
 
 
-/*
- *
- */
-
-char *strchr(const char *str, int ch)
-{
-    do {
-	if (*str == ch)
-	    return(__CAST_AWAY_QUALIFIER(str, const, char *));
-    } while (*str++);
-    return ((char *) 0);
-}
-
 /*
  *
  */
@@ -489,17 +475,18 @@ char *strchr(const char *str, int ch)
 char *
 strncat(char *s1, const char *s2, unsigned long n)
 {
-	char *os1;
-	int i = n;
-
-	os1 = s1;
-	while (*s1++)
-		;
-	--s1;
-	while ((*s1++ = *s2++))
-		if (--i < 0) {
-			*--s1 = '\0';
-			break;
-		}
-	return(os1);
+	if (n != 0) {
+		char *d = s1;
+		const char *s = s2;
+
+		while (*d != 0)
+			d++;
+		do {
+			if ((*d = *s++) == '\0')
+				break;
+			d++;
+		} while (--n != 0);
+		*d = '\0';
+	}
+	return (s1);
 }