From c398de0cddd0a2215e9d9c0f563d40aa5f554692 Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Wed, 1 Sep 1993 22:24:34 +0000
Subject: [PATCH] index -> strchr

---
 gdb/ChangeLog      | 5 +++++
 gdb/i960-tdep.c    | 3 +--
 gdb/ns32k-pinsn.c  | 2 +-
 gdb/remote-adapt.c | 2 +-
 gdb/xcoffread.c    | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dedecb7a17..6f181d22c8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  1 14:36:00 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* i960-tdep.c, ns32k-pinsn.c, remote-adapt.c, xcoffread.c:
+	  index -> strchr.
+
 Wed Sep  1 11:35:49 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* remote.c: Add comment explaining why dcache is disabled.
diff --git a/gdb/i960-tdep.c b/gdb/i960-tdep.c
index 3f46f394bc..df9f04a615 100644
--- a/gdb/i960-tdep.c
+++ b/gdb/i960-tdep.c
@@ -468,11 +468,10 @@ leafproc_return (ip)
   int dst;
   unsigned int insn1, insn2;
   CORE_ADDR return_addr;
-  char *index ();
 
   if ((msymbol = lookup_minimal_symbol_by_pc (ip)) != NULL)
     {
-      if ((p = index (SYMBOL_NAME (msymbol), '.')) && STREQ (p, ".lf"))
+      if ((p = strchr(SYMBOL_NAME (msymbol), '.')) && STREQ (p, ".lf"))
 	{
 	  if (next_insn (SYMBOL_VALUE_ADDRESS (msymbol), &insn1, &insn2)
 	      && (insn1 & 0xff87ffff) == 0x5c80161e       /* mov g14, gx */
diff --git a/gdb/ns32k-pinsn.c b/gdb/ns32k-pinsn.c
index 820517368b..1680d87a8d 100644
--- a/gdb/ns32k-pinsn.c
+++ b/gdb/ns32k-pinsn.c
@@ -227,7 +227,7 @@ print_insn (memaddr, stream)
       for (argnum = 0; argnum <= maxarg; argnum++)
 	{
 	  CORE_ADDR addr;
-	  char *ch, *index ();
+	  char *ch;
 	  for (ch = arg_bufs[argnum]; *ch;)
 	    {
 	      if (*ch == NEXT_IS_ADDR)
diff --git a/gdb/remote-adapt.c b/gdb/remote-adapt.c
index 390466d7bb..ff07b4b6d7 100644
--- a/gdb/remote-adapt.c
+++ b/gdb/remote-adapt.c
@@ -1331,7 +1331,7 @@ adapt_com (args, fromtty)
 		break;
 	/* Begin commands that take input in the form 'c x,y[,z...]' */
 	case 'S':	/* Set memory or register */
-		if (index(args,',')) {	/* Assume it is properly formatted */
+		if (strchr(args,',')) {	/* Assume it is properly formatted */
 			write(adapt_desc,args,strlen(args));
 			write(adapt_desc,"\r",1);
 			expect_prompt();
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 960d2d894a..c6a138aeaa 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1627,7 +1627,7 @@ process_xcoff_symbol (cs, objfile)
         /* FIXME: I believe this is to avoid a Sun-specific hack somewhere.
 	   Needs more investigation.  */
 
-	if (*name == ':' || (pp = (char *) index (name, ':')) == NULL)
+	if (*name == ':' || (pp = (char *) strchr(name, ':')) == NULL)
 	  return NULL;
 
 	++pp;
-- 
2.34.1