From e97a378b02662f173b005847d6cd159a3a31ae58 Mon Sep 17 00:00:00 2001
From: wkoszek <wkoszek@FreeBSD.org>
Date: Tue, 10 Apr 2007 21:42:12 +0000
Subject: strchr() and strrchr() are already present in the kernel, but with
 less popular names. Hence:

- comment current index() and rindex() functions, as these serve the same
  functionality as, respectively, strchr() and strrchr() from userland;
- add inlined version of strchr() and strrchr(), as we tend to use them more
  often;
- remove str[r]chr() definitions from ZFS code;

Reviewed by:	pjd
Approved by:	cognet (mentor)
---
 .../compat/opensolaris/kern/opensolaris_string.c   | 31 ----------------------
 sys/cddl/compat/opensolaris/sys/string.h           |  4 +--
 sys/compat/opensolaris/kern/opensolaris_string.c   | 31 ----------------------
 sys/compat/opensolaris/sys/string.h                |  4 +--
 sys/libkern/index.c                                |  4 +++
 sys/libkern/rindex.c                               |  4 +++
 sys/sys/libkern.h                                  | 12 +++++++++
 7 files changed, 24 insertions(+), 66 deletions(-)

diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
index cae984f..4448f34 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
@@ -32,37 +32,6 @@
 	(((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
 
 char *
-strchr(const char *s, int c)
-{
-	char ch;
-
-	ch = c;
-	for (;; ++s) {
-		if (*s == ch)
-			return ((char *)s);
-		if (*s == '\0')
-			return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-char *
-strrchr(const char *s, int c)
-{
-	char *save;
-	char ch;
-
-	ch = c;
-	for (save = NULL;; ++s) {
-		if (*s == ch)
-			save = (char *)s;
-		if (*s == '\0')
-			return (save);
-	}
-	/* NOTREACHED */
-}
-
-char *
 strpbrk(const char *s, const char *b)
 {
 	const char *p;
diff --git a/sys/cddl/compat/opensolaris/sys/string.h b/sys/cddl/compat/opensolaris/sys/string.h
index c802c0f..aeec929 100644
--- a/sys/cddl/compat/opensolaris/sys/string.h
+++ b/sys/cddl/compat/opensolaris/sys/string.h
@@ -29,8 +29,8 @@
 #ifndef _OPENSOLARIS_SYS_STRING_H_
 #define	_OPENSOLARIS_SYS_STRING_H_
 
-char	*strchr(const char *, int);
-char	*strrchr(const char *p, int c);
+#include <sys/libkern.h>
+
 char	*strpbrk(const char *, const char *);
 void	 strident_canon(char *s, size_t n);
 
diff --git a/sys/compat/opensolaris/kern/opensolaris_string.c b/sys/compat/opensolaris/kern/opensolaris_string.c
index cae984f..4448f34 100644
--- a/sys/compat/opensolaris/kern/opensolaris_string.c
+++ b/sys/compat/opensolaris/kern/opensolaris_string.c
@@ -32,37 +32,6 @@
 	(((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
 
 char *
-strchr(const char *s, int c)
-{
-	char ch;
-
-	ch = c;
-	for (;; ++s) {
-		if (*s == ch)
-			return ((char *)s);
-		if (*s == '\0')
-			return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-char *
-strrchr(const char *s, int c)
-{
-	char *save;
-	char ch;
-
-	ch = c;
-	for (save = NULL;; ++s) {
-		if (*s == ch)
-			save = (char *)s;
-		if (*s == '\0')
-			return (save);
-	}
-	/* NOTREACHED */
-}
-
-char *
 strpbrk(const char *s, const char *b)
 {
 	const char *p;
diff --git a/sys/compat/opensolaris/sys/string.h b/sys/compat/opensolaris/sys/string.h
index c802c0f..aeec929 100644
--- a/sys/compat/opensolaris/sys/string.h
+++ b/sys/compat/opensolaris/sys/string.h
@@ -29,8 +29,8 @@
 #ifndef _OPENSOLARIS_SYS_STRING_H_
 #define	_OPENSOLARIS_SYS_STRING_H_
 
-char	*strchr(const char *, int);
-char	*strrchr(const char *p, int c);
+#include <sys/libkern.h>
+
 char	*strpbrk(const char *, const char *);
 void	 strident_canon(char *s, size_t n);
 
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index d9f4709..a12d706 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -33,6 +33,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/libkern.h>
 
+/*
+ * index() is also present as the strchr() in the kernel; it does exactly the
+ * same thing as it's userland equivalent.
+ */
 char *
 index(p, ch)
 	const char *p;
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index b1669f8..19bed70 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -33,6 +33,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/libkern.h>
 
+/*
+ * rindex() is also present as the strrchr() in the kernel; it does exactly the
+ * same thing as it's userland equivalent.
+ */
 char *
 rindex(p, ch)
 	const char *p;
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 9d5ba5c..e3deb2d 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -153,6 +153,18 @@ memset(void *b, int c, size_t len)
 	return (b);
 }
 
+static __inline char *
+strchr(const char *p, int ch)
+{
+	return (index(p, ch));
+}
+
+static __inline char *
+strrchr(const char *p, int ch)
+{
+	return (rindex(p, ch));
+}
+
 /* fnmatch() return values. */
 #define	FNM_NOMATCH	1	/* Match failed. */
 
-- 
cgit v1.1