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

[deliverable/binutils-gdb.git] / bfd / nlm32-alpha.c

diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
index 2684ffbe6594e70713363fd18caadbef706b6601..0d3919e2d532c265dd9d94cb5c5940ce8c731991 100644 (file)
--- a/bfd/nlm32-alpha.c
+++ b/bfd/nlm32-alpha.c
@@ -61,18 +61,18 @@ nlm_alpha_backend_object_p (abfd)
      bfd *abfd;
 {
   struct nlm32_alpha_external_prefix_header s;
-  bfd_size_type size;
+  file_ptr size;
 
-  if (bfd_read ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
+  if (bfd_bread ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
     return false;
 
-  if (bfd_h_get_32 (abfd, s.magic) != NLM32_ALPHA_MAGIC)
+  if (H_GET_32 (abfd, s.magic) != NLM32_ALPHA_MAGIC)
     return false;
 
   /* FIXME: Should we check the format number?  */
 
   /* Skip to the end of the header.  */
-  size = bfd_h_get_32 (abfd, s.size);
+  size = H_GET_32 (abfd, s.size);
   if (bfd_seek (abfd, size, SEEK_SET) != 0)
     return false;
 
@@ -88,10 +88,10 @@ nlm_alpha_write_prefix (abfd)
   struct nlm32_alpha_external_prefix_header s;
 
   memset (&s, 0, sizeof s);
-  bfd_h_put_32 (abfd, (bfd_vma) NLM32_ALPHA_MAGIC, s.magic);
-  bfd_h_put_32 (abfd, (bfd_vma) 2, s.format);
-  bfd_h_put_32 (abfd, (bfd_vma) sizeof s, s.size);
-  if (bfd_write ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
+  H_PUT_32 (abfd, NLM32_ALPHA_MAGIC, s.magic);
+  H_PUT_32 (abfd, 2, s.format);
+  H_PUT_32 (abfd, sizeof s, s.size);
+  if (bfd_bwrite ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
     return false;
   return true;
 }
@@ -421,12 +421,12 @@ nlm_alpha_read_reloc (abfd, sym, secp, rel)
   asection *code_sec, *data_sec;
 
   /* Read the reloc from the file.  */
-  if (bfd_read (&ext, sizeof ext, 1, abfd) != sizeof ext)
+  if (bfd_bread (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
     return false;
 
   /* Swap in the reloc information.  */
-  r_vaddr = bfd_h_get_64 (abfd, (bfd_byte *) ext.r_vaddr);
-  r_symndx = bfd_h_get_32 (abfd, (bfd_byte *) ext.r_symndx);
+  r_vaddr = H_GET_64 (abfd, ext.r_vaddr);
+  r_symndx = H_GET_32 (abfd, ext.r_symndx);
 
   BFD_ASSERT (bfd_little_endian (abfd));
 
@@ -624,26 +624,28 @@ nlm_alpha_read_import (abfd, sym)
   bfd_byte temp[NLM_TARGET_LONG_SIZE]; /* temporary 32-bit value */
   unsigned char symlength;             /* length of symbol name */
   char *name;
+  bfd_size_type amt;
 
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
+  if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
     return false;
   sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
     return false;
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
     return false;
   name[symlength] = '\0';
   sym -> symbol.name = name;
   sym -> symbol.flags = 0;
   sym -> symbol.value = 0;
   sym -> symbol.section = bfd_und_section_ptr;
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
+  if (bfd_bread ((PTR) temp, (bfd_size_type) sizeof (temp), abfd)
+      != sizeof (temp))
     return false;
-  rcount = bfd_h_get_32 (abfd, temp);
-  nlm_relocs = ((struct nlm_relent *)
-               bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
+  rcount = H_GET_32 (abfd, temp);
+  amt = rcount * sizeof (struct nlm_relent);
+  nlm_relocs = (struct nlm_relent *) bfd_alloc (abfd, amt);
   if (!nlm_relocs)
     return false;
   sym -> relocs = nlm_relocs;
@@ -750,8 +752,8 @@ nlm_alpha_write_import (abfd, sec, rel)
     }
 
   /* Swap out the relocation fields.  */
-  bfd_h_put_64 (abfd, r_vaddr, (bfd_byte *) ext.r_vaddr);
-  bfd_h_put_32 (abfd, r_symndx, (bfd_byte *) ext.r_symndx);
+  H_PUT_64 (abfd, r_vaddr, ext.r_vaddr);
+  H_PUT_32 (abfd, r_symndx, ext.r_symndx);
 
   BFD_ASSERT (bfd_little_endian (abfd));
 
@@ -765,7 +767,7 @@ nlm_alpha_write_import (abfd, sec, rel)
                   & RELOC_BITS3_SIZE_LITTLE);
 
   /* Write out the relocation.  */
-  if (bfd_write (&ext, sizeof ext, 1, abfd) != sizeof ext)
+  if (bfd_bwrite (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
     return false;
 
   return true;
@@ -828,12 +830,13 @@ nlm_alpha_write_external (abfd, count, sym, relocs)
   arelent r;
 
   len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof (bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
     return false;
 
   bfd_put_32 (abfd, count + 2, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
     return false;
 
   /* The first two relocs for each external symbol are the .lita