From 22fec34a573ffd2c43dc56e07a2fc9ab4dcba8eb Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 3 Jan 2012 07:05:30 +0000
Subject: [PATCH] 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.
---
 sys/conf/files                      |  4 ++--
 sys/libkern/{index.c => strchr.c}   |  8 +-------
 sys/libkern/{rindex.c => strrchr.c} |  8 +-------
 sys/sys/libkern.h                   | 14 ++++++++------
 4 files changed, 12 insertions(+), 22 deletions(-)
 rename sys/libkern/{index.c => strchr.c} (91%)
 rename sys/libkern/{rindex.c => strrchr.c} (91%)

diff --git a/sys/conf/files b/sys/conf/files
index 27255a82b0ce..5e7f6d788e5a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2551,7 +2551,6 @@ libkern/iconv_converter_if.m	optional libiconv
 libkern/iconv_ucs.c		optional libiconv
 libkern/iconv_xlat.c		optional libiconv
 libkern/iconv_xlat16.c		optional libiconv
-libkern/index.c			standard
 libkern/inet_aton.c		standard
 libkern/inet_ntoa.c		standard
 libkern/inet_ntop.c		standard
@@ -2562,10 +2561,10 @@ libkern/memcmp.c		standard
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
 libkern/random.c		standard
-libkern/rindex.c		standard
 libkern/scanc.c			standard
 libkern/strcasecmp.c		standard
 libkern/strcat.c		standard
+libkern/strchr.c		standard
 libkern/strcmp.c		standard
 libkern/strcpy.c		standard
 libkern/strcspn.c		standard
@@ -2576,6 +2575,7 @@ libkern/strlen.c		standard
 libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/strnlen.c		standard
+libkern/strrchr.c		standard
 libkern/strsep.c		standard
 libkern/strspn.c		standard
 libkern/strstr.c		standard
diff --git a/sys/libkern/index.c b/sys/libkern/strchr.c
similarity index 91%
rename from sys/libkern/index.c
rename to sys/libkern/strchr.c
index a12d70616c43..6ee479833890 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
similarity index 91%
rename from sys/libkern/rindex.c
rename to sys/libkern/strrchr.c
index 19bed70344f9..6ff7eb45b943 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;
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index bbe3cfc7d9b3..4cf218800237 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -99,12 +99,11 @@ void	 qsort(void *base, size_t nmemb, size_t size,
 void	 qsort_r(void *base, size_t nmemb, size_t size, void *thunk,
 	    int (*compar)(void *, const void *, const void *));
 u_long	 random(void);
-char	*index(const char *, int);
-char	*rindex(const char *, int);
 int	 scanc(u_int, const u_char *, const u_char *, int);
 void	 srandom(u_long);
 int	 strcasecmp(const char *, const char *);
 char	*strcat(char * __restrict, const char * __restrict);
+char	*strchr(const char *, int);
 int	 strcmp(const char *, const char *);
 char	*strcpy(char * __restrict, const char * __restrict);
 size_t	 strcspn(const char * __restrict, const char * __restrict) __pure;
@@ -116,6 +115,7 @@ int	 strncasecmp(const char *, const char *, size_t);
 int	 strncmp(const char *, const char *, size_t);
 char	*strncpy(char * __restrict, const char * __restrict, size_t);
 size_t	 strnlen(const char *, size_t);
+char	*strrchr(const char *, int);
 char	*strsep(char **, const char *delim);
 size_t	 strspn(const char *, const char *);
 char	*strstr(const char *, const char *);
@@ -164,15 +164,17 @@ memset(void *b, int c, size_t len)
 #endif
 
 static __inline char *
-strchr(const char *p, int ch)
+index(const char *p, int ch)
 {
-	return (index(p, ch));
+
+	return (strchr(p, ch));
 }
 
 static __inline char *
-strrchr(const char *p, int ch)
+rindex(const char *p, int ch)
 {
-	return (rindex(p, ch));
+
+	return (strrchr(p, ch));
 }
 
 /* fnmatch() return values. */