* addr2line.c: Convert to ISO C90 prototypes, change PTR, remove

	unneeded (void *) casts.
	* ar.c: Likewise.
	* arlex.l: Likewise.
	* arparse.y: Likewise.
	* arsup.c: Likewise.
	* binemul.c: Likewise.
	* binemul.h: Likewise.
	* bucomm.c: Likewise.
	* bucomm.h: Likewise.
	* budbg.h: Likewise.
	* budemang.c: Likewise.
	* budemang.h: Likewise.
	* coffdump.c: Likewise.
	* coffgrok.c: Likewise.
	* cxxfilt.c: Likewise.
	* debug.c: Likewise.
	* debug.h: Likewise.
	* deflex.l: Likewise.
	* dlltool.c: Likewise.
	* dlltool.h: Likewise.
	* dllwrap.c: Likewise.
	* emul_aix.c: Likewise.
	* filemode.c: Likewise.
	* ieee.c: Likewise.
	* nlmconv.c: Likewise.
	* nlmconv.h: Likewise.
	* nlmheader.y: Likewise.
	* nm.c: Likewise.
	* prdbg.c: Likewise.
	* rclex.l: Likewise.
	* rcparse.y: Likewise.
	* rdcoff.c: Likewise.
	* rddbg.c: Likewise.
	* rename.c: Likewise.
	* resbin.c: Likewise.
	* rescoff.c: Likewise.
	* resrc.c: Likewise.
	* size.c: Likewise.
	* srconv.c: Likewise.
	* stabs.c: Likewise.
	* strings.c: Likewise.
	* sysdump.c: Likewise.
	* sysinfo.y: Likewise.
	* syslex.l: Likewise.
	* unwind-ia64.c: Likewise.
	* unwind-ia64.h: Likewise.
	* version.c: Likewise.
	* windres.c: Likewise.
	* windres.h: Likewise.
	* winduni.c: Likewise.
	* wrstabs.c: Likewise.

1 files changed, 40 insertions, 78 deletions

diff --git a/binutils/windres.c b/binutils/windres.c
index d874fc0..012c42b 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -104,15 +104,15 @@ static struct include_dir *include_dirs;
 
 /* Static functions.  */
 
-static void res_init PARAMS ((void));
-static int extended_menuitems PARAMS ((const struct menuitem *));
-static enum res_format format_from_name PARAMS ((const char *, int));
-static enum res_format format_from_filename PARAMS ((const char *, int));
-static void usage PARAMS ((FILE *, int));
-static int cmp_res_entry PARAMS ((const PTR, const PTR));
-static struct res_directory *sort_resources PARAMS ((struct res_directory *));
-static void reswr_init PARAMS ((void));
-static const char * quot PARAMS ((const char *));
+static void res_init (void);
+static int extended_menuitems (const struct menuitem *);
+static enum res_format format_from_name (const char *, int);
+static enum res_format format_from_filename (const char *, int);
+static void usage (FILE *, int);
+static int cmp_res_entry (const void *, const void *);
+static struct res_directory *sort_resources (struct res_directory *);
+static void reswr_init (void);
+static const char * quot (const char *);
 
 /* When we are building a resource tree, we allocate everything onto
    an obstack, so that we can free it all at once if we want.  */
@@ -127,18 +127,17 @@ static struct obstack res_obstack;
 /* Initialize the resource building obstack.  */
 
 static void
-res_init ()
+res_init (void)
 {
   obstack_init (&res_obstack);
 }
 
 /* Allocate space on the resource building obstack.  */
 
-PTR
-res_alloc (bytes)
-     size_t bytes;
+void *
+res_alloc (size_t bytes)
 {
-  return (PTR) obstack_alloc (&res_obstack, bytes);
+  return (void *) obstack_alloc (&res_obstack, bytes);
 }
 
 /* We also use an obstack to save memory used while writing out a set
@@ -149,28 +148,24 @@ static struct obstack reswr_obstack;
 /* Initialize the resource writing obstack.  */
 
 static void
-reswr_init ()
+reswr_init (void)
 {
   obstack_init (&reswr_obstack);
 }
 
 /* Allocate space on the resource writing obstack.  */
 
-PTR
-reswr_alloc (bytes)
-     size_t bytes;
+void *
+reswr_alloc (size_t bytes)
 {
-  return (PTR) obstack_alloc (&reswr_obstack, bytes);
+  return (void *) obstack_alloc (&reswr_obstack, bytes);
 }
 
 /* Open a file using the include directory search list.  */
 
 FILE *
-open_file_search (filename, mode, errmsg, real_filename)
-     const char *filename;
-     const char *mode;
-     const char *errmsg;
-     char **real_filename;
+open_file_search (const char *filename, const char *mode, const char *errmsg,
+		  char **real_filename)
 {
   FILE *e;
   struct include_dir *d;
@@ -213,9 +208,7 @@ open_file_search (filename, mode, errmsg, real_filename)
    section.  */
 
 int
-res_id_cmp (a, b)
-     struct res_id a;
-     struct res_id b;
+res_id_cmp (struct res_id a, struct res_id b)
 {
   if (! a.named)
     {
@@ -263,10 +256,7 @@ res_id_cmp (a, b)
 /* Print a resource ID.  */
 
 void
-res_id_print (stream, id, quote)
-     FILE *stream;
-     struct res_id id;
-     int quote;
+res_id_print (FILE *stream, struct res_id id, int quote)
 {
   if (! id.named)
     fprintf (stream, "%lu", id.u.id);
@@ -283,10 +273,7 @@ res_id_print (stream, id, quote)
 /* Print a list of resource ID's.  */
 
 void
-res_ids_print (stream, cids, ids)
-     FILE *stream;
-     int cids;
-     const struct res_id *ids;
+res_ids_print (FILE *stream, int cids, const struct res_id *ids)
 {
   int i;
 
@@ -301,9 +288,7 @@ res_ids_print (stream, cids, ids)
 /* Convert an ASCII string to a resource ID.  */
 
 void
-res_string_to_id (res_id, string)
-     struct res_id *res_id;
-     const char *string;
+res_string_to_id (struct res_id *res_id, const char *string)
 {
   res_id->named = 1;
   unicode_from_ascii (&res_id->u.n.length, &res_id->u.n.name, string);
@@ -318,11 +303,8 @@ res_string_to_id (res_id, string)
    one.  */
 
 struct res_resource *
-define_resource (resources, cids, ids, dupok)
-     struct res_directory **resources;
-     int cids;
-     const struct res_id *ids;
-     int dupok;
+define_resource (struct res_directory **resources, int cids,
+		 const struct res_id *ids, int dupok)
 {
   struct res_entry *re = NULL;
   int i;
@@ -419,12 +401,8 @@ define_resource (resources, cids, ids, dupok)
    that just takes type, name, and language arguments.  */
 
 struct res_resource *
-define_standard_resource (resources, type, name, language, dupok)
-     struct res_directory **resources;
-     int type;
-     struct res_id name;
-     int language;
-     int dupok;
+define_standard_resource (struct res_directory **resources, int type,
+			  struct res_id name, int language, int dupok)
 {
   struct res_id a[3];
 
@@ -439,9 +417,7 @@ define_standard_resource (resources, type, name, language, dupok)
 /* Comparison routine for resource sorting.  */
 
 static int
-cmp_res_entry (p1, p2)
-     const PTR p1;
-     const PTR p2;
+cmp_res_entry (const void *p1, const void *p2)
 {
   const struct res_entry **re1, **re2;
 
@@ -453,8 +429,7 @@ cmp_res_entry (p1, p2)
 /* Sort the resources.  */
 
 static struct res_directory *
-sort_resources (resdir)
-     struct res_directory *resdir;
+sort_resources (struct res_directory *resdir)
 {
   int c, i;
   struct res_entry *re;
@@ -496,8 +471,7 @@ sort_resources (resdir)
    DIALOGEX.  */
 
 int
-extended_dialog (dialog)
-     const struct dialog *dialog;
+extended_dialog (const struct dialog *dialog)
 {
   const struct dialog_control *c;
 
@@ -514,15 +488,13 @@ extended_dialog (dialog)
 /* Return whether MENUITEMS are a MENU or a MENUEX.  */
 
 int
-extended_menu (menu)
-     const struct menu *menu;
+extended_menu (const struct menu *menu)
 {
   return extended_menuitems (menu->items);
 }
 
 static int
-extended_menuitems (menuitems)
-     const struct menuitem *menuitems;
+extended_menuitems (const struct menuitem *menuitems)
 {
   const struct menuitem *mi;
 
@@ -554,9 +526,7 @@ extended_menuitems (menuitems)
 /* Convert a string to a format type, or exit if it can't be done.  */
 
 static enum res_format
-format_from_name (name, exit_on_error)
-     const char *name;
-     int exit_on_error;
+format_from_name (const char *name, int exit_on_error)
 {
   const struct format_map *m;
 
@@ -581,9 +551,7 @@ format_from_name (name, exit_on_error)
    it's OK to look at the file itself.  */
 
 static enum res_format
-format_from_filename (filename, input)
-     const char *filename;
-     int input;
+format_from_filename (const char *filename, int input)
 {
   const char *ext;
   FILE *e;
@@ -662,9 +630,7 @@ format_from_filename (filename, input)
 /* Print a usage message and exit.  */
 
 static void
-usage (stream, status)
-     FILE *stream;
-     int status;
+usage (FILE *stream, int status)
 {
   fprintf (stream, _("Usage: %s [option(s)] [input-file] [output-file]\n"),
 	   program_name);
@@ -707,8 +673,7 @@ No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"));
 /* Quote characters that will confuse the shell when we run the preprocessor.  */
 
 static const char *
-quot (string)
-     const char *string;
+quot (const char *string)
 {
   static char *buf = 0;
   static int buflen = 0;
@@ -765,14 +730,12 @@ static const struct option long_options[] =
 };
 
 /* This keeps gcc happy when using -Wmissing-prototypes -Wstrict-prototypes.  */
-int main PARAMS ((int, char **));
+int main (int, char **);
 
 /* The main function.  */
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int c;
   char *input_filename;
@@ -835,7 +798,7 @@ main (argc, argv)
 	  if (* optarg == 0)
 	    {
 	      if (optind == argc)
-		fatal (_("No filename following the -fo option.\n"));	    
+		fatal (_("No filename following the -fo option.\n"));
 	      optarg = argv [optind++];
 	    }
 	  /* Fall through.  */
@@ -897,7 +860,7 @@ main (argc, argv)
 	      input_format = input_format_tmp;
 	      break;
 	    }
-	  
+
 	  if (preprocargs == NULL)
 	    {
 	      quotedarg = quot (optarg);
@@ -1038,4 +1001,3 @@ main (argc, argv)
   xexit (0);
   return 0;
 }
-