Add prototypes, remove unsed cplus_match, make mystrstr static

From-SVN: r13702

diff --git a/gcc/cplus-dem.c b/gcc/cplus-dem.c
index 02f0887c917aa8108d52434b6bbf126670c375ef..f43f7c1562d5c79508f8ac2bf2dcf8aa4813a722 100644 (file)
--- a/gcc/cplus-dem.c
+++ b/gcc/cplus-dem.c
@@ -1,5 +1,5 @@
 /* Demangler for GNU C++ 
-   Copyright 1989, 1991, 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright 1989, 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by James Clark (jjc@jclark.uucp)
    Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
    
@@ -39,11 +39,13 @@ Boston, MA 02111-1307, USA.  */
 extern char *xmalloc PARAMS((unsigned));
 extern char *xrealloc PARAMS((char *, unsigned));
 
-char *
+static const char *mystrstr PARAMS ((const char *, const char *));
+
+static const char *
 mystrstr (s1, s2)
-     char *s1, *s2;
+     const char *s1, *s2;
 {
-  register char *p = s1;
+  register const char *p = s1;
   register int len = strlen (s2);
 
   for (; (p = strchr (p, *s2)) != 0; p++)
@@ -222,6 +224,16 @@ static int
 demangle_template PARAMS ((struct work_stuff *work, const char **, string *,
                           string *));
 
+static int
+arm_pt PARAMS ((struct work_stuff *, const char *, int, const char **,
+               const char **));
+
+static void
+demangle_arm_pt PARAMS ((struct work_stuff *, const char **, int, string *));
+
+static int
+demangle_class_name PARAMS ((struct work_stuff *, const char **, string *));
+
 static int
 demangle_qualified PARAMS ((struct work_stuff *, const char **, string *,
                            int, int));
@@ -472,21 +484,6 @@ cplus_mangle_opname (opname, options)
   return (0);
 }
 
-/* Check to see whether MANGLED can match TEXT in the first TEXT_LEN
-   characters.  */
-
-int cplus_match (mangled, text, text_len)
-     const char *mangled;
-     char *text;
-     int text_len;
-{
-  if (strncmp (mangled, text, text_len) != 0) {
-    return(0); /* cannot match either */
-  } else {
-    return(1); /* matches mangled, may match demangled */
-  }
-}
-
 /* char *cplus_demangle (const char *mangled, int options)
 
    If MANGLED is a mangled function name produced by GNU C++, then