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/srec.c | 106 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'bfd/srec.c') diff --git a/bfd/srec.c b/bfd/srec.c index 92faf3d..3ddb3c5 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -134,7 +134,7 @@ unsigned int _bfd_srec_len = DEFAULT_CHUNK; /* The type of srec output (free or forced to S3). This variable can be modified by objcopy's --srec-forceS3 parameter. */ -bfd_boolean _bfd_srec_forceS3 = FALSE; +bool _bfd_srec_forceS3 = false; /* When writing an S-record file, the S-records can not be output as they are seen. This structure is used to hold them in memory. */ @@ -178,18 +178,18 @@ tdata_type; static void srec_init (void) { - static bfd_boolean inited = FALSE; + static bool inited = false; if (! inited) { - inited = TRUE; + inited = true; hex_init (); } } /* Set up the S-record tdata information. */ -static bfd_boolean +static bool srec_mkobject (bfd *abfd) { tdata_type *tdata; @@ -198,7 +198,7 @@ srec_mkobject (bfd *abfd) tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type)); if (tdata == NULL) - return FALSE; + return false; abfd->tdata.srec_data = tdata; tdata->type = 1; @@ -208,21 +208,21 @@ srec_mkobject (bfd *abfd) tdata->symtail = NULL; tdata->csymbols = NULL; - return TRUE; + return true; } /* Read a byte from an S record file. Set *ERRORPTR if an error occurred. Return EOF on error or end of file. */ static int -srec_get_byte (bfd *abfd, bfd_boolean *errorptr) +srec_get_byte (bfd *abfd, bool *errorptr) { bfd_byte c; if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1) { if (bfd_get_error () != bfd_error_file_truncated) - *errorptr = TRUE; + *errorptr = true; return EOF; } @@ -237,7 +237,7 @@ static void srec_bad_byte (bfd *abfd, unsigned int lineno, int c, - bfd_boolean error) + bool error) { if (c == EOF) { @@ -265,14 +265,14 @@ srec_bad_byte (bfd *abfd, /* Add a new symbol found in an S-record file. */ -static bfd_boolean +static bool srec_new_symbol (bfd *abfd, const char *name, bfd_vma val) { struct srec_symbol *n; n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (* n)); if (n == NULL) - return FALSE; + return false; n->name = name; n->val = val; @@ -286,18 +286,18 @@ srec_new_symbol (bfd *abfd, const char *name, bfd_vma val) ++abfd->symcount; - return TRUE; + return true; } /* Read the S record file and turn it into sections. We create a new section for each contiguous set of bytes. */ -static bfd_boolean +static bool srec_scan (bfd *abfd) { int c; unsigned int lineno = 1; - bfd_boolean error = FALSE; + bool error = false; bfd_byte *buf = NULL; size_t bufsize = 0; asection *sec = NULL; @@ -618,7 +618,7 @@ srec_scan (bfd *abfd) } free (buf); - return TRUE; + return true; } } break; @@ -629,12 +629,12 @@ srec_scan (bfd *abfd) goto error_return; free (buf); - return TRUE; + return true; error_return: free (symbuf); free (buf); - return FALSE; + return false; } /* Check whether an existing file is an S-record file. */ @@ -709,12 +709,12 @@ symbolsrec_object_p (bfd *abfd) /* Read in the contents of a section in an S-record file. */ -static bfd_boolean +static bool srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) { int c; bfd_size_type sofar = 0; - bfd_boolean error = FALSE; + bool error = false; bfd_byte *buf = NULL; size_t bufsize = 0; @@ -761,7 +761,7 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) default: BFD_ASSERT (sofar == section->size); free (buf); - return TRUE; + return true; case '3': address = HEX (data); @@ -785,7 +785,7 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) /* We've come to the end of this section. */ BFD_ASSERT (sofar == section->size); free (buf); - return TRUE; + return true; } /* Don't consider checksum. */ @@ -808,16 +808,16 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) BFD_ASSERT (sofar == section->size); free (buf); - return TRUE; + return true; error_return: free (buf); - return FALSE; + return false; } /* Get the contents of a section in an S-record file. */ -static bfd_boolean +static bool srec_get_section_contents (bfd *abfd, asection *section, void * location, @@ -825,47 +825,47 @@ srec_get_section_contents (bfd *abfd, bfd_size_type count) { if (count == 0) - return TRUE; + return true; if (offset + count < count || offset + count > section->size) { bfd_set_error (bfd_error_invalid_operation); - return FALSE; + return false; } if (section->used_by_bfd == NULL) { section->used_by_bfd = bfd_alloc (abfd, section->size); if (section->used_by_bfd == NULL) - return FALSE; + return false; if (! srec_read_section (abfd, section, (bfd_byte *) section->used_by_bfd)) - return FALSE; + return false; } memcpy (location, (bfd_byte *) section->used_by_bfd + offset, (size_t) count); - return TRUE; + return true; } /* Set the architecture. We accept an unknown architecture here. */ -static bfd_boolean +static bool srec_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach) { if (arch != bfd_arch_unknown) return bfd_default_set_arch_mach (abfd, arch, mach); abfd->arch_info = & bfd_default_arch_struct; - return TRUE; + return true; } /* We have to save up all the Srecords for a splurge before output. */ -static bfd_boolean +static bool srec_set_section_contents (bfd *abfd, sec_ptr section, const void * location, @@ -878,7 +878,7 @@ srec_set_section_contents (bfd *abfd, entry = (srec_data_list_type *) bfd_alloc (abfd, sizeof (* entry)); if (entry == NULL) - return FALSE; + return false; if (bytes_to_do && (section->flags & SEC_ALLOC) @@ -888,7 +888,7 @@ srec_set_section_contents (bfd *abfd, data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do); if (data == NULL) - return FALSE; + return false; memcpy ((void *) data, location, (size_t) bytes_to_do); /* If _bfd_srec_forceS3 is TRUE then always select S3 records, @@ -930,14 +930,14 @@ srec_set_section_contents (bfd *abfd, tdata->tail = entry; } } - return TRUE; + return true; } /* Write a record of type, of the supplied number of bytes. The supplied bytes and length don't have a checksum. That's worked out here. */ -static bfd_boolean +static bool srec_write_record (bfd *abfd, unsigned int type, bfd_vma address, @@ -999,7 +999,7 @@ srec_write_record (bfd *abfd, return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen; } -static bfd_boolean +static bool srec_write_header (bfd *abfd) { unsigned int len = strlen (bfd_get_filename (abfd)); @@ -1013,7 +1013,7 @@ srec_write_header (bfd *abfd) (bfd_byte *) bfd_get_filename (abfd) + len); } -static bfd_boolean +static bool srec_write_section (bfd *abfd, tdata_type *tdata, srec_data_list_type *list) @@ -1048,23 +1048,23 @@ srec_write_section (bfd *abfd, address, location, location + octets_this_chunk)) - return FALSE; + return false; octets_written += octets_this_chunk; location += octets_this_chunk; } - return TRUE; + return true; } -static bfd_boolean +static bool srec_write_terminator (bfd *abfd, tdata_type *tdata) { return srec_write_record (abfd, 10 - tdata->type, abfd->start_address, NULL, NULL); } -static bfd_boolean +static bool srec_write_symbols (bfd *abfd) { /* Dump out the symbols of a bfd. */ @@ -1080,7 +1080,7 @@ srec_write_symbols (bfd *abfd) if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3 || bfd_bwrite (bfd_get_filename (abfd), len, abfd) != len || bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2) - return FALSE; + return false; for (i = 0; i < count; i++) { @@ -1097,7 +1097,7 @@ srec_write_symbols (bfd *abfd) len = strlen (s->name); if (bfd_bwrite (" ", (bfd_size_type) 2, abfd) != 2 || bfd_bwrite (s->name, len, abfd) != len) - return FALSE; + return false; sprintf_vma (buf + 2, (s->value + s->section->output_section->lma @@ -1112,17 +1112,17 @@ srec_write_symbols (bfd *abfd) *--p = ' '; len += 4; if (bfd_bwrite (p, len, abfd) != len) - return FALSE; + return false; } } if (bfd_bwrite ("$$ \r\n", (bfd_size_type) 5, abfd) != 5) - return FALSE; + return false; } - return TRUE; + return true; } -static bfd_boolean +static bool internal_srec_write_object_contents (bfd *abfd, int symbols) { tdata_type *tdata = abfd->tdata.srec_data; @@ -1131,11 +1131,11 @@ internal_srec_write_object_contents (bfd *abfd, int symbols) if (symbols) { if (! srec_write_symbols (abfd)) - return FALSE; + return false; } if (! srec_write_header (abfd)) - return FALSE; + return false; /* Now wander though all the sections provided and output them. */ list = tdata->head; @@ -1143,19 +1143,19 @@ internal_srec_write_object_contents (bfd *abfd, int symbols) while (list != (srec_data_list_type *) NULL) { if (! srec_write_section (abfd, tdata, list)) - return FALSE; + return false; list = list->next; } return srec_write_terminator (abfd, tdata); } -static bfd_boolean +static bool srec_write_object_contents (bfd *abfd) { return internal_srec_write_object_contents (abfd, 0); } -static bfd_boolean +static bool symbolsrec_write_object_contents (bfd *abfd) { return internal_srec_write_object_contents (abfd, 1); -- cgit v1.1