diff options
author | Alan Modra <amodra@gmail.com> | 2021-03-31 10:30:54 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2021-03-31 10:49:23 +1030 |
commit | 0a1b45a20eaa98d4d9026dc1fd17e79e741183af (patch) | |
tree | 059b2b296b4d60784a82cd6a52dae47dcac4d66a /bfd/archive.c | |
parent | faa7a26040c617a6d29f601998b99a1da882c672 (diff) | |
download | binutils-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.zip binutils-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.gz binutils-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.bz2 |
Use bool in bfd
* sysdep.h: POISON_BFD_BOOLEAN: Define.
* aix5ppc-core.c, * aout-cris.c, * aout-ns32k.c, * aout-target.h,
* aoutx.h, * arc-got.h, * archive.c, * archive64.c, * archures.c,
* bfd-in.h, * bfd.c, * bfdwin.c, * binary.c, * cache.c,
* coff-alpha.c, * coff-arm.c, * coff-arm.h, * coff-bfd.c,
* coff-bfd.h, * coff-go32.c, * coff-i386.c, * coff-ia64.c,
* coff-mcore.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic30.c, * coff-tic4x.c, * coff-tic54x.c,
* coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c,
* coffcode.h, * coffgen.c, * cofflink.c, * compress.c,
* corefile.c, * cpu-aarch64.c, * cpu-aarch64.h, * cpu-alpha.c,
* cpu-arc.c, * cpu-arm.c, * cpu-arm.h, * cpu-avr.c, * cpu-bfin.c,
* cpu-bpf.c, * cpu-cr16.c, * cpu-cris.c, * cpu-crx.c,
* cpu-csky.c, * cpu-d10v.c, * cpu-d30v.c, * cpu-dlx.c,
* cpu-epiphany.c, * cpu-fr30.c, * cpu-frv.c, * cpu-ft32.c,
* cpu-h8300.c, * cpu-hppa.c, * cpu-i386.c, * cpu-ia64.c,
* cpu-iamcu.c, * cpu-ip2k.c, * cpu-iq2000.c, * cpu-k1om.c,
* cpu-l1om.c, * cpu-lm32.c, * cpu-m10200.c, * cpu-m10300.c,
* cpu-m32c.c, * cpu-m32r.c, * cpu-m68hc11.c, * cpu-m68hc12.c,
* cpu-m68k.c, * cpu-m9s12x.c, * cpu-m9s12xg.c, * cpu-mcore.c,
* cpu-mep.c, * cpu-metag.c, * cpu-microblaze.c, * cpu-mips.c,
* cpu-mmix.c, * cpu-moxie.c, * cpu-msp430.c, * cpu-mt.c,
* cpu-nds32.c, * cpu-nfp.c, * cpu-nios2.c, * cpu-ns32k.c,
* cpu-or1k.c, * cpu-pdp11.c, * cpu-pj.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-riscv.c, * cpu-rl78.c, * cpu-rs6000.c,
* cpu-rx.c, * cpu-s12z.c, * cpu-s390.c, * cpu-score.c,
* cpu-sh.c, * cpu-sparc.c, * cpu-spu.c, * cpu-tic30.c,
* cpu-tic4x.c, * cpu-tic54x.c, * cpu-tic6x.c, * cpu-tilegx.c,
* cpu-tilepro.c, * cpu-v850.c, * cpu-v850_rh850.c, * cpu-vax.c,
* cpu-visium.c, * cpu-wasm32.c, * cpu-xc16x.c, * cpu-xgate.c,
* cpu-xstormy16.c, * cpu-xtensa.c, * cpu-z80.c, * cpu-z8k.c,
* dwarf1.c, * dwarf2.c, * ecoff-bfd.h, * ecoff.c, * ecofflink.c,
* elf-attrs.c, * elf-bfd.h, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-nacl.c,
* elf-nacl.h, * elf-properties.c, * elf-s390-common.c,
* elf-s390.h, * elf-strtab.c, * elf-vxworks.c, * elf-vxworks.h,
* elf.c, * elf32-am33lin.c, * elf32-arc.c, * elf32-arm.c,
* elf32-arm.h, * elf32-avr.c, * elf32-avr.h, * elf32-bfin.c,
* elf32-bfin.h, * elf32-cr16.c, * elf32-cr16.h, * elf32-cris.c,
* elf32-crx.c, * elf32-csky.c, * elf32-csky.h, * elf32-d10v.c,
* elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-gen.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-hppa.h, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68hc1x.c, * elf32-m68hc1x.h, * elf32-m68k.c,
* elf32-m68k.h, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-metag.h, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-nios2.h, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s12z.c, * elf32-s390.c, * elf32-score.c,
* elf32-score.h, * elf32-score7.c, * elf32-sh-relocs.h,
* elf32-sh.c, * elf32-sparc.c, * elf32-spu.c, * elf32-spu.h,
* elf32-tic6x.c, * elf32-tic6x.h, * elf32-tilegx.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-v850.h,
* elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c,
* elf32-xtensa.c, * elf32-z80.c, * elf64-alpha.c, * elf64-bpf.c,
* elf64-gen.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mips.c, * elf64-mmix.c, * elf64-nfp.c, * elf64-ppc.c,
* elf64-ppc.h, * elf64-s390.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-x86-64.c, * elfcode.h,
* elfcore.h, * elflink.c, * elfn32-mips.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-aarch64.c,
* elfxx-aarch64.h, * elfxx-ia64.c, * elfxx-ia64.h,
* elfxx-mips.c, * elfxx-mips.h, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * elfxx-target.h,
* elfxx-tilegx.c, * elfxx-tilegx.h, * elfxx-x86.c, * elfxx-x86.h,
* format.c, * genlink.h, * hash.c, * i386aout.c, * i386lynx.c,
* i386msdos.c, * ihex.c, * libaout.h, * libbfd-in.h,
* libbfd.c, * libcoff-in.h, * libecoff.h, * libpei.h,
* libxcoff.h, * linker.c, * mach-o-aarch64.c, * mach-o-arm.c,
* mach-o-i386.c, * mach-o-x86-64.c, * mach-o.c, * mach-o.h,
* merge.c, * mmo.c, * netbsd.h, * opncls.c, * pc532-mach.c,
* pdp11.c, * pe-arm.c, * pe-i386.c, * pe-mcore.c, * pe-sh.c,
* pe-x86_64.c, * peXXigen.c, * pef.c, * pei-arm.c, * pei-i386.c,
* pei-ia64.c, * pei-mcore.c, * pei-sh.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * plugin.h, * ppcboot.c, * reloc.c,
* reloc16.c, * rs6000-core.c, * section.c, * simple.c, * som.c,
* som.h, * srec.c, * stabs.c, * syms.c, * targets.c, * tekhex.c,
* verilog.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c, * vms.h,
* wasm-module.c, * xcofflink.c, * xcofflink.h, * xsym.c,
* xsym.h: Replace bfd_boolean with bool, FALSE with false, and
TRUE with true throughout.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
Diffstat (limited to 'bfd/archive.c')
-rw-r--r-- | bfd/archive.c | 250 |
1 files changed, 125 insertions, 125 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index 2a9ca56..2f3a1d4 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -186,7 +186,7 @@ _bfd_ar_spacepad (char *p, size_t n, const char *fmt, long val) memcpy (p, buf, n); } -bfd_boolean +bool _bfd_ar_sizepad (char *p, size_t n, bfd_size_type size) { char buf[21]; @@ -197,7 +197,7 @@ _bfd_ar_sizepad (char *p, size_t n, bfd_size_type size) if (len > n) { bfd_set_error (bfd_error_file_too_big); - return FALSE; + return false; } if (len < n) { @@ -206,17 +206,17 @@ _bfd_ar_sizepad (char *p, size_t n, bfd_size_type size) } else memcpy (p, buf, n); - return TRUE; + return true; } -bfd_boolean +bool _bfd_generic_mkarchive (bfd *abfd) { size_t amt = sizeof (struct artdata); abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc (abfd, amt); if (bfd_ardata (abfd) == NULL) - return FALSE; + return false; /* Already cleared by bfd_zalloc above. bfd_ardata (abfd)->cache = NULL; @@ -226,7 +226,7 @@ _bfd_generic_mkarchive (bfd *abfd) bfd_ardata (abfd)->extended_names_size = 0; bfd_ardata (abfd)->tdata = NULL; */ - return TRUE; + return true; } /* @@ -284,18 +284,18 @@ FUNCTION bfd_set_archive_head SYNOPSIS - bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head); + bool bfd_set_archive_head (bfd *output, bfd *new_head); DESCRIPTION Set the head of the chain of BFDs contained in the archive @var{output} to @var{new_head}. */ -bfd_boolean +bool bfd_set_archive_head (bfd *output_archive, bfd *new_head) { output_archive->archive_head = new_head; - return TRUE; + return true; } bfd * @@ -349,7 +349,7 @@ _bfd_calloc_wrapper (size_t a, size_t b) /* Kind of stupid to call cons for each one, but we don't do too many. */ -bfd_boolean +bool _bfd_add_bfd_to_archive_cache (bfd *arch_bfd, file_ptr filepos, bfd *new_elt) { struct ar_cache *cache; @@ -361,7 +361,7 @@ _bfd_add_bfd_to_archive_cache (bfd *arch_bfd, file_ptr filepos, bfd *new_elt) hash_table = htab_create_alloc (16, hash_file_ptr, eq_file_ptr, NULL, _bfd_calloc_wrapper, free); if (hash_table == NULL) - return FALSE; + return false; bfd_ardata (arch_bfd)->cache = hash_table; } @@ -375,7 +375,7 @@ _bfd_add_bfd_to_archive_cache (bfd *arch_bfd, file_ptr filepos, bfd *new_elt) arch_eltdata (new_elt)->parent_cache = hash_table; arch_eltdata (new_elt)->key = filepos; - return TRUE; + return true; } static bfd * @@ -924,7 +924,7 @@ bfd_generic_archive_p (bfd *abfd) abfd->no_element_cache = save; if (first != NULL) { - first->target_defaulted = FALSE; + first->target_defaulted = false; if (bfd_check_format (first, bfd_object) && first->xvec != abfd->xvec) bfd_set_error (bfd_error_wrong_object_format); @@ -955,7 +955,7 @@ bfd_generic_archive_p (bfd *abfd) /* Read a BSD-style archive symbol table. Returns FALSE on error, TRUE otherwise. */ -static bfd_boolean +static bool do_slurp_bsd_armap (bfd *abfd) { struct areltdata *mapdata; @@ -969,7 +969,7 @@ do_slurp_bsd_armap (bfd *abfd) mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd); if (mapdata == NULL) - return FALSE; + return false; parsed_size = mapdata->parsed_size; free (mapdata); /* PR 17512: file: 883ff754. */ @@ -977,12 +977,12 @@ do_slurp_bsd_armap (bfd *abfd) if (parsed_size < BSD_SYMDEF_COUNT_SIZE + BSD_STRING_COUNT_SIZE) { bfd_set_error (bfd_error_malformed_archive); - return FALSE; + return false; } raw_armap = (bfd_byte *) _bfd_alloc_and_read (abfd, parsed_size, parsed_size); if (raw_armap == NULL) - return FALSE; + return false; parsed_size -= BSD_SYMDEF_COUNT_SIZE + BSD_STRING_COUNT_SIZE; amt = H_GET_32 (abfd, raw_armap); @@ -1028,20 +1028,20 @@ do_slurp_bsd_armap (bfd *abfd) /* FIXME, we should provide some way to free raw_ardata when we are done using the strings from it. For now, it seems to be allocated on an objalloc anyway... */ - abfd->has_armap = TRUE; - return TRUE; + abfd->has_armap = true; + return true; release_armap: ardata->symdef_count = 0; ardata->symdefs = NULL; bfd_release (abfd, raw_armap); - return FALSE; + return false; } /* Read a COFF archive symbol table. Returns FALSE on error, TRUE otherwise. */ -static bfd_boolean +static bool do_slurp_coff_armap (bfd *abfd) { struct areltdata *mapdata; @@ -1060,12 +1060,12 @@ do_slurp_coff_armap (bfd *abfd) mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd); if (mapdata == NULL) - return FALSE; + return false; parsed_size = mapdata->parsed_size; free (mapdata); if (bfd_bread (int_buf, 4, abfd) != 4) - return FALSE; + return false; /* It seems that all numeric information in a coff archive is always in big endian format, no matter the host or target. */ @@ -1078,7 +1078,7 @@ do_slurp_coff_armap (bfd *abfd) if (_bfd_mul_overflow (nsymz, sizeof (carsym), &carsym_size)) { bfd_set_error (bfd_error_no_memory); - return FALSE; + return false; } filesize = bfd_get_file_size (abfd); @@ -1088,7 +1088,7 @@ do_slurp_coff_armap (bfd *abfd) || parsed_size - 4 < ptrsize) { bfd_set_error (bfd_error_malformed_archive); - return FALSE; + return false; } stringsize = parsed_size - ptrsize - 4; @@ -1096,13 +1096,13 @@ do_slurp_coff_armap (bfd *abfd) if (carsym_size + stringsize + 1 <= carsym_size) { bfd_set_error (bfd_error_no_memory); - return FALSE; + return false; } /* Allocate and read in the raw offsets. */ raw_armap = (int *) _bfd_malloc_and_read (abfd, ptrsize, ptrsize); if (raw_armap == NULL) - return FALSE; + return false; ardata->symdefs = (struct carsym *) bfd_alloc (abfd, carsym_size + stringsize + 1); @@ -1135,7 +1135,7 @@ do_slurp_coff_armap (bfd *abfd) if (bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET) != 0) goto release_symdefs; - abfd->has_armap = TRUE; + abfd->has_armap = true; free (raw_armap); /* Check for a second archive header (as used by PE). */ @@ -1149,31 +1149,31 @@ do_slurp_coff_armap (bfd *abfd) free (tmp); } - return TRUE; + return true; release_symdefs: bfd_release (abfd, (ardata)->symdefs); free_armap: free (raw_armap); - return FALSE; + return false; } /* This routine can handle either coff-style or bsd-style armaps (archive symbol table). Returns FALSE on error, TRUE otherwise */ -bfd_boolean +bool bfd_slurp_armap (bfd *abfd) { char nextname[17]; int 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; if (startswith (nextname, "__.SYMDEF ") || startswith (nextname, "__.SYMDEF/ ")) /* Old Linux archives. */ @@ -1187,7 +1187,7 @@ bfd_slurp_armap (bfd *abfd) return _bfd_archive_64_bit_slurp_armap (abfd); #else bfd_set_error (bfd_error_wrong_format); - return FALSE; + return false; #endif } else if (startswith (nextname, "#1/20 ")) @@ -1199,20 +1199,20 @@ bfd_slurp_armap (bfd *abfd) char extname[21]; if (bfd_bread (&hdr, sizeof (hdr), abfd) != sizeof (hdr)) - return FALSE; + return false; /* Read the extended name. We know its length. */ if (bfd_bread (extname, 20, abfd) != 20) - return FALSE; + return false; if (bfd_seek (abfd, -(file_ptr) (sizeof (hdr) + 20), SEEK_CUR) != 0) - return FALSE; + return false; extname[20] = 0; if (startswith (extname, "__.SYMDEF SORTED") || startswith (extname, "__.SYMDEF")) return do_slurp_bsd_armap (abfd); } - abfd->has_armap = FALSE; - return TRUE; + abfd->has_armap = false; + return true; } /** Extended name table. @@ -1227,7 +1227,7 @@ bfd_slurp_armap (bfd *abfd) /* Returns FALSE on error, TRUE otherwise. */ -bfd_boolean +bool _bfd_slurp_extended_name_table (bfd *abfd) { char nextname[17]; @@ -1235,7 +1235,7 @@ _bfd_slurp_extended_name_table (bfd *abfd) /* FIXME: Formatting sucks here, and in case of failure of BFD_READ, we probably don't want to return TRUE. */ if (bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET) != 0) - return FALSE; + return false; if (bfd_bread (nextname, 16, abfd) == 16) { @@ -1244,19 +1244,19 @@ _bfd_slurp_extended_name_table (bfd *abfd) ufile_ptr filesize; if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0) - return FALSE; + return false; if (! startswith (nextname, "ARFILENAMES/ ") && ! startswith (nextname, "// ")) { bfd_ardata (abfd)->extended_names = NULL; bfd_ardata (abfd)->extended_names_size = 0; - return TRUE; + return true; } namedata = (struct areltdata *) _bfd_read_ar_hdr (abfd); if (namedata == NULL) - return FALSE; + return false; filesize = bfd_get_file_size (abfd); amt = namedata->parsed_size; @@ -1274,7 +1274,7 @@ _bfd_slurp_extended_name_table (bfd *abfd) free (namedata); bfd_ardata (abfd)->extended_names = NULL; bfd_ardata (abfd)->extended_names_size = 0; - return FALSE; + return false; } if (bfd_bread (bfd_ardata (abfd)->extended_names, amt, abfd) != amt) @@ -1314,7 +1314,7 @@ _bfd_slurp_extended_name_table (bfd *abfd) free (namedata); } - return TRUE; + return true; } #ifdef VMS @@ -1497,35 +1497,35 @@ adjust_relative_path (const char * path, const char * ref_path) /* Build a BFD style extended name table. */ -bfd_boolean +bool _bfd_archive_bsd_construct_extended_name_table (bfd *abfd, char **tabloc, bfd_size_type *tablen, const char **name) { *name = "ARFILENAMES/"; - return _bfd_construct_extended_name_table (abfd, FALSE, tabloc, tablen); + return _bfd_construct_extended_name_table (abfd, false, tabloc, tablen); } /* Build an SVR4 style extended name table. */ -bfd_boolean +bool _bfd_archive_coff_construct_extended_name_table (bfd *abfd, char **tabloc, bfd_size_type *tablen, const char **name) { *name = "//"; - return _bfd_construct_extended_name_table (abfd, TRUE, tabloc, tablen); + return _bfd_construct_extended_name_table (abfd, true, tabloc, tablen); } -bfd_boolean +bool _bfd_noarchive_construct_extended_name_table (bfd *abfd ATTRIBUTE_UNUSED, char **tabloc ATTRIBUTE_UNUSED, bfd_size_type *len ATTRIBUTE_UNUSED, const char **name ATTRIBUTE_UNUSED) { - return TRUE; + return true; } /* Follows archive_head and produces an extended name table if @@ -1536,9 +1536,9 @@ _bfd_noarchive_construct_extended_name_table (bfd *abfd ATTRIBUTE_UNUSED, something went wrong. A successful return may still involve a zero-length tablen! */ -bfd_boolean +bool _bfd_construct_extended_name_table (bfd *abfd, - bfd_boolean trailing_slash, + bool trailing_slash, char **tabloc, bfd_size_type *tablen) { @@ -1598,7 +1598,7 @@ _bfd_construct_extended_name_table (bfd *abfd, normal = normalize (abfd, bfd_get_filename (current)); if (normal == NULL) - return FALSE; + return false; thislen = strlen (normal); @@ -1634,11 +1634,11 @@ _bfd_construct_extended_name_table (bfd *abfd, } if (total_namelen == 0) - return TRUE; + return true; *tabloc = (char *) bfd_alloc (abfd, total_namelen); if (*tabloc == NULL) - return FALSE; + return false; *tablen = total_namelen; strptr = *tabloc; @@ -1679,7 +1679,7 @@ _bfd_construct_extended_name_table (bfd *abfd, { normal = normalize (abfd, filename); if (normal == NULL) - return FALSE; + return false; } thislen = strlen (normal); @@ -1716,13 +1716,13 @@ _bfd_construct_extended_name_table (bfd *abfd, } } - return TRUE; + return true; } /* Do not construct an extended name table but transforms name field into its extended form. */ -bfd_boolean +bool _bfd_archive_bsd44_construct_extended_name_table (bfd *abfd, char **tabloc, bfd_size_type *tablen, @@ -1744,7 +1744,7 @@ _bfd_archive_bsd44_construct_extended_name_table (bfd *abfd, unsigned int len; if (normal == NULL) - return FALSE; + return false; for (len = 0; normal[len]; len++) if (normal[len] == ' ') @@ -1760,24 +1760,24 @@ _bfd_archive_bsd44_construct_extended_name_table (bfd *abfd, } } - return TRUE; + return true; } /* Write an archive header. */ -bfd_boolean +bool _bfd_generic_write_ar_hdr (bfd *archive, bfd *abfd) { struct ar_hdr *hdr = arch_hdr (abfd); if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr)) - return FALSE; - return TRUE; + return false; + return true; } /* Write an archive header using BSD4.4 convention. */ -bfd_boolean +bool _bfd_bsd44_write_ar_hdr (bfd *archive, bfd *abfd) { struct ar_hdr *hdr = arch_hdr (abfd); @@ -1793,13 +1793,13 @@ _bfd_bsd44_write_ar_hdr (bfd *archive, bfd *abfd) if (!_bfd_ar_sizepad (hdr->ar_size, sizeof (hdr->ar_size), arch_eltdata (abfd)->parsed_size + padded_len)) - return FALSE; + return false; if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr)) - return FALSE; + return false; if (bfd_bwrite (fullname, len, archive) != len) - return FALSE; + return false; if (len & 3) { @@ -1807,18 +1807,18 @@ _bfd_bsd44_write_ar_hdr (bfd *archive, bfd *abfd) len = 4 - (len & 3); if (bfd_bwrite (pad, len, archive) != len) - return FALSE; + return false; } } else { if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr)) - return FALSE; + return false; } - return TRUE; + return true; } -bfd_boolean +bool _bfd_noarchive_write_ar_hdr (bfd *archive, bfd *abfd ATTRIBUTE_UNUSED) { return _bfd_bool_bfd_false_error (archive); @@ -2095,16 +2095,16 @@ _bfd_noarchive_truncate_arname (bfd *abfd ATTRIBUTE_UNUSED, /* The BFD is open for write and has its format set to bfd_archive. */ -bfd_boolean +bool _bfd_write_archive_contents (bfd *arch) { bfd *current; char *etable = NULL; bfd_size_type elength = 0; const char *ename = NULL; - bfd_boolean makemap = bfd_has_map (arch); + bool makemap = bfd_has_map (arch); /* If no .o's, don't bother to make a map. */ - bfd_boolean hasobjects = FALSE; + bool hasobjects = false; bfd_size_type wrote; int tries; char *armag; @@ -2143,27 +2143,27 @@ _bfd_write_archive_contents (bfd *arch) if (makemap && ! hasobjects) { /* Don't bother if we won't make a map! */ if ((bfd_check_format (current, bfd_object))) - hasobjects = TRUE; + hasobjects = true; } } if (!BFD_SEND (arch, _bfd_construct_extended_name_table, (arch, &etable, &elength, &ename))) - return FALSE; + return false; if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0) - return FALSE; + return false; armag = ARMAG; if (bfd_is_thin_archive (arch)) armag = ARMAGT; wrote = bfd_bwrite (armag, SARMAG, arch); if (wrote != SARMAG) - return FALSE; + return false; if (makemap && hasobjects) { if (! _bfd_compute_and_write_armap (arch, (unsigned int) elength)) - return FALSE; + return false; } if (elength != 0) @@ -2175,16 +2175,16 @@ _bfd_write_archive_contents (bfd *arch) /* Round size up to even number in archive header. */ if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), (elength + 1) & ~(bfd_size_type) 1)) - return FALSE; + return false; memcpy (hdr.ar_fmag, ARFMAG, 2); if ((bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch) != sizeof (struct ar_hdr)) || bfd_bwrite (etable, elength, arch) != elength) - return FALSE; + return false; if ((elength % 2) == 1) { if (bfd_bwrite (&ARFMAG[1], 1, arch) != 1) - return FALSE; + return false; } } @@ -2197,7 +2197,7 @@ _bfd_write_archive_contents (bfd *arch) /* Write ar header. */ if (!_bfd_write_ar_hdr (arch, current)) - return FALSE; + return false; if (bfd_is_thin_archive (arch)) continue; if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0) @@ -2213,14 +2213,14 @@ _bfd_write_archive_contents (bfd *arch) if (bfd_bread (buffer, amt, current) != amt) goto input_err; if (bfd_bwrite (buffer, amt, arch) != amt) - return FALSE; + return false; remaining -= amt; } if ((arelt_size (current) % 2) == 1) { if (bfd_bwrite (&ARFMAG[1], 1, arch) != 1) - return FALSE; + return false; } } @@ -2243,16 +2243,16 @@ _bfd_write_archive_contents (bfd *arch) while (++tries < 6); } - return TRUE; + return true; input_err: bfd_set_input_error (current, bfd_get_error ()); - return FALSE; + return false; } /* Note that the namidx for the first symbol is 0. */ -bfd_boolean +bool _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) { char *first_name = NULL; @@ -2264,9 +2264,9 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) int stridx = 0; asymbol **syms = NULL; long syms_max = 0; - bfd_boolean ret; + bool ret; size_t amt; - static bfd_boolean report_plugin_err = TRUE; + static bool report_plugin_err = true; /* Dunno if this is the best place for this info... */ if (elength != 0) @@ -2303,7 +2303,7 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) if (current->lto_slim_object && report_plugin_err) { - report_plugin_err = FALSE; + report_plugin_err = false; _bfd_error_handler (_("%pB: plugin needed to handle lto object"), current); @@ -2363,7 +2363,7 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) "__gnu_lto_slim") == 0 && report_plugin_err) { - report_plugin_err = FALSE; + report_plugin_err = false; _bfd_error_handler (_("%pB: plugin needed to handle lto object"), current); @@ -2411,10 +2411,10 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) if (first_name != NULL) bfd_release (arch, first_name); - return FALSE; + return false; } -bfd_boolean +bool _bfd_bsd_write_armap (bfd *arch, unsigned int elength, struct orl *map, @@ -2498,14 +2498,14 @@ _bfd_bsd_write_armap (bfd *arch, _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", uid); _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", gid); if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize)) - return FALSE; + return false; memcpy (hdr.ar_fmag, ARFMAG, 2); if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch) != sizeof (struct ar_hdr)) - return FALSE; + return false; H_PUT_32 (arch, ranlibsize, temp); if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp)) - return FALSE; + return false; firstreal = first; current = arch->archive_head; @@ -2536,7 +2536,7 @@ _bfd_bsd_write_armap (bfd *arch, if (firstreal != (file_ptr) offset) { bfd_set_error (bfd_error_file_truncated); - return FALSE; + return false; } last_elt = current; @@ -2544,19 +2544,19 @@ _bfd_bsd_write_armap (bfd *arch, H_PUT_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE); if (bfd_bwrite (buf, BSD_SYMDEF_SIZE, arch) != BSD_SYMDEF_SIZE) - return FALSE; + return false; } /* Now write the strings themselves. */ H_PUT_32 (arch, stringsize, temp); if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp)) - return FALSE; + return false; for (count = 0; count < orl_count; count++) { size_t len = strlen (*map[count].name) + 1; if (bfd_bwrite (*map[count].name, len, arch) != len) - return FALSE; + return false; } /* The spec sez this should be a newline. But in order to be @@ -2564,10 +2564,10 @@ _bfd_bsd_write_armap (bfd *arch, if (padit) { if (bfd_bwrite ("", 1, arch) != 1) - return FALSE; + return false; } - return TRUE; + return true; } /* At the end of archive file handling, update the timestamp in the @@ -2576,7 +2576,7 @@ _bfd_bsd_write_armap (bfd *arch, Return TRUE if the timestamp was OK, or an unusual problem happened. Return FALSE if we updated the timestamp. */ -bfd_boolean +bool _bfd_archive_bsd_update_armap_timestamp (bfd *arch) { struct stat archstat; @@ -2584,7 +2584,7 @@ _bfd_archive_bsd_update_armap_timestamp (bfd *arch) /* If creating deterministic archives, just leave the timestamp as-is. */ if ((arch->flags & BFD_DETERMINISTIC_OUTPUT) != 0) - return TRUE; + return true; /* Flush writes, get last-write timestamp from file, and compare it to the timestamp IN the file. */ @@ -2594,11 +2594,11 @@ _bfd_archive_bsd_update_armap_timestamp (bfd *arch) bfd_perror (_("Reading archive file mod timestamp")); /* Can't read mod time for some reason. */ - return TRUE; + return true; } if (((long) archstat.st_mtime) <= bfd_ardata (arch)->armap_timestamp) /* OK by the linker's rules. */ - return TRUE; + return true; /* Update the timestamp. */ bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET; @@ -2618,11 +2618,11 @@ _bfd_archive_bsd_update_armap_timestamp (bfd *arch) bfd_perror (_("Writing updated armap timestamp")); /* Some error while writing. */ - return TRUE; + return true; } /* We updated the timestamp successfully. */ - return FALSE; + return false; } /* A coff armap looks like : @@ -2638,7 +2638,7 @@ _bfd_archive_bsd_update_armap_timestamp (bfd *arch) symbol name n-1 */ -bfd_boolean +bool _bfd_coff_write_armap (bfd *arch, unsigned int elength, struct orl *map, @@ -2701,7 +2701,7 @@ _bfd_coff_write_armap (bfd *arch, memset (&hdr, ' ', sizeof (struct ar_hdr)); hdr.ar_name[0] = '/'; 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", ((arch->flags & BFD_DETERMINISTIC_OUTPUT) == 0 ? time (NULL) : 0)); @@ -2714,10 +2714,10 @@ _bfd_coff_write_armap (bfd *arch, /* Write the ar header for this item and the number of symbols. */ if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch) != sizeof (struct ar_hdr)) - return FALSE; + return false; if (!bfd_write_bigendian_4byte_int (arch, symbol_count)) - return FALSE; + return false; /* Two passes, first write the file offsets for each symbol - remembering that each offset is on a two byte boundary. */ @@ -2741,10 +2741,10 @@ _bfd_coff_write_armap (bfd *arch, if (archive_member_file_ptr != (file_ptr) offset) { bfd_set_error (bfd_error_file_truncated); - return FALSE; + return false; } if (!bfd_write_bigendian_4byte_int (arch, offset)) - return FALSE; + return false; count++; } archive_member_file_ptr += sizeof (struct ar_hdr); @@ -2764,7 +2764,7 @@ _bfd_coff_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 sez this should be a newline. But in order to be @@ -2772,13 +2772,13 @@ _bfd_coff_write_armap (bfd *arch, if (padit) { if (bfd_bwrite ("", 1, arch) != 1) - return FALSE; + return false; } - return TRUE; + return true; } -bfd_boolean +bool _bfd_noarchive_write_armap (bfd *arch ATTRIBUTE_UNUSED, unsigned int elength ATTRIBUTE_UNUSED, @@ -2786,7 +2786,7 @@ _bfd_noarchive_write_armap unsigned int orl_count ATTRIBUTE_UNUSED, int stridx ATTRIBUTE_UNUSED) { - return TRUE; + return true; } static int @@ -2822,7 +2822,7 @@ _bfd_unlink_from_archive_parent (bfd *abfd) } } -bfd_boolean +bool _bfd_archive_close_and_cleanup (bfd *abfd) { if (bfd_read_p (abfd) && abfd->format == bfd_archive) @@ -2852,5 +2852,5 @@ _bfd_archive_close_and_cleanup (bfd *abfd) if (abfd->is_linker_output) (*abfd->link.hash->hash_table_free) (abfd); - return TRUE; + return true; } |