As a minor cleanup remove the (r)index defines from include/string.h as

they are only used internally in a few places.  Rename all uses that
occur in GLIBC.

	* hurd/path-lookup.c (file_name_path_scan): Rename index to strchr.
	* include/string.h (index): Remove define.
	(rindex): Likewise.
	* misc/getttyent.c (__getttyent): Rename index to strchr.
	* misc/ttyslot.c (ttyslot): Rename rindex to strrchr.
	* sunrpc/rpc_main.c (mkfile_output): Likewise.

ChangeLog

@@ -1,3 +1,12 @@
+2017-02-06  Wilco Dijkstra  <[email protected]>
+
+	* hurd/path-lookup.c (file_name_path_scan): Rename index to strchr.
+	* include/string.h (index): Remove define.
+	(rindex): Likewise.
+	* misc/getttyent.c (__getttyent): Rename index to strchr.
+	* misc/ttyslot.c (ttyslot): Rename rindex to strrchr.
+	* sunrpc/rpc_main.c (mkfile_output): Likewise.
+
 2017-02-06  Joseph Myers  <[email protected]>
 
 	* math/libm-test-driver.c: New file.  Based on math/libm-test.inc.

hurd/path-lookup.c

@@ -33,7 +33,7 @@ file_name_path_scan (const char *file_name, const char *path,
 		     error_t (*fun)(const char *name),
 		     char **prefixed_name)
 {
-  if (path == NULL || index (file_name, '/'))
+  if (path == NULL || strchr (file_name, '/'))
     {
       if (prefixed_name)
 	*prefixed_name = 0;
@@ -47,7 +47,7 @@ file_name_path_scan (const char *file_name, const char *path,
       for (;;)
 	{
 	  error_t err;
-	  const char *next = index (path, ':') ?: path + strlen (path);
+	  const char *next = strchr (path, ':') ?: path + strlen (path);
 	  size_t pfx_len = next - path;
 	  char pfxed_name[pfx_len + 2 + file_name_len + 1];
 

include/string.h

@@ -160,15 +160,6 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
 extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
 #endif
 
-# ifndef _ISOMAC
-#  ifndef index
-#   define index(s, c)	(strchr ((s), (c)))
-#  endif
-#  ifndef rindex
-#   define rindex(s, c)	(strrchr ((s), (c)))
-#  endif
-# endif
-
 extern void *__memcpy_chk (void *__restrict __dest,
 			   const void *__restrict __src, size_t __len,
 			   size_t __destlen) __THROW;

misc/getttyent.c

@@ -78,7 +78,7 @@ __getttyent (void)
 			return (NULL);
 		}
 		/* skip lines that are too big */
-		if (!index(p, '\n')) {
+		if (!strchr (p, '\n')) {
 			while ((c = getc_unlocked(tf)) != '\n' && c != EOF)
 				;
 			continue;
@@ -127,7 +127,7 @@ __getttyent (void)
 	tty.ty_comment = p;
 	if (*p == 0)
 		tty.ty_comment = 0;
-	if ((p = index(p, '\n')))
+	if ((p = strchr (p, '\n')))
 		*p = '\0';
 	return (&tty);
 }
@@ -179,7 +179,7 @@ internal_function
 value (char *p)
 {
 
-	return ((p = index(p, '=')) ? ++p : NULL);
+	return ((p = strchr (p, '=')) ? ++p : NULL);
 }
 
 int

misc/ttyslot.c

@@ -56,7 +56,7 @@ ttyslot (void)
 	__setttyent();
 	for (cnt = 0; cnt < 3; ++cnt)
 		if (__ttyname_r (cnt, name, buflen) == 0) {
-			if ((p = rindex(name, '/')))
+			if ((p = strrchr (name, '/')))
 				++p;
 			else
 				p = name;

sunrpc/rpc_main.c

@@ -956,7 +956,7 @@ mkfile_output (struct commandline *cmd)
       mkfilename = alloc (strlen ("Makefile.") + strlen (cmd->infile) + 1);
       if (mkfilename == NULL)
 	abort ();
-      temp = rindex (cmd->infile, '.');
+      temp = strrchr (cmd->infile, '.');
       cp = stpcpy (mkfilename, "Makefile.");
       if (temp != NULL)
 	*((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';