From 425289a9db71798c280b36e39f1a29d79dfd8ed3 Mon Sep 17 00:00:00 2001
From: Robert Drehmel <robert@FreeBSD.org>
Date: Fri, 30 Aug 2002 19:42:07 +0000
Subject:  - Update the manual pages of index() and rindex() to show   
 <strings.h> as the associated header file.    The prototypes have been moved
 there from <string.h> because    POSIX.1-2001 said so.  - Conditionally
 include either <strings.h> or <string.h> based    on whether the [r]index()
 or str[r]chr() functions are    compiled, respectively.  - Style(9) tells us
 to     - put a space after the return keyword     - to check for a NUL
 character without using the ! operator.     - use NULL instead of (type
 *)NULL where the compiler knows       the type.    Apply these rules.  -
 Rather use ANSI-C function definitions than K&R ones.  - For index(3),
 correct second function argument's type; it was    declared to be a `const
 char' before and is now an `int'.

---
 lib/libc/string/index.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'lib/libc/string/index.c')

diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 7eaf3d71de86..c81f95b0989b 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -37,22 +37,26 @@ static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
 #include <stddef.h>
 
-char *
 #ifdef STRCHR
-strchr(p, ch)
+#include <string.h>
+
+char *
+strchr
 #else
-index(p, ch)
+#include <strings.h>
+
+char *
+index
 #endif
-	const char *p, ch;
+(const char *p, int ch)
 {
 	for (;; ++p) {
 		if (*p == ch)
-			return((char *)p);
-		if (!*p)
-			return((char *)NULL);
+			return ((char *)p);
+		if (*p == '\0')
+			return (NULL);
 	}
 	/* NOTREACHED */
 }
-- 
cgit v1.3