Implement extensions on top of standards instead of the other way around.

Now that index() and rindex() have become unused, simply turn them into
wrappers around strchr() and strrchr(), respectively.

2 files changed, 2 insertions, 14 deletions

diff --git a/sys/libkern/index.c b/sys/libkern/strchr.c
index a12d706..6ee4798 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/strchr.c
@@ -33,14 +33,8 @@ __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;
-	int ch;
+strchr(const char *p, int ch)
 {
 	union {
 		const char *cp;
diff --git a/sys/libkern/rindex.c b/sys/libkern/strrchr.c
index 19bed70..6ff7eb4 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/strrchr.c
@@ -33,14 +33,8 @@ __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;
-	int ch;
+strrchr(const char *p, int ch)
 {
 	union {
 		const char *cp;