* arm.c (arm_handle_notshared_attribute): Wrap declaration and use

[pf3gnuchains/gcc-fork.git] / gcc / gen-protos.c

diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index 4858b4f..b8fa31b 100644 (file)
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -1,6 +1,6 @@
 /* gen-protos.c - massages a list of prototypes, for use by fixproto.
    Copyright (C) 1993, 1994, 1995, 1996, 1998,
-   1999 Free Software Foundation, Inc.
+   1999, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -16,16 +16,17 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "hconfig.h"
+#include "bconfig.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "scan.h"
-#undef abort
+#include "errors.h"
 
 int verbose = 0;
-const char *progname;
 
-static void add_hash           PARAMS ((const char *));
-static int parse_fn_proto      PARAMS ((char *, char *, struct fn_decl *));
+static void add_hash (const char *);
+static int parse_fn_proto (char *, char *, struct fn_decl *);
 
 #define HASH_SIZE 2503 /* a prime */
 int hash_tab[HASH_SIZE];
@@ -33,8 +34,7 @@ int next_index;
 int collisions;
 
 static void
-add_hash (fname)
-     const char *fname;
+add_hash (const char *fname)
 {
   int i, i0;
 
@@ -47,8 +47,7 @@ add_hash (fname)
       for (;;)
        {
          i = (i+1) % HASH_SIZE;
-         if (i == i0)
-           abort ();
+         gcc_assert (i != i0);
          if (hash_tab[i] == 0)
            break;
        }
@@ -65,11 +64,9 @@ add_hash (fname)
    The fields of FN point to the input string.  */
 
 static int
-parse_fn_proto (start, end, fn)
-     char *start, *end;
-     struct fn_decl *fn;
+parse_fn_proto (char *start, char *end, struct fn_decl *fn)
 {
-  register char *ptr;
+  char *ptr;
   int param_nesting = 1;
   char *param_start, *param_end, *decl_start, *name_start, *name_end;
 
@@ -109,7 +106,8 @@ parse_fn_proto (start, end, fn)
     }
   name_end = ptr+1;
 
-  while (ISALNUM ((unsigned char)*ptr) || *ptr == '_') --ptr;
+  while (ISIDNUM (*ptr))
+    --ptr;
   name_start = ptr+1;
   while (*ptr == ' ' || *ptr == '\t') ptr--;
   ptr[1] = 0;
@@ -128,12 +126,8 @@ parse_fn_proto (start, end, fn)
   return 1;
 }
 
-extern int main PARAMS ((int, char **));
-
 int
-main (argc, argv)
-     int argc ATTRIBUTE_UNUSED;
-     char **argv;
+main (int argc ATTRIBUTE_UNUSED, char **argv)
 {
   FILE *inf = stdin;
   FILE *outf = stdout;
@@ -152,7 +146,7 @@ main (argc, argv)
   /* A hash table entry of 0 means "unused" so reserve it.  */
   fprintf (outf, "  {\"\", \"\", \"\", 0},\n");
   next_index = 1;
-  
+
   for (;;)
     {
       int c = skip_spaces (inf, ' ');
@@ -189,24 +183,6 @@ main (argc, argv)
 
   fprintf (stderr, "gen-protos: %d entries %d collisions\n",
           next_index, collisions);
-  
-  return 0;
-}
 
-/* Needed by scan.o.  We can't use libiberty here.  */
-PTR
-xrealloc (p, s)
-     PTR p;
-     size_t s;
-{
-  PTR r;
-  if (s == 0)
-    s = 1;
-  if (p)
-    r = realloc (p, s);
-  else
-    r = malloc (s);
-  if (!r)
-    abort ();
-  return r;
+  return 0;
 }