From 0a1b45a20eaa98d4d9026dc1fd17e79e741183af Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 31 Mar 2021 10:30:54 +1030 Subject: 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. --- bfd/peXXigen.c | 284 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 142 insertions(+), 142 deletions(-) (limited to 'bfd/peXXigen.c') diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 14daf4f..e7f1311 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -218,7 +218,7 @@ _bfd_XXi_swap_sym_in (bfd * abfd, void * ext1, void * in1) #endif } -static bfd_boolean +static bool abs_finder (bfd * abfd ATTRIBUTE_UNUSED, asection * sec, void * data) { bfd_vma abs_val = * (bfd_vma *) data; @@ -1237,7 +1237,7 @@ static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] = N_("Reserved") }; -static bfd_boolean +static bool pe_print_idata (bfd * abfd, void * vfile) { FILE *file = (FILE *) vfile; @@ -1261,12 +1261,12 @@ pe_print_idata (bfd * abfd, void * vfile) /* Maybe the extra header isn't there. Look for the section. */ section = bfd_get_section_by_name (abfd, ".idata"); if (section == NULL) - return TRUE; + return true; addr = section->vma; datasize = section->size; if (datasize == 0) - return TRUE; + return true; } else { @@ -1282,14 +1282,14 @@ pe_print_idata (bfd * abfd, void * vfile) { fprintf (file, _("\nThere is an import table, but the section containing it could not be found\n")); - return TRUE; + return true; } else if (!(section->flags & SEC_HAS_CONTENTS)) { fprintf (file, _("\nThere is an import table in %s, but that section has no contents\n"), section->name); - return TRUE; + return true; } } @@ -1311,7 +1311,7 @@ pe_print_idata (bfd * abfd, void * vfile) if (!bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } adj = section->vma - extra->ImageBase; @@ -1510,10 +1510,10 @@ pe_print_idata (bfd * abfd, void * vfile) free (data); - return TRUE; + return true; } -static bfd_boolean +static bool pe_print_edata (bfd * abfd, void * vfile) { FILE *file = (FILE *) vfile; @@ -1550,13 +1550,13 @@ pe_print_edata (bfd * abfd, void * vfile) /* Maybe the extra header isn't there. Look for the section. */ section = bfd_get_section_by_name (abfd, ".edata"); if (section == NULL) - return TRUE; + return true; addr = section->vma; dataoff = 0; datasize = section->size; if (datasize == 0) - return TRUE; + return true; } else { @@ -1570,14 +1570,14 @@ pe_print_edata (bfd * abfd, void * vfile) { fprintf (file, _("\nThere is an export table, but the section containing it could not be found\n")); - return TRUE; + return true; } else if (!(section->flags & SEC_HAS_CONTENTS)) { fprintf (file, _("\nThere is an export table in %s, but that section has no contents\n"), section->name); - return TRUE; + return true; } dataoff = addr - section->vma; @@ -1588,7 +1588,7 @@ pe_print_edata (bfd * abfd, void * vfile) fprintf (file, _("\nThere is an export table in %s, but it does not fit into that section\n"), section->name); - return TRUE; + return true; } } @@ -1599,7 +1599,7 @@ pe_print_edata (bfd * abfd, void * vfile) /* xgettext:c-format */ _("\nThere is an export table in %s, but it is too small (%d)\n"), section->name, (int) datasize); - return TRUE; + return true; } /* xgettext:c-format */ @@ -1608,11 +1608,11 @@ pe_print_edata (bfd * abfd, void * vfile) data = (bfd_byte *) bfd_malloc (datasize); if (data == NULL) - return FALSE; + return false; if (! bfd_get_section_contents (abfd, section, data, (file_ptr) dataoff, datasize)) - return FALSE; + return false; /* Go get Export Directory Table. */ edt.export_flags = bfd_get_32 (abfd, data + 0); @@ -1786,7 +1786,7 @@ pe_print_edata (bfd * abfd, void * vfile) free (data); - return TRUE; + return true; } /* This really is architecture dependent. On IA-64, a .pdata entry @@ -1801,7 +1801,7 @@ pe_print_edata (bfd * abfd, void * vfile) This is the version for uncompressed data. */ -static bfd_boolean +static bool pe_print_pdata (bfd * abfd, void * vfile) { #if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) @@ -1820,7 +1820,7 @@ pe_print_pdata (bfd * abfd, void * vfile) if (section == NULL || coff_section_data (abfd, section) == NULL || pei_section_data (abfd, section) == NULL) - return TRUE; + return true; stop = pei_section_data (abfd, section)->virt_size; if ((stop % onaline) != 0) @@ -1842,7 +1842,7 @@ pe_print_pdata (bfd * abfd, void * vfile) datasize = section->size; if (datasize == 0) - return TRUE; + return true; /* PR 17512: file: 002-193900-0.004. */ if (datasize < stop) @@ -1850,13 +1850,13 @@ pe_print_pdata (bfd * abfd, void * vfile) /* xgettext:c-format */ fprintf (file, _("Virtual size of .pdata section (%ld) larger than real size (%ld)\n"), (long) stop, (long) datasize); - return FALSE; + return false; } if (! bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } start = 0; @@ -1908,7 +1908,7 @@ pe_print_pdata (bfd * abfd, void * vfile) free (data); - return TRUE; + return true; #undef PDATA_ROW_SIZE } @@ -1973,7 +1973,7 @@ cleanup_syms (sym_cache *psc) /* This is the version for "compressed" pdata. */ -bfd_boolean +bool _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile) { # define PDATA_ROW_SIZE (2 * 4) @@ -1989,7 +1989,7 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile) if (section == NULL || coff_section_data (abfd, section) == NULL || pei_section_data (abfd, section) == NULL) - return TRUE; + return true; stop = pei_section_data (abfd, section)->virt_size; if ((stop % onaline) != 0) @@ -2007,12 +2007,12 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile) datasize = section->size; if (datasize == 0) - return TRUE; + return true; if (! bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } start = 0; @@ -2087,7 +2087,7 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile) cleanup_syms (& cache); - return TRUE; + return true; #undef PDATA_ROW_SIZE } @@ -2110,7 +2110,7 @@ static const char * const tbl[] = "UNKNOWN", /* MUST be last. */ }; -static bfd_boolean +static bool pe_print_reloc (bfd * abfd, void * vfile) { FILE *file = (FILE *) vfile; @@ -2119,7 +2119,7 @@ pe_print_reloc (bfd * abfd, void * vfile) bfd_byte *p, *end; if (section == NULL || section->size == 0 || !(section->flags & SEC_HAS_CONTENTS)) - return TRUE; + return true; fprintf (file, _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n")); @@ -2127,7 +2127,7 @@ pe_print_reloc (bfd * abfd, void * vfile) if (! bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } p = data; @@ -2190,7 +2190,7 @@ pe_print_reloc (bfd * abfd, void * vfile) free (data); - return TRUE; + return true; } /* A data structure describing the regions of a .rsrc section. @@ -2215,13 +2215,13 @@ rsrc_print_resource_directory (FILE * , bfd *, unsigned int, bfd_byte *, or section_end + 1 upon failure. */ static bfd_byte * -rsrc_print_resource_entries (FILE * file, - bfd * abfd, - unsigned int indent, - bfd_boolean is_name, - bfd_byte * data, - rsrc_regions * regions, - bfd_vma rva_bias) +rsrc_print_resource_entries (FILE *file, + bfd *abfd, + unsigned int indent, + bool is_name, + bfd_byte *data, + rsrc_regions *regions, + bfd_vma rva_bias) { unsigned long entry, addr, size; bfd_byte * leaf; @@ -2377,7 +2377,7 @@ rsrc_print_resource_directory (FILE * file, { bfd_byte * entry_end; - entry_end = rsrc_print_resource_entries (file, abfd, indent + 1, TRUE, + entry_end = rsrc_print_resource_entries (file, abfd, indent + 1, true, data, regions, rva_bias); data += 8; highest_data = max (highest_data, entry_end); @@ -2389,7 +2389,7 @@ rsrc_print_resource_directory (FILE * file, { bfd_byte * entry_end; - entry_end = rsrc_print_resource_entries (file, abfd, indent + 1, FALSE, + entry_end = rsrc_print_resource_entries (file, abfd, indent + 1, false, data, regions, rva_bias); data += 8; highest_data = max (highest_data, entry_end); @@ -2404,7 +2404,7 @@ rsrc_print_resource_directory (FILE * file, reproduce the resources, windres does that. Instead we dump the tables in a human readable format. */ -static bfd_boolean +static bool rsrc_print_section (bfd * abfd, void * vfile) { bfd_vma rva_bias; @@ -2417,24 +2417,24 @@ rsrc_print_section (bfd * abfd, void * vfile) pe = pe_data (abfd); if (pe == NULL) - return TRUE; + return true; section = bfd_get_section_by_name (abfd, ".rsrc"); if (section == NULL) - return TRUE; + return true; if (!(section->flags & SEC_HAS_CONTENTS)) - return TRUE; + return true; datasize = section->size; if (datasize == 0) - return TRUE; + return true; rva_bias = section->vma - pe->pe_opthdr.ImageBase; if (! bfd_malloc_and_get_section (abfd, section, & data)) { free (data); - return FALSE; + return false; } regions.section_start = data; @@ -2489,7 +2489,7 @@ rsrc_print_section (bfd * abfd, void * vfile) (int) (regions.resource_start - regions.section_start)); free (regions.section_start); - return TRUE; + return true; } #define IMAGE_NUMBEROF_DEBUG_TYPES 17 @@ -2515,7 +2515,7 @@ static char * debug_type_names[IMAGE_NUMBEROF_DEBUG_TYPES] = "Repro", }; -static bfd_boolean +static bool pe_print_debugdata (bfd * abfd, void * vfile) { FILE *file = (FILE *) vfile; @@ -2530,7 +2530,7 @@ pe_print_debugdata (bfd * abfd, void * vfile) bfd_size_type size = extra->DataDirectory[PE_DEBUG_DATA].Size; if (size == 0) - return TRUE; + return true; addr += extra->ImageBase; for (section = abfd->sections; section != NULL; section = section->next) @@ -2543,21 +2543,21 @@ pe_print_debugdata (bfd * abfd, void * vfile) { fprintf (file, _("\nThere is a debug directory, but the section containing it could not be found\n")); - return TRUE; + return true; } else if (!(section->flags & SEC_HAS_CONTENTS)) { fprintf (file, _("\nThere is a debug directory in %s, but that section has no contents\n"), section->name); - return TRUE; + return true; } else if (section->size < size) { fprintf (file, _("\nError: section %s contains the debug data starting address but it is too small\n"), section->name); - return FALSE; + return false; } fprintf (file, _("\nThere is a debug directory in %s at 0x%lx\n\n"), @@ -2568,7 +2568,7 @@ pe_print_debugdata (bfd * abfd, void * vfile) if (size > (section->size - dataoff)) { fprintf (file, _("The debug data size field in the data directory is too big for the section")); - return FALSE; + return false; } fprintf (file, @@ -2578,7 +2578,7 @@ pe_print_debugdata (bfd * abfd, void * vfile) if (!bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } for (i = 0; i < size / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++) @@ -2631,10 +2631,10 @@ pe_print_debugdata (bfd * abfd, void * vfile) fprintf (file, _("The debug directory size is not a multiple of the debug directory entry size\n")); - return TRUE; + return true; } -static bfd_boolean +static bool pe_is_repro (bfd * abfd) { pe_data_type *pe = pe_data (abfd); @@ -2643,13 +2643,13 @@ pe_is_repro (bfd * abfd) bfd_byte *data = 0; bfd_size_type dataoff; unsigned int i; - bfd_boolean res = FALSE; + bool res = false; bfd_vma addr = extra->DataDirectory[PE_DEBUG_DATA].VirtualAddress; bfd_size_type size = extra->DataDirectory[PE_DEBUG_DATA].Size; if (size == 0) - return FALSE; + return false; addr += extra->ImageBase; for (section = abfd->sections; section != NULL; section = section->next) @@ -2662,20 +2662,20 @@ pe_is_repro (bfd * abfd) || (!(section->flags & SEC_HAS_CONTENTS)) || (section->size < size)) { - return FALSE; + return false; } dataoff = addr - section->vma; if (size > (section->size - dataoff)) { - return FALSE; + return false; } if (!bfd_malloc_and_get_section (abfd, section, &data)) { free (data); - return FALSE; + return false; } for (i = 0; i < size / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++) @@ -2688,7 +2688,7 @@ pe_is_repro (bfd * abfd) if (idd.Type == PE_IMAGE_DEBUG_TYPE_REPRO) { - res = TRUE; + res = true; break; } } @@ -2700,7 +2700,7 @@ pe_is_repro (bfd * abfd) /* Print out the program headers. */ -bfd_boolean +bool _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) { FILE *file = (FILE *) vfile; @@ -2884,10 +2884,10 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) rsrc_print_section (abfd, vfile); - return TRUE; + return true; } -static bfd_boolean +static bool is_vma_in_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sect, void *obj) { bfd_vma addr = * (bfd_vma *) obj; @@ -2903,7 +2903,7 @@ find_section_by_vma (bfd *abfd, bfd_vma addr) /* Copy any private info we understand from the input bfd to the output bfd. */ -bfd_boolean +bool _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd) { pe_data_type *ipe, *ope; @@ -2911,7 +2911,7 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd) /* One day we may try to grok other private data. */ if (ibfd->xvec->flavour != bfd_target_coff_flavour || obfd->xvec->flavour != bfd_target_coff_flavour) - return TRUE; + return true; ipe = pe_data (ibfd); ope = pe_data (obfd); @@ -2963,7 +2963,7 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd) "extends across section boundary at %" PRIx64), obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size, (uint64_t) addr, (uint64_t) section->vma); - return FALSE; + return false; } if (section && bfd_malloc_and_get_section (obfd, section, &data)) @@ -2998,23 +2998,23 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd) { _bfd_error_handler (_("failed to update file offsets in debug directory")); free (data); - return FALSE; + return false; } free (data); } else if (section) { _bfd_error_handler (_("%pB: failed to read debug data section"), obfd); - return FALSE; + return false; } } - return TRUE; + return true; } /* Copy private section data. */ -bfd_boolean +bool _bfd_XX_bfd_copy_private_section_data (bfd *ibfd, asection *isec, bfd *obfd, @@ -3022,7 +3022,7 @@ _bfd_XX_bfd_copy_private_section_data (bfd *ibfd, { if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour || bfd_get_flavour (obfd) != bfd_target_coff_flavour) - return TRUE; + return true; if (coff_section_data (ibfd, isec) != NULL && pei_section_data (ibfd, isec) != NULL) @@ -3032,7 +3032,7 @@ _bfd_XX_bfd_copy_private_section_data (bfd *ibfd, size_t amt = sizeof (struct coff_section_tdata); osec->used_by_bfd = bfd_zalloc (obfd, amt); if (osec->used_by_bfd == NULL) - return FALSE; + return false; } if (pei_section_data (obfd, osec) == NULL) @@ -3040,7 +3040,7 @@ _bfd_XX_bfd_copy_private_section_data (bfd *ibfd, size_t amt = sizeof (struct pei_section_tdata); coff_section_data (obfd, osec)->tdata = bfd_zalloc (obfd, amt); if (coff_section_data (obfd, osec)->tdata == NULL) - return FALSE; + return false; } pei_section_data (obfd, osec)->virt_size = @@ -3049,7 +3049,7 @@ _bfd_XX_bfd_copy_private_section_data (bfd *ibfd, pei_section_data (ibfd, isec)->pe_flags; } - return TRUE; + return true; } void @@ -3083,12 +3083,12 @@ static bfd_byte * rsrc_count_directory (bfd *, bfd_byte *, bfd_byte *, bfd_byte *, bfd_vma); static bfd_byte * -rsrc_count_entries (bfd * abfd, - bfd_boolean is_name, - bfd_byte * datastart, - bfd_byte * data, - bfd_byte * dataend, - bfd_vma rva_bias) +rsrc_count_entries (bfd *abfd, + bool is_name, + bfd_byte *datastart, + bfd_byte *data, + bfd_byte *dataend, + bfd_vma rva_bias) { unsigned long entry, addr, size; @@ -3205,14 +3205,14 @@ typedef struct rsrc_leaf typedef struct rsrc_entry { - bfd_boolean is_name; + bool is_name; union { unsigned int id; struct rsrc_string name; } name_id; - bfd_boolean is_dir; + bool is_dir; union { struct rsrc_directory * directory; @@ -3228,14 +3228,14 @@ rsrc_parse_directory (bfd *, rsrc_directory *, bfd_byte *, bfd_byte *, bfd_byte *, bfd_vma, rsrc_entry *); static bfd_byte * -rsrc_parse_entry (bfd * abfd, - bfd_boolean is_name, - rsrc_entry * entry, - bfd_byte * datastart, - bfd_byte * data, - bfd_byte * dataend, - bfd_vma rva_bias, - rsrc_directory * parent) +rsrc_parse_entry (bfd *abfd, + bool is_name, + rsrc_entry *entry, + bfd_byte *datastart, + bfd_byte * data, + bfd_byte *dataend, + bfd_vma rva_bias, + rsrc_directory *parent) { unsigned long val, addr, size; @@ -3272,7 +3272,7 @@ rsrc_parse_entry (bfd * abfd, if (HighBitSet (val)) { - entry->is_dir = TRUE; + entry->is_dir = true; entry->value.directory = bfd_malloc (sizeof * entry->value.directory); if (entry->value.directory == NULL) return dataend; @@ -3283,7 +3283,7 @@ rsrc_parse_entry (bfd * abfd, dataend, rva_bias, entry); } - entry->is_dir = FALSE; + entry->is_dir = false; entry->value.leaf = bfd_malloc (sizeof * entry->value.leaf); if (entry->value.leaf == NULL) return dataend; @@ -3306,15 +3306,15 @@ rsrc_parse_entry (bfd * abfd, } static bfd_byte * -rsrc_parse_entries (bfd * abfd, - rsrc_dir_chain * chain, - bfd_boolean is_name, - bfd_byte * highest_data, - bfd_byte * datastart, - bfd_byte * data, - bfd_byte * dataend, - bfd_vma rva_bias, - rsrc_directory * parent) +rsrc_parse_entries (bfd *abfd, + rsrc_dir_chain *chain, + bool is_name, + bfd_byte *highest_data, + bfd_byte *datastart, + bfd_byte *data, + bfd_byte *dataend, + bfd_vma rva_bias, + rsrc_directory *parent) { unsigned int i; rsrc_entry * entry; @@ -3382,11 +3382,11 @@ rsrc_parse_directory (bfd * abfd, data += 16; - highest_data = rsrc_parse_entries (abfd, & table->names, TRUE, data, + highest_data = rsrc_parse_entries (abfd, & table->names, true, data, datastart, data, dataend, rva_bias, table); data += table->names.num_entries * 8; - highest_data = rsrc_parse_entries (abfd, & table->ids, FALSE, highest_data, + highest_data = rsrc_parse_entries (abfd, & table->ids, false, highest_data, datastart, data, dataend, rva_bias, table); data += table->ids.num_entries * 8; @@ -3593,7 +3593,7 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n) /* Perform a comparison of two entries. */ static signed int -rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) +rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) { signed int res; bfd_byte * astring; @@ -3685,7 +3685,7 @@ rsrc_print_name (char * buffer, rsrc_string string) static const char * rsrc_resource_name (rsrc_entry *entry, rsrc_directory *dir, char *buffer) { - bfd_boolean is_string = FALSE; + bool is_string = false; buffer[0] = 0; @@ -3708,7 +3708,7 @@ rsrc_resource_name (rsrc_entry *entry, rsrc_directory *dir, char *buffer) case 3: strcat (buffer, " (ICON)"); break; case 4: strcat (buffer, " (MENU)"); break; case 5: strcat (buffer, " (DIALOG)"); break; - case 6: strcat (buffer, " (STRING)"); is_string = TRUE; break; + case 6: strcat (buffer, " (STRING)"); is_string = true; break; case 7: strcat (buffer, " (FONTDIR)"); break; case 8: strcat (buffer, " (FONT)"); break; case 9: strcat (buffer, " (ACCELERATOR)"); break; @@ -3772,7 +3772,7 @@ rsrc_resource_name (rsrc_entry *entry, rsrc_directory *dir, char *buffer) them and return FALSE. Otherwise we copy any strings from B into A and then return TRUE. */ -static bfd_boolean +static bool rsrc_merge_string_entries (rsrc_entry * a ATTRIBUTE_UNUSED, rsrc_entry * b ATTRIBUTE_UNUSED) { @@ -3821,11 +3821,11 @@ rsrc_merge_string_entries (rsrc_entry * a ATTRIBUTE_UNUSED, && !a->parent->entry->is_name) _bfd_error_handler (_(".rsrc merge failure: duplicate string resource: %d"), ((a->parent->entry->name_id.id - 1) << 4) + i); - return FALSE; + return false; } if (copy_needed == 0) - return TRUE; + return true; /* If we reach here then A and B must both have non-colliding strings. (We never get string resources with fully empty string tables). @@ -3833,7 +3833,7 @@ rsrc_merge_string_entries (rsrc_entry * a ATTRIBUTE_UNUSED, in B's strings. */ new_data = bfd_malloc (a->value.leaf->size + copy_needed); if (new_data == NULL) - return FALSE; + return false; nstring = new_data; astring = a->value.leaf->data; @@ -3870,7 +3870,7 @@ rsrc_merge_string_entries (rsrc_entry * a ATTRIBUTE_UNUSED, a->value.leaf->data = new_data; a->value.leaf->size += copy_needed; - return TRUE; + return true; } static void rsrc_merge (rsrc_entry *, rsrc_entry *); @@ -3880,21 +3880,21 @@ static void rsrc_merge (rsrc_entry *, rsrc_entry *); with lists and we want to handle matches specially. */ static void -rsrc_sort_entries (rsrc_dir_chain * chain, - bfd_boolean is_name, - rsrc_directory * dir) +rsrc_sort_entries (rsrc_dir_chain *chain, + bool is_name, + rsrc_directory *dir) { rsrc_entry * entry; rsrc_entry * next; rsrc_entry ** points_to_entry; - bfd_boolean swapped; + bool swapped; if (chain->num_entries < 2) return; do { - swapped = FALSE; + swapped = false; points_to_entry = & chain->first_entry; entry = * points_to_entry; next = entry->next_entry; @@ -3910,7 +3910,7 @@ rsrc_sort_entries (rsrc_dir_chain * chain, * points_to_entry = next; points_to_entry = & next->next_entry; next = entry->next_entry; - swapped = TRUE; + swapped = true; } else if (cmp == 0) { @@ -3950,7 +3950,7 @@ rsrc_sort_entries (rsrc_dir_chain * chain, * points_to_entry = next; points_to_entry = & next->next_entry; next = entry->next_entry; - swapped = TRUE; + swapped = true; } else { @@ -4105,8 +4105,8 @@ rsrc_merge (struct rsrc_entry * a, struct rsrc_entry * b) rsrc_attach_chain (& adir->ids, & bdir->ids); /* Now sort A's entries. */ - rsrc_sort_entries (& adir->names, TRUE, adir); - rsrc_sort_entries (& adir->ids, FALSE, adir); + rsrc_sort_entries (& adir->names, true, adir); + rsrc_sort_entries (& adir->ids, false, adir); } /* Check the .rsrc section. If it contains multiple concatenated @@ -4273,7 +4273,7 @@ rsrc_process_section (bfd * abfd, for (indx = 0; indx < num_resource_sets; indx++) rsrc_attach_chain (& new_table.names, & type_tables[indx].names); - rsrc_sort_entries (& new_table.names, TRUE, & new_table); + rsrc_sort_entries (& new_table.names, true, & new_table); /* Chain the ID entries onto the table. */ new_table.ids.first_entry = NULL; @@ -4282,7 +4282,7 @@ rsrc_process_section (bfd * abfd, for (indx = 0; indx < num_resource_sets; indx++) rsrc_attach_chain (& new_table.ids, & type_tables[indx].ids); - rsrc_sort_entries (& new_table.ids, FALSE, & new_table); + rsrc_sort_entries (& new_table.ids, false, & new_table); /* Step four: Create new contents for the .rsrc section. */ /* Step four point one: Compute the size of each region of the .rsrc section. @@ -4324,12 +4324,12 @@ rsrc_process_section (bfd * abfd, /* Handle the .idata section and other things that need symbol table access. */ -bfd_boolean +bool _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) { struct coff_link_hash_entry *h1; struct bfd_link_info *info = pfinfo->info; - bfd_boolean result = TRUE; + bool result = true; /* There are a few fields that need to be filled in now while we have symbol table access. @@ -4340,7 +4340,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) /* The import directory. This is the address of .idata$2, with size of .idata$2 + .idata$3. */ h1 = coff_link_hash_lookup (coff_hash_table (info), - ".idata$2", FALSE, FALSE, TRUE); + ".idata$2", false, false, true); if (h1 != NULL) { /* PR ld/2729: We cannot rely upon all the output sections having been @@ -4359,11 +4359,11 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[1] because .idata$2 is missing"), abfd); - result = FALSE; + result = false; } h1 = coff_link_hash_lookup (coff_hash_table (info), - ".idata$4", FALSE, FALSE, TRUE); + ".idata$4", false, false, true); if (h1 != NULL && (h1->root.type == bfd_link_hash_defined || h1->root.type == bfd_link_hash_defweak) @@ -4379,13 +4379,13 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[1] because .idata$4 is missing"), abfd); - result = FALSE; + result = false; } /* The import address table. This is the size/address of .idata$5. */ h1 = coff_link_hash_lookup (coff_hash_table (info), - ".idata$5", FALSE, FALSE, TRUE); + ".idata$5", false, false, true); if (h1 != NULL && (h1->root.type == bfd_link_hash_defined || h1->root.type == bfd_link_hash_defweak) @@ -4400,11 +4400,11 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[12] because .idata$5 is missing"), abfd); - result = FALSE; + result = false; } h1 = coff_link_hash_lookup (coff_hash_table (info), - ".idata$6", FALSE, FALSE, TRUE); + ".idata$6", false, false, true); if (h1 != NULL && (h1->root.type == bfd_link_hash_defined || h1->root.type == bfd_link_hash_defweak) @@ -4420,13 +4420,13 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because .idata$6 is missing"), abfd); - result = FALSE; + result = false; } } else { h1 = coff_link_hash_lookup (coff_hash_table (info), - "__IAT_start__", FALSE, FALSE, TRUE); + "__IAT_start__", false, false, true); if (h1 != NULL && (h1->root.type == bfd_link_hash_defined || h1->root.type == bfd_link_hash_defweak) @@ -4441,7 +4441,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) + h1->root.u.def.section->output_offset); h1 = coff_link_hash_lookup (coff_hash_table (info), - "__IAT_end__", FALSE, FALSE, TRUE); + "__IAT_end__", false, false, true); if (h1 != NULL && (h1->root.type == bfd_link_hash_defined || h1->root.type == bfd_link_hash_defweak) @@ -4462,7 +4462,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)]" " because .idata$6 is missing"), abfd); - result = FALSE; + result = false; } } } @@ -4470,7 +4470,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) h1 = coff_link_hash_lookup (coff_hash_table (info), (bfd_get_symbol_leading_char (abfd) != 0 ? "__tls_used" : "_tls_used"), - FALSE, FALSE, TRUE); + false, false, true); if (h1 != NULL) { if ((h1->root.type == bfd_link_hash_defined @@ -4487,7 +4487,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) _bfd_error_handler (_("%pB: unable to fill in DataDictionary[9] because __tls_used is missing"), abfd); - result = FALSE; + result = false; } /* According to PECOFF sepcifications by Microsoft version 8.2 the TLS data directory consists of 4 pointers, followed @@ -4527,7 +4527,7 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) free (tmp_data); } else - result = FALSE; + result = false; } } #endif -- cgit v1.1