Touches most files in bfd/, so likely will be blamed for everything..

o  bfd_read and bfd_write lose an unnecessary param and become
   bfd_bread and bfd_bwrite.

o  bfd_*alloc now all take a bfd_size_type arg, and will error if
   size_t is too small.  eg. 32 bit host, 64 bit bfd, verrry big files
   or bugs in linker scripts etc.

o  file_ptr becomes a bfd_signed_vma.  Besides matching sizes with
   various other types involved in handling sections, this should make
   it easier for bfd to support a 64 bit off_t on 32 bit hosts that
   provide it.

o  I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
   generally available.  They now cast their args to bfd_vma and
   bfd_byte * as appropriate, which removes a swag of casts from the
   source.

o  Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
   aout-encap.c.

o  Zillions of formatting and -Wconversion fixes.

1 files changed, 22 insertions, 19 deletions

diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index 86c5aaf3e9d..3e14781e6be 100644
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for linux flavored m68k a.out binaries.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -224,9 +224,9 @@ linux_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct linux_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct linux_link_hash_table);
 
-  ret = ((struct linux_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
+  ret = (struct linux_link_hash_table *) bfd_alloc (abfd, amt);
   if (ret == (struct linux_link_hash_table *) NULL)
     {
       bfd_set_error (bfd_error_no_memory);
@@ -409,7 +409,8 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
-	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL)))
+	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+	      false, false, NULL)))
 	return false;
     }
 
@@ -448,7 +449,7 @@ linux_tally_symbols (h, data)
       name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
       p = strrchr (name, '_');
       if (p != NULL)
-	alloc = (char *) bfd_malloc (strlen (name) + 1);
+	alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
 
       if (p == NULL || alloc == NULL)
 	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
@@ -591,7 +592,8 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info)
 			       ".linux-dynamic");
   if (s != NULL)
     {
-      s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
+      s->_raw_size = linux_hash_table (info)->fixup_count + 1;
+      s->_raw_size *= 8;
       s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
       if (s->contents == NULL)
 	{
@@ -637,7 +639,8 @@ linux_finish_dynamic_link (output_bfd, info)
 #endif
 
   fixup_table = s->contents;
-  bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table);
+  bfd_put_32 (output_bfd, (bfd_vma) linux_hash_table (info)->fixup_count,
+	      fixup_table);
   fixup_table += 4;
 
   /* Fill in fixup table.  */
@@ -666,14 +669,14 @@ linux_finish_dynamic_link (output_bfd, info)
 
       if (f->jump)
 	{
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
 	  fixup_table += 4;
 	  bfd_put_32 (output_bfd, f->value + 2, fixup_table);
 	  fixup_table += 4;
 	}
       else
 	{
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
 	  fixup_table += 4;
 	  bfd_put_32 (output_bfd, f->value, fixup_table);
 	  fixup_table += 4;
@@ -684,9 +687,9 @@ linux_finish_dynamic_link (output_bfd, info)
   if (linux_hash_table (info)->local_builtins != 0)
     {
       /* Special marker so we know to switch to the other type of fixup */
-      bfd_put_32 (output_bfd, 0, fixup_table);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
       fixup_table += 4;
-      bfd_put_32 (output_bfd, 0, fixup_table);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
       fixup_table += 4;
       ++fixups_written;
       for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
@@ -712,7 +715,7 @@ linux_finish_dynamic_link (output_bfd, info)
 		  new_addr, f->value);
 #endif
 
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
 	  fixup_table += 4;
 	  bfd_put_32 (output_bfd, f->value, fixup_table);
 	  fixup_table += 4;
@@ -725,9 +728,9 @@ linux_finish_dynamic_link (output_bfd, info)
       (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
       while (linux_hash_table (info)->fixup_count > fixups_written)
 	{
-	  bfd_put_32 (output_bfd, 0, fixup_table);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
 	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, 0, fixup_table);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
 	  fixup_table += 4;
 	  ++fixups_written;
 	}
@@ -749,16 +752,16 @@ linux_finish_dynamic_link (output_bfd, info)
       printf ("Builtin fixup table at %x\n", new_addr);
 #endif
 
-      bfd_put_32 (output_bfd, new_addr, fixup_table);
+      bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
     }
   else
-    bfd_put_32 (output_bfd, 0, fixup_table);
+    bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
 
-  if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0)
+  if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
+		SEEK_SET) != 0)
     return false;
 
-  if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd)
-      != s->_raw_size)
+  if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd) != s->_raw_size)
     return false;
 
   return true;