* bfd-in.h: Comment typo fix. Formatting.

	* bfd-in2.h: Regenerate.
	* coff64-rs6000.c (xcoff64_openr_next_archived_file): Warning fix.
	* elf32-m68hc12.c (m68hc12_elf_set_mach_from_flags): Prototype.
	* elf64-mmix.c (mmix_dump_bpo_gregs): Warning fix.

6 files changed, 61 insertions, 51 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4e19c1d..7d8a72c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h: Comment typo fix.  Formatting.
+	* bfd-in2.h: Regenerate.
+	* coff64-rs6000.c (xcoff64_openr_next_archived_file): Warning fix.
+	* elf32-m68hc12.c (m68hc12_elf_set_mach_from_flags): Prototype.
+	* elf64-mmix.c (mmix_dump_bpo_gregs): Warning fix.
+
 2002-12-05  Richard Henderson  <rth@redhat.com>
 
 	* elfxx-ia64.c (elfNN_ia64_relax_section): Handle PCREL21BI.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 1757015..3b1f9ab 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -72,11 +72,11 @@ typedef struct _bfd bfd;
 
 /* Boolean type used in bfd.  Too many systems define their own
    versions of "boolean" for us to safely typedef a "boolean" of
-   our own.  Using an enum for "bfd_boolean" has it's own set of
+   our own.  Using an enum for "bfd_boolean" has its own set of
    problems, with strange looking casts required to avoid warnings
    on some older compilers.  Thus we just use an int.
 
-   General rule: functions which are bfd_boolean return TRUE on
+   General rule: Functions which are bfd_boolean return TRUE on
    success and FALSE on failure (unless they're a predicate).  */
 
 typedef int bfd_boolean;
@@ -535,48 +535,48 @@ extern bfd_boolean bfd_record_phdr
 
 /* Byte swapping routines.  */
 
-bfd_vma		bfd_getb64
+bfd_vma bfd_getb64
   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64
+bfd_vma bfd_getl64
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64
+bfd_signed_vma bfd_getb_signed_64
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64
+bfd_signed_vma bfd_getl_signed_64
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32
+bfd_vma bfd_getb32
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32
+bfd_vma bfd_getl32
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32
+bfd_signed_vma bfd_getb_signed_32
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32
+bfd_signed_vma bfd_getl_signed_32
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16
+bfd_vma bfd_getb16
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16
+bfd_vma bfd_getl16
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16
+bfd_signed_vma bfd_getb_signed_16
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16
+bfd_signed_vma bfd_getl_signed_16
   PARAMS ((const unsigned char *));
-void		bfd_putb64
+void bfd_putb64
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64
+void bfd_putl64
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32
+void bfd_putb32
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32
+void bfd_putl32
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16
+void bfd_putb16
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16
+void bfd_putl16
   PARAMS ((bfd_vma, unsigned char *));
 
 /* Byte swapping routines which take size and endiannes as arguments.  */
 
-bfd_vma         bfd_get_bits
+bfd_vma bfd_get_bits
   PARAMS ((bfd_byte *, int, bfd_boolean));
-void            bfd_put_bits
+void bfd_put_bits
   PARAMS ((bfd_vma, bfd_byte *, int, bfd_boolean));
 
 /* Externally visible ECOFF routines.  */
@@ -620,7 +620,7 @@ extern bfd_boolean bfd_ecoff_debug_externals
 	   const struct ecoff_debug_swap *swap,
 	   bfd_boolean relocateable,
 	   bfd_boolean (*get_extr) (struct symbol_cache_entry *,
-				struct ecoff_extr *),
+				    struct ecoff_extr *),
 	   void (*set_index) (struct symbol_cache_entry *,
 			      bfd_size_type)));
 extern bfd_boolean bfd_ecoff_debug_one_external
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 11b6d3c..c654d83 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -79,11 +79,11 @@ typedef struct _bfd bfd;
 
 /* Boolean type used in bfd.  Too many systems define their own
    versions of "boolean" for us to safely typedef a "boolean" of
-   our own.  Using an enum for "bfd_boolean" has it's own set of
+   our own.  Using an enum for "bfd_boolean" has its own set of
    problems, with strange looking casts required to avoid warnings
    on some older compilers.  Thus we just use an int.
 
-   General rule: functions which are bfd_boolean return TRUE on
+   General rule: Functions which are bfd_boolean return TRUE on
    success and FALSE on failure (unless they're a predicate).  */
 
 typedef int bfd_boolean;
@@ -542,48 +542,48 @@ extern bfd_boolean bfd_record_phdr
 
 /* Byte swapping routines.  */
 
-bfd_vma		bfd_getb64
+bfd_vma bfd_getb64
   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64
+bfd_vma bfd_getl64
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64
+bfd_signed_vma bfd_getb_signed_64
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64
+bfd_signed_vma bfd_getl_signed_64
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32
+bfd_vma bfd_getb32
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32
+bfd_vma bfd_getl32
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32
+bfd_signed_vma bfd_getb_signed_32
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32
+bfd_signed_vma bfd_getl_signed_32
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16
+bfd_vma bfd_getb16
   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16
+bfd_vma bfd_getl16
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16
+bfd_signed_vma bfd_getb_signed_16
   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16
+bfd_signed_vma bfd_getl_signed_16
   PARAMS ((const unsigned char *));
-void		bfd_putb64
+void bfd_putb64
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64
+void bfd_putl64
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32
+void bfd_putb32
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32
+void bfd_putl32
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16
+void bfd_putb16
   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16
+void bfd_putl16
   PARAMS ((bfd_vma, unsigned char *));
 
 /* Byte swapping routines which take size and endiannes as arguments.  */
 
-bfd_vma         bfd_get_bits
+bfd_vma bfd_get_bits
   PARAMS ((bfd_byte *, int, bfd_boolean));
-void            bfd_put_bits
+void bfd_put_bits
   PARAMS ((bfd_vma, bfd_byte *, int, bfd_boolean));
 
 /* Externally visible ECOFF routines.  */
@@ -627,7 +627,7 @@ extern bfd_boolean bfd_ecoff_debug_externals
 	   const struct ecoff_debug_swap *swap,
 	   bfd_boolean relocateable,
 	   bfd_boolean (*get_extr) (struct symbol_cache_entry *,
-				struct ecoff_extr *),
+				    struct ecoff_extr *),
 	   void (*set_index) (struct symbol_cache_entry *,
 			      bfd_size_type)));
 extern bfd_boolean bfd_ecoff_debug_one_external
diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
index c4b5622..c13d54b 100644
--- a/bfd/coff64-rs6000.c
+++ b/bfd/coff64-rs6000.c
@@ -2019,7 +2019,7 @@ xcoff64_openr_next_archived_file (archive, last_file)
      bfd *archive;
      bfd *last_file;
 {
-  file_ptr filestart;
+  bfd_vma filestart;
 
   if ((xcoff_ardata (archive) == NULL)
       || ! xcoff_big_format_p (archive))
@@ -2048,7 +2048,7 @@ xcoff64_openr_next_archived_file (archive, last_file)
       return NULL;
     }
 
-  return _bfd_get_elt_at_filepos (archive, filestart);
+  return _bfd_get_elt_at_filepos (archive, (file_ptr) filestart);
 }
 
 /* We can't use the usual coff_sizeof_headers routine, because AIX
diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
index 97d7d3a..219fd6b 100644
--- a/bfd/elf32-m68hc12.c
+++ b/bfd/elf32-m68hc12.c
@@ -47,6 +47,8 @@ static bfd_boolean elf32_m68hc11_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
+static bfd_boolean m68hc12_elf_set_mach_from_flags PARAMS ((bfd *));
+
 bfd_boolean _bfd_m68hc12_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
 bfd_boolean _bfd_m68hc12_elf_set_private_flags PARAMS ((bfd *, flagword));
 bfd_boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
@@ -794,7 +796,7 @@ _bfd_m68hc12_elf_print_private_bfd_data (abfd, ptr)
   if (elf_elfheader (abfd)->e_flags & EF_M68HCS12_MACH)
     fprintf (file, _(" cpu=HCS12]"));
   else
-    fprintf (file, _(" cpu=HC12]"));    
+    fprintf (file, _(" cpu=HC12]"));
   fputc ('\n', file);
 
   return TRUE;
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index d9ad982..3cca228 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -2281,8 +2281,8 @@ mmix_dump_bpo_gregs (link_info, pf)
     for (i = 0; i < gregdata->n_max_bpo_relocs; i++)
       (*pf) ("%4u (%4u)/%4u#%u: 0x%08lx%08lx  r: %3u o: %3u\n",
 	     i,
-	     gregdata->bpo_reloc_indexes != NULL
-	     ? gregdata->bpo_reloc_indexes[i] : -1,
+	     (gregdata->bpo_reloc_indexes != NULL
+	      ? gregdata->bpo_reloc_indexes[i] : (size_t) -1),
 	     gregdata->reloc_request[i].bpo_reloc_no,
 	     gregdata->reloc_request[i].valid,