Convert to C90

1 files changed, 33 insertions, 62 deletions

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 79d3b48f27..cdec8ee769 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -69,18 +69,11 @@ static search_dirs_type **search_tail_ptr = &search_head;
 static search_arch_type *search_arch_head;
 static search_arch_type **search_arch_tail_ptr = &search_arch_head;
 
-static FILE *try_open
-  PARAMS ((const char *, const char *));
-static bfd_boolean is_sysrooted_pathname
-  PARAMS ((const char *, bfd_boolean));
-
 /* Test whether a pathname, after canonicalization, is the same or a
    sub-directory of the sysroot directory.  */
 
 static bfd_boolean
-is_sysrooted_pathname (name, notsame)
-     const char *name;
-     bfd_boolean notsame;
+is_sysrooted_pathname (const char *name, bfd_boolean notsame)
 {
   char * realname = ld_canon_sysroot ? lrealpath (name) : NULL;
   int len;
@@ -110,16 +103,14 @@ is_sysrooted_pathname (name, notsame)
    Makes a copy of NAME using xmalloc().  */
 
 void
-ldfile_add_library_path (name, cmdline)
-     const char *name;
-     bfd_boolean cmdline;
+ldfile_add_library_path (const char *name, bfd_boolean cmdline)
 {
   search_dirs_type *new;
 
   if (!cmdline && config.only_cmd_line_lib_dirs)
     return;
 
-  new = (search_dirs_type *) xmalloc (sizeof (search_dirs_type));
+  new = xmalloc (sizeof (search_dirs_type));
   new->next = NULL;
   new->cmdline = cmdline;
   *search_tail_ptr = new;
@@ -142,9 +133,8 @@ ldfile_add_library_path (name, cmdline)
 /* Try to open a BFD for a lang_input_statement.  */
 
 bfd_boolean
-ldfile_try_open_bfd (attempt, entry)
-     const char *attempt;
-     lang_input_statement_type *entry;
+ldfile_try_open_bfd (const char *attempt,
+		     lang_input_statement_type *entry)
 {
   entry->the_bfd = bfd_openr (attempt, entry->target);
 
@@ -298,11 +288,10 @@ ldfile_try_open_bfd (attempt, entry)
    archive, use ARCH, LIB and SUFFIX to modify the file name.  */
 
 bfd_boolean
-ldfile_open_file_search (arch, entry, lib, suffix)
-     const char *arch;
-     lang_input_statement_type *entry;
-     const char *lib;
-     const char *suffix;
+ldfile_open_file_search (const char *arch,
+			 lang_input_statement_type *entry,
+			 const char *lib,
+			 const char *suffix)
 {
   search_dirs_type *search;
 
@@ -332,9 +321,7 @@ ldfile_open_file_search (arch, entry, lib, suffix)
 	return FALSE;
     }
 
-  for (search = search_head;
-       search != (search_dirs_type *) NULL;
-       search = search->next)
+  for (search = search_head; search != NULL; search = search->next)
     {
       char *string;
 
@@ -347,13 +334,13 @@ ldfile_open_file_search (arch, entry, lib, suffix)
 	    }
 	}
 
-      string = (char *) xmalloc (strlen (search->name)
-				 + strlen (slash)
-				 + strlen (lib)
-				 + strlen (entry->filename)
-				 + strlen (arch)
-				 + strlen (suffix)
-				 + 1);
+      string = xmalloc (strlen (search->name)
+			+ strlen (slash)
+			+ strlen (lib)
+			+ strlen (entry->filename)
+			+ strlen (arch)
+			+ strlen (suffix)
+			+ 1);
 
       if (entry->is_archive)
 	sprintf (string, "%s%s%s%s%s%s", search->name, slash,
@@ -377,8 +364,7 @@ ldfile_open_file_search (arch, entry, lib, suffix)
 /* Open the input file specified by ENTRY.  */
 
 void
-ldfile_open_file (entry)
-     lang_input_statement_type *entry;
+ldfile_open_file (lang_input_statement_type *entry)
 {
   if (entry->the_bfd != NULL)
     return;
@@ -399,9 +385,7 @@ ldfile_open_file (entry)
       bfd_boolean found = FALSE;
 
       /* Try to open <filename><suffix> or lib<filename><suffix>.a */
-      for (arch = search_arch_head;
-	   arch != (search_arch_type *) NULL;
-	   arch = arch->next)
+      for (arch = search_arch_head; arch != NULL; arch = arch->next)
 	{
 	  found = ldfile_open_file_search (arch->name, entry, "lib", ".a");
 	  if (found)
@@ -433,9 +417,7 @@ ldfile_open_file (entry)
 /* Try to open NAME; if that fails, try NAME with EXTEN appended to it.  */
 
 static FILE *
-try_open (name, exten)
-     const char *name;
-     const char *exten;
+try_open (const char *name, const char *exten)
 {
   FILE *result;
   char buff[1000];
@@ -474,9 +456,7 @@ try_open (name, exten)
    specified with -L, without and with EXTEND appended.  */
 
 FILE *
-ldfile_find_command_file (name, extend)
-     const char *name;
-     const char *extend;
+ldfile_find_command_file (const char *name, const char *extend)
 {
   search_dirs_type *search;
   FILE *result;
@@ -484,12 +464,10 @@ ldfile_find_command_file (name, extend)
 
   /* First try raw name.  */
   result = try_open (name, "");
-  if (result == (FILE *) NULL)
+  if (result == NULL)
     {
       /* Try now prefixes.  */
-      for (search = search_head;
-	   search != (search_dirs_type *) NULL;
-	   search = search->next)
+      for (search = search_head; search != NULL; search = search->next)
 	{
 	  sprintf (buffer, "%s%s%s", search->name, slash, name);
 
@@ -503,13 +481,12 @@ ldfile_find_command_file (name, extend)
 }
 
 void
-ldfile_open_command_file (name)
-     const char *name;
+ldfile_open_command_file (const char *name)
 {
   FILE *ldlex_input_stack;
   ldlex_input_stack = ldfile_find_command_file (name, "");
 
-  if (ldlex_input_stack == (FILE *) NULL)
+  if (ldlex_input_stack == NULL)
     {
       bfd_set_error (bfd_error_system_call);
       einfo (_("%P%F: cannot open linker script file %s: %E\n"), name);
@@ -525,8 +502,7 @@ ldfile_open_command_file (name)
 
 #ifdef GNU960
 static char *
-gnu960_map_archname (name)
-     char *name;
+gnu960_map_archname (char *name)
 {
   struct tabentry { char *cmd_switch; char *arch; };
   static struct tabentry arch_tab[] =
@@ -556,11 +532,9 @@ gnu960_map_archname (name)
 }
 
 void
-ldfile_add_arch (name)
-     char *name;
+ldfile_add_arch (char *name)
 {
-  search_arch_type *new =
-    (search_arch_type *) xmalloc ((bfd_size_type) (sizeof (search_arch_type)));
+  search_arch_type *new = xmalloc (sizeof (search_arch_type));
 
   if (*name != '\0')
     {
@@ -573,7 +547,7 @@ ldfile_add_arch (name)
       ldfile_output_machine_name = name;
     }
 
-  new->next = (search_arch_type *) NULL;
+  new->next = NULL;
   new->name = gnu960_map_archname (name);
   *search_arch_tail_ptr = new;
   search_arch_tail_ptr = &new->next;
@@ -582,17 +556,15 @@ ldfile_add_arch (name)
 #else /* not GNU960 */
 
 void
-ldfile_add_arch (in_name)
-     const char *in_name;
+ldfile_add_arch (const char *in_name)
 {
   char *name = xstrdup (in_name);
-  search_arch_type *new =
-    (search_arch_type *) xmalloc (sizeof (search_arch_type));
+  search_arch_type *new = xmalloc (sizeof (search_arch_type));
 
   ldfile_output_machine_name = in_name;
 
   new->name = name;
-  new->next = (search_arch_type *) NULL;
+  new->next = NULL;
   while (*name)
     {
       *name = TOLOWER (*name);
@@ -607,8 +579,7 @@ ldfile_add_arch (in_name)
 /* Set the output architecture.  */
 
 void
-ldfile_set_output_arch (string)
-     const char *string;
+ldfile_set_output_arch (const char *string)
 {
   const bfd_arch_info_type *arch = bfd_scan_arch (string);