Convert to C90 and a few tweaks.

1 files changed, 16 insertions, 24 deletions

diff --git a/bfd/format.c b/bfd/format.c
index 6415b8d57b..256ec0efd4 100644
--- a/bfd/format.c
+++ b/bfd/format.c
@@ -86,9 +86,7 @@ DESCRIPTION
 */
 
 bfd_boolean
-bfd_check_format (abfd, format)
-     bfd *abfd;
-     bfd_format format;
+bfd_check_format (bfd *abfd, bfd_format format)
 {
   return bfd_check_format_matches (abfd, format, NULL);
 }
@@ -98,8 +96,8 @@ FUNCTION
 	bfd_check_format_matches
 
 SYNOPSIS
-	bfd_boolean bfd_check_format_matches (bfd *abfd, bfd_format format,
-					      char ***matching);
+	bfd_boolean bfd_check_format_matches
+	  (bfd *abfd, bfd_format format, char ***matching);
 
 DESCRIPTION
 	Like <<bfd_check_format>>, except when it returns FALSE with
@@ -114,10 +112,7 @@ DESCRIPTION
 */
 
 bfd_boolean
-bfd_check_format_matches (abfd, format, matching)
-     bfd *abfd;
-     bfd_format format;
-     char ***matching;
+bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching)
 {
   extern const bfd_target binary_vec;
   const bfd_target * const *target;
@@ -148,7 +143,7 @@ bfd_check_format_matches (abfd, format, matching)
 
       *matching = NULL;
       amt = sizeof (*matching_vector) * 2 * _bfd_target_vector_entries;
-      matching_vector = (const bfd_target **) bfd_malloc (amt);
+      matching_vector = bfd_malloc (amt);
       if (!matching_vector)
 	return FALSE;
     }
@@ -165,7 +160,7 @@ bfd_check_format_matches (abfd, format, matching)
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)	/* rewind! */
 	{
 	  if (matching)
-	    free ((PTR) matching_vector);
+	    free (matching_vector);
 	  return FALSE;
 	}
 
@@ -176,7 +171,7 @@ bfd_check_format_matches (abfd, format, matching)
 	  abfd->xvec = right_targ;	/* Set the target as returned.  */
 
 	  if (matching)
-	    free ((PTR) matching_vector);
+	    free (matching_vector);
 
 	  return TRUE;			/* File position has moved, BTW.  */
 	}
@@ -199,7 +194,7 @@ bfd_check_format_matches (abfd, format, matching)
 	  abfd->format = bfd_unknown;
 
 	  if (matching)
-	    free ((PTR) matching_vector);
+	    free (matching_vector);
 
 	  bfd_set_error (bfd_error_file_not_recognized);
 
@@ -220,7 +215,7 @@ bfd_check_format_matches (abfd, format, matching)
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
 	{
 	  if (matching)
-	    free ((PTR) matching_vector);
+	    free (matching_vector);
 	  return FALSE;
 	}
 
@@ -279,7 +274,7 @@ bfd_check_format_matches (abfd, format, matching)
 	  abfd->format = bfd_unknown;
 
 	  if (matching)
-	    free ((PTR) matching_vector);
+	    free (matching_vector);
 
 	  return FALSE;
 	}
@@ -332,7 +327,7 @@ bfd_check_format_matches (abfd, format, matching)
       abfd->xvec = right_targ;		/* Change BFD's target permanently.  */
 
       if (matching)
-	free ((PTR) matching_vector);
+	free (matching_vector);
 
       return TRUE;			/* File position has moved, BTW.  */
     }
@@ -345,7 +340,7 @@ bfd_check_format_matches (abfd, format, matching)
       bfd_set_error (bfd_error_file_not_recognized);
 
       if (matching)
-	free ((PTR) matching_vector);
+	free (matching_vector);
     }
   else
     {
@@ -383,9 +378,7 @@ DESCRIPTION
 */
 
 bfd_boolean
-bfd_set_format (abfd, format)
-     bfd *abfd;
-     bfd_format format;
+bfd_set_format (bfd *abfd, bfd_format format)
 {
   if (bfd_read_p (abfd)
       || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
@@ -423,11 +416,10 @@ DESCRIPTION
 */
 
 const char *
-bfd_format_string (format)
-     bfd_format format;
+bfd_format_string (bfd_format format)
 {
-  if (((int)format <(int) bfd_unknown)
-      || ((int)format >=(int) bfd_type_end))
+  if (((int) format < (int) bfd_unknown)
+      || ((int) format >= (int) bfd_type_end))
     return "invalid";
 
   switch (format)