s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

[deliverable/binutils-gdb.git] / bfd / archive64.c

diff --git a/bfd/archive64.c b/bfd/archive64.c
index ea94c6ae86e5bb91849ba92a5bef7bf44a494fcb..6267e68b3e218e15b2f5ac24fbeb316457e752fa 100644 (file)
--- a/bfd/archive64.c
+++ b/bfd/archive64.c
@@ -1,5 +1,5 @@
 /* MIPS-specific support for 64-bit ELF
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Ian Lance Taylor, Cygnus Support
    Linker support added by Mark Mitchell, CodeSourcery, LLC.
@@ -31,13 +31,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Irix 6 defines a 64bit archive map format, so that they can
    have archives more than 4 GB in size.  */
 
-boolean bfd_elf64_archive_slurp_armap PARAMS ((bfd *));
-boolean bfd_elf64_archive_write_armap
+bfd_boolean bfd_elf64_archive_slurp_armap PARAMS ((bfd *));
+bfd_boolean bfd_elf64_archive_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
 
 /* Read an Irix 6 armap.  */
 
-boolean
+bfd_boolean
 bfd_elf64_archive_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -58,12 +58,12 @@ bfd_elf64_archive_slurp_armap (abfd)
   arhdrpos = bfd_tell (abfd);
   i = bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd);
   if (i == 0)
-    return true;
+    return TRUE;
   if (i != 16)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   /* Archives with traditional armaps are still permitted.  */
   if (strncmp (nextname, "/               ", 16) == 0)
@@ -71,13 +71,13 @@ bfd_elf64_archive_slurp_armap (abfd)
 
   if (strncmp (nextname, "/SYM64/         ", 16) != 0)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
-    return false;
+    return FALSE;
   parsed_size = mapdata->parsed_size;
   bfd_release (abfd, (PTR) mapdata);
 
@@ -85,7 +85,7 @@ bfd_elf64_archive_slurp_armap (abfd)
     {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
 
   nsymz = bfd_getb64 (int_buf);
@@ -97,7 +97,7 @@ bfd_elf64_archive_slurp_armap (abfd)
   amt = carsym_size + stringsize + 1;
   ardata->symdefs = (carsym *) bfd_zalloc (abfd, amt);
   if (ardata->symdefs == NULL)
-    return false;
+    return FALSE;
   carsyms = ardata->symdefs;
   stringbase = ((char *) ardata->symdefs) + carsym_size;
 
@@ -127,23 +127,23 @@ bfd_elf64_archive_slurp_armap (abfd)
   /* Pad to an even boundary if you have to.  */
   ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
 
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
   bfd_release (abfd, raw_armap);
 
-  return true;
+  return TRUE;
 
 release_raw_armap:
   bfd_release (abfd, raw_armap);
 release_symdefs:
   bfd_release (abfd, ardata->symdefs);
-  return false;
+  return FALSE;
 }
 
 /* Write out an Irix 6 armap.  The Irix 6 tools are supposed to be
    able to handle ordinary ELF armaps, but at least on Irix 6.2 the
    linker crashes.  */
 
-boolean
+bfd_boolean
 bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
      bfd *arch;
      unsigned int elength;
@@ -189,11 +189,11 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
 
   if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), arch)
       != sizeof (struct ar_hdr))
-    return false;
+    return FALSE;
 
   bfd_putb64 ((bfd_vma) symbol_count, buf);
   if (bfd_bwrite (buf, (bfd_size_type) 8, arch) != 8)
-    return false;
+    return FALSE;
 
   /* Two passes, first write the file offsets for each symbol -
      remembering that each offset is on a two byte boundary.  */
@@ -212,7 +212,7 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
        {
          bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
          if (bfd_bwrite (buf, (bfd_size_type) 8, arch) != 8)
-           return false;
+           return FALSE;
          count++;
        }
       /* Add size of this archive entry */
@@ -229,7 +229,7 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
       size_t len = strlen (*map[count].name) + 1;
 
       if (bfd_bwrite (*map[count].name, (bfd_size_type) len, arch) != len)
-       return false;
+       return FALSE;
     }
 
   /* The spec says that this should be padded to an 8 byte boundary.
@@ -237,9 +237,9 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
   while (padding != 0)
     {
       if (bfd_bwrite ("", (bfd_size_type) 1, arch) != 1)
-       return false;
+       return FALSE;
       --padding;
     }
 
-  return true;
+  return TRUE;
 }