aboutsummaryrefslogtreecommitdiff
path: root/bfd/archive64.c
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/archive64.c')
-rw-r--r--bfd/archive64.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/bfd/archive64.c b/bfd/archive64.c
index 6d76b4d..3962b74 100644
--- a/bfd/archive64.c
+++ b/bfd/archive64.c
@@ -34,7 +34,7 @@
/* Read an Irix 6 armap. */
-bfd_boolean
+bool
_bfd_archive_64_bit_slurp_armap (bfd *abfd)
{
struct artdata *ardata = bfd_ardata (abfd);
@@ -54,12 +54,12 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
/* Get the name of the first element. */
i = bfd_bread (nextname, 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 (startswith (nextname, "/ "))
@@ -67,13 +67,13 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
if (! startswith (nextname, "/SYM64/ "))
{
- abfd->has_armap = FALSE;
- return TRUE;
+ abfd->has_armap = false;
+ return true;
}
mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
if (mapdata == NULL)
- return FALSE;
+ return false;
parsed_size = mapdata->parsed_size;
free (mapdata);
@@ -81,14 +81,14 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
if (filesize != 0 && parsed_size > filesize)
{
bfd_set_error (bfd_error_malformed_archive);
- return FALSE;
+ return false;
}
if (bfd_bread (int_buf, 8, abfd) != 8)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_malformed_archive);
- return FALSE;
+ return false;
}
nsymz = bfd_getb64 (int_buf);
@@ -108,11 +108,11 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
|| amt <= stringsize)
{
bfd_set_error (bfd_error_malformed_archive);
- return FALSE;
+ return false;
}
ardata->symdefs = (struct carsym *) bfd_alloc (abfd, amt);
if (ardata->symdefs == NULL)
- return FALSE;
+ return false;
carsyms = ardata->symdefs;
stringbase = ((char *) ardata->symdefs) + carsym_size;
@@ -142,21 +142,21 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
/* Pad to an even boundary if you have to. */
ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
- abfd->has_armap = TRUE;
+ abfd->has_armap = true;
bfd_release (abfd, raw_armap);
- return TRUE;
+ return true;
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. */
-bfd_boolean
+bool
_bfd_archive_64_bit_write_armap (bfd *arch,
unsigned int elength,
struct orl *map,
@@ -185,7 +185,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
memset (&hdr, ' ', sizeof (struct ar_hdr));
memcpy (hdr.ar_name, "/SYM64/", strlen ("/SYM64/"));
if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize))
- return FALSE;
+ return false;
_bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
time (NULL));
/* This, at least, is what Intel coff sets the values to.: */
@@ -198,11 +198,11 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
!= sizeof (struct ar_hdr))
- return FALSE;
+ return false;
bfd_putb64 ((bfd_vma) symbol_count, buf);
if (bfd_bwrite (buf, 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. */
@@ -223,7 +223,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
{
bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
if (bfd_bwrite (buf, 8, arch) != 8)
- return FALSE;
+ return false;
}
/* Add size of this archive entry */
@@ -240,7 +240,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
size_t len = strlen (*map[count].name) + 1;
if (bfd_bwrite (*map[count].name, len, arch) != len)
- return FALSE;
+ return false;
}
/* The spec says that this should be padded to an 8 byte boundary.
@@ -248,9 +248,9 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
while (padding != 0)
{
if (bfd_bwrite ("", 1, arch) != 1)
- return FALSE;
+ return false;
--padding;
}
- return TRUE;
+ return true;
}