From 82e51918269aaa9b2f890217c141d7ae9dd2928f Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 25 Jun 2002 06:21:54 +0000 Subject: [PATCH] * aout-adobe.c: Don't compare against "true" or "false. * aout-target.h: Likewise. * aoutx.h: Likewise. * archive.c: Likewise. * bout.c: Likewise. * cache.c: Likewise. * coff-a29k.c: Likewise. * coff-alpha.c: Likewise. * coff-i386.c: Likewise. * coff-mips.c: Likewise. * coff-or32.c: Likewise. * coff64-rs6000.c: Likewise. * coffcode.h: Likewise. * coffgen.c: Likewise. * cpu-ns32k.c: Likewise. * ecoff.c: Likewise. * ecofflink.c: Likewise. * elf.c: Likewise. * elf32-arm.h: Likewise. * elf32-cris.c: Likewise. * elf32-d30v.c: Likewise. * elf32-i386.c: Likewise. * elf32-mcore.c: Likewise. * elf32-ppc.c: Likewise. * elf32-sh.c: Likewise. * elf32-sh64.c: Likewise. * elf32-v850.c: Likewise. * elf64-alpha.c: Likewise. * elf64-sh64.c: Likewise. * elfcode.h: Likewise. * elfcore.h: Likewise. * elflink.h: Likewise. * elfxx-mips.c: Likewise. * i386os9k.c: Likewise. * ieee.c: Likewise. * libbfd.c: Likewise. * linker.c: Likewise. * mmo.c: Likewise. * nlm32-alpha.c: Likewise. * nlm32-i386.c: Likewise. * nlm32-ppc.c: Likewise. * nlm32-sparc.c: Likewise. * nlmcode.h: Likewise. * oasys.c: Likewise. * pdp11.c: Likewise. * peicode.h: Likewise. * reloc.c: Likewise. * som.c: Likewise. * srec.c: Likewise. * tekhex.c: Likewise. * vms.c: Likewise. * xcofflink.c: Likewise. * elf64-sparc.c: Edit comment to not use "== false". * aoutf1.h: Don't use "? true : false". * ecoff.c: Likewise. * format.c: Likewise. * ieee.c: Likewise. * linker.c: Likewise. * mmo.c: Likewise. * oasys.c: Likewise. --- bfd/ChangeLog | 64 +++++++++++++++++++++++++++++++++++++++++++++ bfd/aout-adobe.c | 2 +- bfd/aout-target.h | 2 +- bfd/aoutf1.h | 2 +- bfd/aoutx.h | 10 +++---- bfd/archive.c | 6 ++--- bfd/bout.c | 2 +- bfd/cache.c | 4 +-- bfd/coff-a29k.c | 4 +-- bfd/coff-alpha.c | 2 +- bfd/coff-i386.c | 4 +-- bfd/coff-mips.c | 11 ++++---- bfd/coff-or32.c | 2 +- bfd/coff64-rs6000.c | 2 +- bfd/coffcode.h | 12 ++++----- bfd/coffgen.c | 6 ++--- bfd/cpu-ns32k.c | 10 +++---- bfd/ecoff.c | 27 +++++++++---------- bfd/ecofflink.c | 18 ++++++------- bfd/elf.c | 6 ++--- bfd/elf32-arm.h | 2 +- bfd/elf32-cris.c | 2 +- bfd/elf32-d30v.c | 11 ++++---- bfd/elf32-i386.c | 4 +-- bfd/elf32-mcore.c | 2 +- bfd/elf32-ppc.c | 2 +- bfd/elf32-sh.c | 2 +- bfd/elf32-sh64.c | 2 +- bfd/elf32-v850.c | 2 +- bfd/elf64-alpha.c | 5 ++-- bfd/elf64-sh64.c | 2 +- bfd/elf64-sparc.c | 2 +- bfd/elfcode.h | 8 +++--- bfd/elfcore.h | 6 ++--- bfd/elflink.h | 2 +- bfd/elfxx-mips.c | 7 +++-- bfd/format.c | 4 +-- bfd/i386os9k.c | 2 +- bfd/ieee.c | 28 ++++++++++---------- bfd/libbfd.c | 4 +-- bfd/linker.c | 5 ++-- bfd/mmo.c | 53 +++++++++++++++++-------------------- bfd/nlm32-alpha.c | 13 ++++----- bfd/nlm32-i386.c | 9 +++---- bfd/nlm32-ppc.c | 6 ++--- bfd/nlm32-sparc.c | 11 +++----- bfd/nlmcode.h | 39 ++++++++++++++------------- bfd/oasys.c | 49 +++++++++++++++------------------- bfd/pdp11.c | 10 +++---- bfd/peicode.h | 4 +-- bfd/reloc.c | 16 ++++++------ bfd/som.c | 47 ++++++++++++++++----------------- bfd/srec.c | 2 +- bfd/tekhex.c | 6 ++--- bfd/vms.c | 4 +-- bfd/xcofflink.c | 2 +- 56 files changed, 300 insertions(+), 271 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 23c68b198c1..daf5ca3f0c2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,67 @@ +2002-06-25 Alan Modra + + * aout-adobe.c: Don't compare against "true" or "false. + * aout-target.h: Likewise. + * aoutx.h: Likewise. + * archive.c: Likewise. + * bout.c: Likewise. + * cache.c: Likewise. + * coff-a29k.c: Likewise. + * coff-alpha.c: Likewise. + * coff-i386.c: Likewise. + * coff-mips.c: Likewise. + * coff-or32.c: Likewise. + * coff64-rs6000.c: Likewise. + * coffcode.h: Likewise. + * coffgen.c: Likewise. + * cpu-ns32k.c: Likewise. + * ecoff.c: Likewise. + * ecofflink.c: Likewise. + * elf.c: Likewise. + * elf32-arm.h: Likewise. + * elf32-cris.c: Likewise. + * elf32-d30v.c: Likewise. + * elf32-i386.c: Likewise. + * elf32-mcore.c: Likewise. + * elf32-ppc.c: Likewise. + * elf32-sh.c: Likewise. + * elf32-sh64.c: Likewise. + * elf32-v850.c: Likewise. + * elf64-alpha.c: Likewise. + * elf64-sh64.c: Likewise. + * elfcode.h: Likewise. + * elfcore.h: Likewise. + * elflink.h: Likewise. + * elfxx-mips.c: Likewise. + * i386os9k.c: Likewise. + * ieee.c: Likewise. + * libbfd.c: Likewise. + * linker.c: Likewise. + * mmo.c: Likewise. + * nlm32-alpha.c: Likewise. + * nlm32-i386.c: Likewise. + * nlm32-ppc.c: Likewise. + * nlm32-sparc.c: Likewise. + * nlmcode.h: Likewise. + * oasys.c: Likewise. + * pdp11.c: Likewise. + * peicode.h: Likewise. + * reloc.c: Likewise. + * som.c: Likewise. + * srec.c: Likewise. + * tekhex.c: Likewise. + * vms.c: Likewise. + * xcofflink.c: Likewise. + * elf64-sparc.c: Edit comment to not use "== false". + + * aoutf1.h: Don't use "? true : false". + * ecoff.c: Likewise. + * format.c: Likewise. + * ieee.c: Likewise. + * linker.c: Likewise. + * mmo.c: Likewise. + * oasys.c: Likewise. + 2002-06-23 H.J. Lu * elflink.h (elf_link_add_archive_symbols): For the default diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c index 83983398aa7..11f1ca33241 100644 --- a/bfd/aout-adobe.c +++ b/bfd/aout-adobe.c @@ -416,7 +416,7 @@ aout_adobe_set_section_contents (abfd, section, location, offset, count) sec_ptr sect; /* Set by bfd.c handler. */ - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* Assign file offsets to sections. Text sections are first, and are contiguous. Then data sections. Everything else at the end. */ diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 75299fa8180..b2acc090887 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -207,7 +207,7 @@ static boolean MY(mkobject) (abfd) bfd *abfd; { - if (NAME(aout,mkobject) (abfd) == false) + if (! NAME(aout,mkobject) (abfd)) return false; #if 0 /* Sizes get set in set_sizes callback, later, after we know the architecture and machine. */ diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h index 0f773a18a8c..80d69d9135e 100644 --- a/bfd/aoutf1.h +++ b/bfd/aoutf1.h @@ -748,7 +748,7 @@ sunos4_core_file_matches_executable_p (core_bfd, exec_bfd) return (memcmp ((char *) &((core_hdr (core_bfd)->hdr)->c_aouthdr), (char *) exec_hdr (exec_bfd), - sizeof (struct internal_exec)) == 0) ? true : false; + sizeof (struct internal_exec)) == 0); } #define MY_set_sizes sunos4_set_sizes diff --git a/bfd/aoutx.h b/bfd/aoutx.h index c2448f4a575..995db426a67 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -1310,9 +1310,9 @@ aout_get_external_symbols (abfd) count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE; #ifdef USE_MMAP - if (bfd_get_file_window (abfd, - obj_sym_filepos (abfd), exec_hdr (abfd)->a_syms, - &obj_aout_sym_window (abfd), true) == false) + if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd), + exec_hdr (abfd)->a_syms, + &obj_aout_sym_window (abfd), true)) return false; syms = (struct external_nlist *) obj_aout_sym_window (abfd).data; #else @@ -1352,8 +1352,8 @@ aout_get_external_symbols (abfd) stringsize = GET_WORD (abfd, string_chars); #ifdef USE_MMAP - if (bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize, - &obj_aout_string_window (abfd), true) == false) + if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize, + &obj_aout_string_window (abfd), true)) return false; strings = (char *) obj_aout_string_window (abfd).data; #else diff --git a/bfd/archive.c b/bfd/archive.c index e9e07c5ab88..0c35ff5fc7c 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -1746,7 +1746,7 @@ _bfd_write_archive_contents (arch) if (makemap && hasobjects) { - if (_bfd_compute_and_write_armap (arch, (unsigned int) elength) != true) + if (! _bfd_compute_and_write_armap (arch, (unsigned int) elength)) return false; } @@ -1876,8 +1876,8 @@ _bfd_compute_and_write_armap (arch, elength) current != (bfd *) NULL; current = current->next, elt_no++) { - if ((bfd_check_format (current, bfd_object) == true) - && ((bfd_get_file_flags (current) & HAS_SYMS))) + if (bfd_check_format (current, bfd_object) + && (bfd_get_file_flags (current) & HAS_SYMS) != 0) { long storage; long symcount; diff --git a/bfd/bout.c b/bfd/bout.c index 9550956e089..37afbb9423e 100644 --- a/bfd/bout.c +++ b/bfd/bout.c @@ -956,7 +956,7 @@ b_out_set_section_contents (abfd, section, location, offset, count) file_ptr offset; bfd_size_type count; { - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* Set by bfd.c handler. */ if (! aout_32_make_sections (abfd)) diff --git a/bfd/cache.c b/bfd/cache.c index 4e5ef2e3b40..df01a1f990a 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -1,5 +1,5 @@ /* BFD library -- caching of file descriptors. - Copyright 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001 + Copyright 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002 Free Software Foundation, Inc. Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com). @@ -277,7 +277,7 @@ bfd_open_file (abfd) break; case both_direction: case write_direction: - if (abfd->opened_once == true) + if (abfd->opened_once) { abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RUB); if (abfd->iostream == NULL) diff --git a/bfd/coff-a29k.c b/bfd/coff-a29k.c index e1e193a547f..7c921ca387f 100644 --- a/bfd/coff-a29k.c +++ b/bfd/coff-a29k.c @@ -1,5 +1,5 @@ /* BFD back-end for AMD 29000 COFF binaries. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001 + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by David Wood at New York University 7/8/91. @@ -175,7 +175,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, insn = bfd_get_32 (abfd, hit_data); /* consth, part 2 Now relocate the reference. */ - if (part1_consth_active == false) + if (! part1_consth_active) { *error_message = (char *) _("Missing IHIHALF"); return bfd_reloc_dangerous; diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c index 4f3ab57ef6c..6d5ac17eea3 100644 --- a/bfd/coff-alpha.c +++ b/bfd/coff-alpha.c @@ -795,7 +795,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order, gp = _bfd_get_gp_value (abfd); if (gp == 0) { - if (relocateable != false) + if (relocateable) { asection *sec; bfd_vma lo; diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c index 72c58a4e672..dbeaef1535e 100644 --- a/bfd/coff-i386.c +++ b/bfd/coff-i386.c @@ -1,6 +1,6 @@ /* BFD back-end for Intel 386 COFF files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001 + 2000, 2001, 2002 Free Software Foundation, Inc. Written by Cygnus Support. @@ -117,7 +117,7 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, When we link PE and non-PE object files together to generate a non-PE executable, we have to compensate it here. */ - if (howto->pc_relative == true && howto->pcrel_offset == true) + if (howto->pc_relative && howto->pcrel_offset) diff = -(1 << howto->size); else diff = -reloc_entry->addend; diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c index edccd5cbbee..69fcc69aa68 100644 --- a/bfd/coff-mips.c +++ b/bfd/coff-mips.c @@ -819,8 +819,7 @@ mips_gprel_reloc (abfd, output_bfd = symbol->section->output_section->owner; } - if (bfd_is_und_section (symbol->section) - && relocateable == false) + if (bfd_is_und_section (symbol->section) && ! relocateable) return bfd_reloc_undefined; /* We have to figure out the gp value, so that we can adjust the @@ -830,10 +829,10 @@ mips_gprel_reloc (abfd, external symbol if we are producing relocateable output. */ gp = _bfd_get_gp_value (output_bfd); if (gp == 0 - && (relocateable == false + && (! relocateable || (symbol->flags & BSF_SECTION_SYM) != 0)) { - if (relocateable != false) + if (relocateable) { /* Make up a value. */ gp = symbol->section->output_section->vma + 0x4000; @@ -899,14 +898,14 @@ mips_gprel_reloc (abfd, /* Adjust val for the final section location and GP value. If we are producing relocateable output, we don't want to do this for an external symbol. */ - if (relocateable == false + if (! relocateable || (symbol->flags & BSF_SECTION_SYM) != 0) val += relocation - gp; insn = (insn &~ (unsigned) 0xffff) | (val & 0xffff); bfd_put_32 (abfd, (bfd_vma) insn, (bfd_byte *) data + reloc_entry->address); - if (relocateable != false) + if (relocateable) reloc_entry->address += input_section->output_offset; /* Make sure it fit in 16 bits. */ diff --git a/bfd/coff-or32.c b/bfd/coff-or32.c index eafd9afd118..c82b9af68f1 100644 --- a/bfd/coff-or32.c +++ b/bfd/coff-or32.c @@ -187,7 +187,7 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, /* consth, part 2 Now relocate the reference. */ - if (part1_consth_active == false) + if (! part1_consth_active) { *error_message = (char *) "Missing IHIHALF"; return bfd_reloc_dangerous; diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index c7fe5ac5e73..dc136643f17 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -742,7 +742,7 @@ xcoff64_write_object_contents (abfd) bfd_set_error (bfd_error_system_call); - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { if (! bfd_coff_compute_section_file_positions (abfd)) return false; diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 0363bb7b364..6040026c9e9 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1739,7 +1739,7 @@ coff_mkobject_hook (abfd, filehdr, aouthdr) struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr; coff_data_type *coff; - if (coff_mkobject (abfd) == false) + if (! coff_mkobject (abfd)) return NULL; coff = coff_data (abfd); @@ -2177,7 +2177,7 @@ symname_in_debug_hook (abfd, sym) bfd * abfd ATTRIBUTE_UNUSED; struct internal_syment *sym; { - return SYMNAME_IN_DEBUG (sym) ? true : false; + return SYMNAME_IN_DEBUG (sym) != 0; } #else @@ -2822,8 +2822,8 @@ coff_set_arch_mach (abfd, arch, machine) if (! bfd_default_set_arch_mach (abfd, arch, machine)) return false; - if (arch != bfd_arch_unknown && - coff_set_flags (abfd, &dummy1, &dummy2) != true) + if (arch != bfd_arch_unknown + && ! coff_set_flags (abfd, &dummy1, &dummy2)) return false; /* We can't represent this type */ return true; /* We're easy ... */ @@ -3405,7 +3405,7 @@ coff_write_object_contents (abfd) lnno_size = coff_count_linenumbers (abfd) * bfd_coff_linesz (abfd); - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { if (! coff_compute_section_file_positions (abfd)) return false; @@ -4196,7 +4196,7 @@ coff_set_section_contents (abfd, section, location, offset, count) file_ptr offset; bfd_size_type count; { - if (abfd->output_has_begun == false) /* set by bfd.c handler */ + if (! abfd->output_has_begun) /* set by bfd.c handler */ { if (! coff_compute_section_file_positions (abfd)) return false; diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 71179fbb552..31788e85451 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -221,7 +221,7 @@ coff_real_object_p (abfd, nscns, internal_f, internal_a) /* Set the arch/mach *before* swapping in sections; section header swapping may depend on arch/mach info. */ - if (bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f) == false) + if (! bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f)) goto fail; /* Now copy data as required; construct all asections etc */ @@ -288,7 +288,7 @@ coff_object_p (abfd) only read in f_opthdr bytes in the call to bfd_bread. We should also attempt to catch corrupt or non-COFF binaries with a strange value for f_opthdr. */ - if (bfd_coff_bad_format_hook (abfd, &internal_f) == false + if (! bfd_coff_bad_format_hook (abfd, &internal_f) || internal_f.f_opthdr > aoutsz) { bfd_set_error (bfd_error_wrong_format); @@ -2413,7 +2413,7 @@ coff_sizeof_headers (abfd, reloc) { size_t size; - if (reloc == false) + if (! reloc) { size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd); } diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index 2cfa26fe7d4..f0059d50e59 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -1,5 +1,5 @@ /* BFD support for the ns32k architecture. - Copyright 1990, 1991, 1994, 1995, 1998, 2000, 2001 + Copyright 1990, 1991, 1994, 1995, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. Almost totally rewritten by Ian Dall from initial work by Andrew Cagney. @@ -220,7 +220,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, reloc_target_output_section = symbol->section->output_section; /* Convert input-section-relative symbol value to absolute. */ - if (output_bfd && howto->partial_inplace == false) + if (output_bfd != NULL && ! howto->partial_inplace) output_base = 0; else output_base = reloc_target_output_section->vma; @@ -233,7 +233,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ - if (howto->pc_relative == true) + if (howto->pc_relative) { /* This is a PC relative relocation. We want to set RELOCATION to the distance between the address of the symbol and the @@ -266,13 +266,13 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, relocation -= input_section->output_section->vma + input_section->output_offset; - if (howto->pcrel_offset == true) + if (howto->pcrel_offset) relocation -= reloc_entry->address; } if (output_bfd != (bfd *) NULL) { - if (howto->partial_inplace == false) + if (! howto->partial_inplace) { /* This is a partial relocation, and we want to apply the relocation to the reloc entry rather than the raw data. Modify the reloc diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 56165a48cf8..4b1c18db41f 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -125,7 +125,7 @@ _bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr) struct internal_aouthdr *internal_a = (struct internal_aouthdr *) aouthdr; ecoff_data_type *ecoff; - if (_bfd_ecoff_mkobject (abfd) == false) + if (! _bfd_ecoff_mkobject (abfd)) return NULL; ecoff = ecoff_data (abfd); @@ -1056,7 +1056,7 @@ _bfd_ecoff_get_symtab (abfd, alocation) ecoff_symbol_type *symbase; ecoff_symbol_type **location = (ecoff_symbol_type **) alocation; - if (_bfd_ecoff_slurp_symbol_table (abfd) == false) + if (! _bfd_ecoff_slurp_symbol_table (abfd)) return -1; if (bfd_get_symcount (abfd) == 0) return 0; @@ -1677,7 +1677,7 @@ ecoff_slurp_reloc_table (abfd, section, symbols) || (section->flags & SEC_CONSTRUCTOR) != 0) return true; - if (_bfd_ecoff_slurp_symbol_table (abfd) == false) + if (! _bfd_ecoff_slurp_symbol_table (abfd)) return false; amt = section->reloc_count; @@ -1793,7 +1793,7 @@ _bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols) { arelent *tblptr; - if (ecoff_slurp_reloc_table (abfd, section, symbols) == false) + if (! ecoff_slurp_reloc_table (abfd, section, symbols)) return -1; tblptr = section->relocation; @@ -2267,7 +2267,7 @@ _bfd_ecoff_set_section_contents (abfd, section, location, offset, count) /* This must be done first, because bfd_set_section_contents is going to set output_has_begun to true. */ - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { if (! ecoff_compute_section_file_positions (abfd)) return false; @@ -2750,11 +2750,9 @@ _bfd_ecoff_write_object_contents (abfd) symhdr->issExtMax = 0; debug->external_ext = debug->external_ext_end = NULL; debug->ssext = debug->ssext_end = NULL; - if (bfd_ecoff_debug_externals (abfd, debug, &backend->debug_swap, - (((abfd->flags & EXEC_P) == 0) - ? true : false), - ecoff_get_extr, ecoff_set_index) - == false) + if (! bfd_ecoff_debug_externals (abfd, debug, &backend->debug_swap, + (abfd->flags & EXEC_P) == 0, + ecoff_get_extr, ecoff_set_index)) goto error_return; /* Write out the relocs. */ @@ -2858,9 +2856,8 @@ _bfd_ecoff_write_object_contents (abfd) if (bfd_get_symcount (abfd) > 0) { /* Write out the debugging information. */ - if (bfd_ecoff_write_debug (abfd, debug, &backend->debug_swap, - ecoff_data (abfd)->sym_filepos) - == false) + if (! bfd_ecoff_write_debug (abfd, debug, &backend->debug_swap, + ecoff_data (abfd)->sym_filepos)) goto error_return; } } @@ -3347,8 +3344,8 @@ _bfd_ecoff_archive_p (abfd) bfd_ardata (abfd)->extended_names = NULL; bfd_ardata (abfd)->tdata = NULL; - if (_bfd_ecoff_slurp_armap (abfd) == false - || _bfd_ecoff_slurp_extended_name_table (abfd) == false) + if (! _bfd_ecoff_slurp_armap (abfd) + || ! _bfd_ecoff_slurp_extended_name_table (abfd)) { bfd_release (abfd, bfd_ardata (abfd)); abfd->tdata.aout_ar_data = tdata_hold; diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c index 8044f3ab6e6..5b854af78e3 100644 --- a/bfd/ecofflink.c +++ b/bfd/ecofflink.c @@ -1314,12 +1314,12 @@ bfd_ecoff_debug_externals (abfd, debug, swap, relocateable, get_extr, sym_ptr = *sym_ptr_ptr; /* Get the external symbol information. */ - if ((*get_extr) (sym_ptr, &esym) == false) + if (! (*get_extr) (sym_ptr, &esym)) continue; /* If we're producing an executable, move common symbols into bss. */ - if (relocateable == false) + if (! relocateable) { if (esym.asym.sc == scCommon) esym.asym.sc = scBss; @@ -1376,20 +1376,18 @@ bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym) if ((size_t) (debug->ssext_end - debug->ssext) < symhdr->issExtMax + namelen + 1) { - if (ecoff_add_bytes ((char **) &debug->ssext, - (char **) &debug->ssext_end, - symhdr->issExtMax + namelen + 1) - == false) + if (! ecoff_add_bytes ((char **) &debug->ssext, + (char **) &debug->ssext_end, + symhdr->issExtMax + namelen + 1)) return false; } if ((size_t) ((char *) debug->external_ext_end - (char *) debug->external_ext) < (symhdr->iextMax + 1) * external_ext_size) { - if (ecoff_add_bytes ((char **) &debug->external_ext, - (char **) &debug->external_ext_end, - (symhdr->iextMax + 1) * (size_t) external_ext_size) - == false) + if (! ecoff_add_bytes ((char **) &debug->external_ext, + (char **) &debug->external_ext_end, + (symhdr->iextMax + 1) * (size_t) external_ext_size)) return false; } diff --git a/bfd/elf.c b/bfd/elf.c index e592086983c..d68b1efad99 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4506,7 +4506,7 @@ copy_private_bfd_data (ibfd, obfd) || (IS_CONTAINED_BY_FILEPOS (section, segment, bed) \ && (section->flags & SEC_ALLOC) == 0)) \ && section->output_section != NULL \ - && section->segment_mark == false) + && ! section->segment_mark) /* Returns true iff seg1 starts after the end of seg2. */ #define SEGMENT_AFTER_SEGMENT(seg1, seg2) \ @@ -5965,8 +5965,8 @@ _bfd_elf_set_section_contents (abfd, section, location, offset, count) bfd_signed_vma pos; if (! abfd->output_has_begun - && ! _bfd_elf_compute_section_file_positions - (abfd, (struct bfd_link_info *) NULL)) + && ! (_bfd_elf_compute_section_file_positions + (abfd, (struct bfd_link_info *) NULL))) return false; hdr = &elf_section_data (section)->this_hdr; diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 939eee5f482..c97e13d051d 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -2223,7 +2223,7 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd) asection *sec; /* Check if we have the same endianess. */ - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 28fecf18aaf..1692cdace14 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -3003,7 +3003,7 @@ cris_elf_merge_private_bfd_data (ibfd, obfd) { flagword old_flags, new_flags; - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c index 4d26b92c585..f2f39468c51 100644 --- a/bfd/elf32-d30v.c +++ b/bfd/elf32-d30v.c @@ -1,5 +1,6 @@ /* D30V-specific support for 32-bit ELF - Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright 1997, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. Contributed by Martin Hunt (hunt@cygnus.com). This file is part of BFD, the Binary File Descriptor library. @@ -313,7 +314,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ - if (howto->pc_relative == true) + if (howto->pc_relative) { tmp_addr = input_section->output_section->vma + input_section->output_offset + reloc_entry->address; @@ -332,7 +333,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, relocation += num; - if (howto->pc_relative == true && howto->bitsize == 32) + if (howto->pc_relative && howto->bitsize == 32) { /* The D30V has a PC that doesn't wrap and PC-relative jumps are signed, so a PC-relative jump can't be more than +/- 2^31 bytes. @@ -422,11 +423,11 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ - if (howto->pc_relative == true) + if (howto->pc_relative) { relocation -= (input_section->output_section->vma + input_section->output_offset); - if (howto->pcrel_offset == true) + if (howto->pcrel_offset) relocation -= reloc_entry->address; } diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 652fb1a776c..e7c6b9386bb 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2428,7 +2428,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section, if (r_type == R_386_TLS_LE_32) { - BFD_ASSERT (unresolved_reloc == false); + BFD_ASSERT (! unresolved_reloc); if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD) { unsigned int val, type; @@ -2578,7 +2578,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section, { if (indx == 0) { - BFD_ASSERT (unresolved_reloc == false); + BFD_ASSERT (! unresolved_reloc); bfd_put_32 (output_bfd, relocation - dtpoff_base (info), htab->sgot->contents + off + 4); diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c index 38e9c13d13c..44ef340898b 100644 --- a/bfd/elf32-mcore.c +++ b/bfd/elf32-mcore.c @@ -311,7 +311,7 @@ mcore_elf_merge_private_bfd_data (ibfd, obfd) flagword new_flags; /* Check if we have the same endianess */ - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 17c5d254a46..a5bc0e4d44a 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -1407,7 +1407,7 @@ ppc_elf_merge_private_bfd_data (ibfd, obfd) boolean error; /* Check if we have the same endianess */ - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index e37d0d14d9a..7ff0f8285ac 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -5525,7 +5525,7 @@ sh_elf_merge_private_data (ibfd, obfd) { flagword old_flags, new_flags; - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c index a14b1ba04d3..7a38fb22410 100644 --- a/bfd/elf32-sh64.c +++ b/bfd/elf32-sh64.c @@ -187,7 +187,7 @@ sh64_elf_merge_private_data (ibfd, obfd) { flagword old_flags, new_flags; - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index 553cb4e0153..ad6807f0f6f 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -1322,7 +1322,7 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err) nop foo: nop */ - if (reloc->howto->pc_relative == true) + if (reloc->howto->pc_relative) { /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index a491ecad8c8..32546f4ed16 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -2606,9 +2606,8 @@ elf64_alpha_read_ecoff_info (abfd, section, debug) if (ext_hdr == NULL && swap->external_hdr_size != 0) goto error_return; - if (bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0, - swap->external_hdr_size) - == false) + if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0, + swap->external_hdr_size)) goto error_return; symhdr = &debug->symbolic_header; diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index ccb87e4a7f4..fb9b539766f 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -2391,7 +2391,7 @@ sh_elf64_merge_private_data (ibfd, obfd) { flagword old_flags, new_flags; - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 590975d3c85..0ae3813f5cb 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -711,7 +711,7 @@ init_insn_reloc (abfd, return bfd_reloc_ok; } - /* This works because partial_inplace == false. */ + /* This works because partial_inplace is false. */ if (output_bfd != NULL) return bfd_reloc_continue; diff --git a/bfd/elfcode.h b/bfd/elfcode.h index f782985a42a..c113dd7d183 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -559,9 +559,9 @@ elf_object_p (abfd) section header table (FIXME: See comments re sections at top of this file). */ - if ((elf_file_p (&x_ehdr) == false) || - (x_ehdr.e_ident[EI_VERSION] != EV_CURRENT) || - (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)) + if (! elf_file_p (&x_ehdr) + || x_ehdr.e_ident[EI_VERSION] != EV_CURRENT + || x_ehdr.e_ident[EI_CLASS] != ELFCLASS) goto got_wrong_format_error; /* Check that file's byte order matches xvec's */ @@ -821,7 +821,7 @@ elf_object_p (abfd) information. */ if (ebd->elf_backend_object_p) { - if ((*ebd->elf_backend_object_p) (abfd) == false) + if (! (*ebd->elf_backend_object_p) (abfd)) goto got_wrong_format_error; } diff --git a/bfd/elfcore.h b/bfd/elfcore.h index c206af5f6c3..7db5f72e333 100644 --- a/bfd/elfcore.h +++ b/bfd/elfcore.h @@ -1,5 +1,5 @@ /* ELF core file support for BFD. - Copyright 1995, 1996, 1997, 1998, 2000, 2001 + Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -100,7 +100,7 @@ elf_core_file_p (abfd) } /* Check the magic number. */ - if (elf_file_p (&x_ehdr) == false) + if (! elf_file_p (&x_ehdr)) goto wrong; /* FIXME: Check EI_VERSION here ! */ @@ -244,7 +244,7 @@ elf_core_file_p (abfd) information. */ if (ebd->elf_backend_object_p) { - if ((*ebd->elf_backend_object_p) (abfd) == false) + if (! (*ebd->elf_backend_object_p) (abfd)) goto wrong; } diff --git a/bfd/elflink.h b/bfd/elflink.h index d4a26528a9e..d78e31f924e 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -2940,7 +2940,7 @@ compute_bucket_count (info) size requires an integer type with more the 32 bits. If BFD_HOST_U_64_BIT is set we know about such a type. */ #ifdef BFD_HOST_U_64_BIT - if (info->optimize == true) + if (info->optimize) { unsigned long int nsyms = hashcodesp - hashcodes; size_t minsize; diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index a2200d50610..f47073448a5 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -610,9 +610,8 @@ _bfd_mips_elf_read_ecoff_info (abfd, section, debug) if (ext_hdr == NULL && swap->external_hdr_size != 0) goto error_return; - if (bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0, - swap->external_hdr_size) - == false) + if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0, + swap->external_hdr_size)) goto error_return; symhdr = &debug->symbolic_header; @@ -7547,7 +7546,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd) asection *sec; /* Check if we have the same endianess */ - if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + if (! _bfd_generic_verify_endian_match (ibfd, obfd)) return false; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour diff --git a/bfd/format.c b/bfd/format.c index f60f0caa6fc..1efa9e24547 100644 --- a/bfd/format.c +++ b/bfd/format.c @@ -1,5 +1,5 @@ /* Generic BFD support for file formats. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001 + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Written by Cygnus Support. @@ -355,7 +355,7 @@ bfd_set_format (abfd, format) } if (abfd->format != bfd_unknown) - return (abfd->format == format) ? true : false; + return abfd->format == format; /* Presume the answer is yes. */ abfd->format = format; diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c index 5ae994bfd6f..cafad3e30d0 100644 --- a/bfd/i386os9k.c +++ b/bfd/i386os9k.c @@ -284,7 +284,7 @@ os9k_set_section_contents (abfd, section, location, offset, count) int count; { - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* set by bfd.c handler */ if (! aout_32_make_sections (abfd)) return false; diff --git a/bfd/ieee.c b/bfd/ieee.c index 2433cc432d6..87e97d04b14 100644 --- a/bfd/ieee.c +++ b/bfd/ieee.c @@ -471,7 +471,7 @@ must_parse_int (ieee) common_header_type *ieee; { bfd_vma result; - BFD_ASSERT (parse_int (ieee, &result) == true); + BFD_ASSERT (parse_int (ieee, &result)); return result; } @@ -983,7 +983,7 @@ ieee_slurp_external_symbols (abfd) /* Fetch the default size if not resolved */ size = must_parse_int (&(ieee->h)); /* Fetch the defautlt value if available */ - if (parse_int (&(ieee->h), &value) == false) + if (! parse_int (&(ieee->h), &value)) { value = 0; } @@ -1058,7 +1058,7 @@ static boolean ieee_slurp_symbol_table (abfd) bfd *abfd; { - if (IEEE_DATA (abfd)->read_symbols == false) + if (! IEEE_DATA (abfd)->read_symbols) { if (! ieee_slurp_external_symbols (abfd)) return false; @@ -1112,7 +1112,7 @@ ieee_get_symtab (abfd, location) if (! ieee_slurp_symbol_table (abfd)) return -1; - if (ieee->symbol_table_full == false) + if (! ieee->symbol_table_full) { /* Arrgh - there are gaps in the table, run through and fill them */ /* up with pointers to a null place */ @@ -1663,11 +1663,11 @@ ieee_object_p (abfd) } next_byte (&(ieee->h)); - if (parse_int (&(ieee->h), &ieee->ad.number_of_bits_mau) == false) + if (! parse_int (&(ieee->h), &ieee->ad.number_of_bits_mau)) { goto fail; } - if (parse_int (&(ieee->h), &ieee->ad.number_of_maus_in_address) == false) + if (! parse_int (&(ieee->h), &ieee->ad.number_of_maus_in_address)) { goto fail; } @@ -1690,7 +1690,7 @@ ieee_object_p (abfd) } ieee->w.offset[part] = parse_i (&(ieee->h), &ok); - if (ok == false) + if (! ok) { goto fail; } @@ -1895,7 +1895,7 @@ do_one (ieee, current_map, location_ptr, s, iterations) case 0: case 4: - if (pcrel == true) + if (pcrel) { #if KEEPMINUSPCININST bfd_put_32 (ieee->h.abfd, -current_map->pc, @@ -1917,7 +1917,7 @@ do_one (ieee, current_map, location_ptr, s, iterations) current_map->pc += 4; break; case 2: - if (pcrel == true) + if (pcrel) { #if KEEPMINUSPCININST bfd_put_16 (ieee->h.abfd, (bfd_vma) -current_map->pc, @@ -1941,7 +1941,7 @@ do_one (ieee, current_map, location_ptr, s, iterations) current_map->pc += 2; break; case 1: - if (pcrel == true) + if (pcrel) { #if KEEPMINUSPCININST bfd_put_8 (ieee->h.abfd, (int) (-current_map->pc), location_ptr + current_map->pc); @@ -1969,7 +1969,7 @@ do_one (ieee, current_map, location_ptr, s, iterations) default: { bfd_vma this_size; - if (parse_int (&(ieee->h), &this_size) == true) + if (parse_int (&(ieee->h), &this_size)) { unsigned int i; for (i = 0; i < this_size; i++) @@ -2007,7 +2007,7 @@ ieee_slurp_section_data (abfd) ieee_per_section_type *current_map = (ieee_per_section_type *) NULL; asection *s; /* Seek to the start of the data area */ - if (ieee->read_data == true) + if (ieee->read_data) return true; ieee->read_data = true; ieee_seek (ieee, ieee->w.r.data_part); @@ -2625,7 +2625,7 @@ ieee_mkobject (abfd) output_buffer = 0; amt = sizeof (ieee_data_type); abfd->tdata.ieee_data = (ieee_data_type *) bfd_zalloc (abfd, amt); - return abfd->tdata.ieee_data ? true : false; + return abfd->tdata.ieee_data != NULL; } static void @@ -3942,7 +3942,7 @@ ieee_bfd_debug_info_accumulate (abfd, section) if (section->owner->xvec != abfd->xvec) return; /* Only bother once per bfd */ - if (ieee->done_debug == true) + if (ieee->done_debug) return; ieee->done_debug = true; diff --git a/bfd/libbfd.c b/bfd/libbfd.c index a397d8215d7..29170a0d561 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -1353,8 +1353,8 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count) return bfd_get_section_contents (abfd, section, w->data, offset, count); } if (offset + count > section->_raw_size - || (bfd_get_file_window (abfd, section->filepos + offset, count, w, true) - == false)) + || ! bfd_get_file_window (abfd, section->filepos + offset, count, w, + true)) return false; return true; #else diff --git a/bfd/linker.c b/bfd/linker.c index 228f088a017..0567a707c31 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -1674,8 +1674,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value, abort (); if (! ((*info->callbacks->constructor) - (info, - c == 'I' ? true : false, + (info, c == 'I', h->root.string, abfd, section, value))) return false; } @@ -2391,7 +2390,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc) Gross. .bss and similar sections won't have the linker_mark field set. */ if ((sym->section->flags & SEC_HAS_CONTENTS) != 0 - && sym->section->linker_mark == false) + && ! sym->section->linker_mark) output = false; if (output) diff --git a/bfd/mmo.c b/bfd/mmo.c index 3238e2240b4..7bf064dfc4c 100644 --- a/bfd/mmo.c +++ b/bfd/mmo.c @@ -481,7 +481,7 @@ mmo_init () static const char letters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789:_"; - if (inited == true) + if (inited) return; inited = true; @@ -846,10 +846,9 @@ mmo_write_chunk (abfd, loc, len) if (loc[0] == LOP) mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT); - retval - = (retval == true - && abfd->tdata.mmo_data->have_error == false - && 4 == bfd_bwrite ((PTR) loc, 4, abfd)); + retval = (retval + && ! abfd->tdata.mmo_data->have_error + && 4 == bfd_bwrite ((PTR) loc, 4, abfd)); loc += 4; len -= 4; @@ -861,7 +860,7 @@ mmo_write_chunk (abfd, loc, len) abfd->tdata.mmo_data->byte_no = len; } - if (retval == false) + if (! retval) abfd->tdata.mmo_data->have_error = true; return retval; } @@ -882,7 +881,7 @@ mmo_flush_chunk (abfd) abfd->tdata.mmo_data->byte_no = 0; } - return abfd->tdata.mmo_data->have_error == false; + return ! abfd->tdata.mmo_data->have_error; } /* Same, but from a list. */ @@ -941,9 +940,8 @@ mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap) /* Update to reflect end of this chunk, with trailing zeros omitted. */ *last_vmap = vma + len; - return - abfd->tdata.mmo_data->have_error == false - && mmo_write_chunk (abfd, loc, len); + return (! abfd->tdata.mmo_data->have_error + && mmo_write_chunk (abfd, loc, len)); } /* Same, but from a list. */ @@ -1161,7 +1159,7 @@ mmo_get_byte (abfd) if (abfd->tdata.mmo_data->byte_no == 0) { - if (abfd->tdata.mmo_data->have_error == false + if (! abfd->tdata.mmo_data->have_error && bfd_bread (abfd->tdata.mmo_data->buf, 4, abfd) != 4) { abfd->tdata.mmo_data->have_error = true; @@ -1188,7 +1186,7 @@ mmo_write_byte (abfd, value) abfd->tdata.mmo_data->buf[(abfd->tdata.mmo_data->byte_no++ % 4)] = value; if ((abfd->tdata.mmo_data->byte_no % 4) == 0) { - if (abfd->tdata.mmo_data->have_error == false + if (! abfd->tdata.mmo_data->have_error && bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4) abfd->tdata.mmo_data->have_error = true; } @@ -1354,7 +1352,7 @@ SUBSECTION bfd_byte m = mmo_get_byte (abfd); /* Check first if we have a bad hair day. */ - if (abfd->tdata.mmo_data->have_error == true) + if (abfd->tdata.mmo_data->have_error) return false; if (m & MMO3_LEFT) @@ -1438,7 +1436,7 @@ SUBSECTION serno -= 128; /* Got it. Now enter it. Skip a leading ":". */ - if (abfd->tdata.mmo_data->have_error == false + if (! abfd->tdata.mmo_data->have_error && ! mmo_create_symbol (abfd, abfd->tdata.mmo_data->lop_stab_symbol + 1, @@ -1457,7 +1455,7 @@ SUBSECTION /* Traverse right trie. */ mmo_get_symbols (abfd); - return abfd->tdata.mmo_data->have_error == false; + return ! abfd->tdata.mmo_data->have_error; } /* Get the location of memory area [VMA..VMA + SIZE - 1], which we think @@ -2060,7 +2058,7 @@ mmo_scan (abfd) for (i = 0; i < sizeof (file_names) / sizeof (file_names[0]); i++) if (file_names[i]) free (file_names[i]); - return error ? false : true; + return ! error; } /* A hook to set up object file dependent section information. For mmo, @@ -2335,9 +2333,7 @@ mmo_internal_write_post (abfd, z, sec) Z == 255, don't assume DATA is valid. */ bfd_put_64 (abfd, bfd_get_start_address (abfd), buf); - return - abfd->tdata.mmo_data->have_error == false - && bfd_bwrite (buf, 8, abfd) == 8; + return ! abfd->tdata.mmo_data->have_error && bfd_bwrite (buf, 8, abfd) == 8; } /* Translate to and from BFD flags. This is to make sure that we don't @@ -2442,11 +2438,10 @@ mmo_internal_write_section (abfd, sec) { int n = atoi (sec->name + strlen (MMIX_OTHER_SPEC_SECTION_PREFIX)); mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_SPEC << 16) | n); - return - abfd->tdata.mmo_data->have_error == false - && mmo_write_chunk_list (abfd, - ((struct mmo_section_data_struct *) - (sec->used_by_bfd))->head); + return (! abfd->tdata.mmo_data->have_error + && mmo_write_chunk_list (abfd, + ((struct mmo_section_data_struct *) + (sec->used_by_bfd))->head)); } /* Ignore sections that are just allocated or empty; we write out _contents_ here. */ @@ -2563,13 +2558,13 @@ EXAMPLE /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually loaded. */ if (bfd_get_section_flags (abfd, sec) & SEC_LOAD) - return - abfd->tdata.mmo_data->have_error == false + return + ! abfd->tdata.mmo_data->have_error && mmo_write_loc_chunk_list (abfd, ((struct mmo_section_data_struct *) (sec->used_by_bfd))->head); return - abfd->tdata.mmo_data->have_error == false + ! abfd->tdata.mmo_data->have_error && mmo_write_chunk_list (abfd, ((struct mmo_section_data_struct *) (sec->used_by_bfd))->head); @@ -3088,7 +3083,7 @@ mmo_write_section_unless_reg_contents (abfd, sec, p) { struct mmo_write_sec_info *infop = (struct mmo_write_sec_info *) p; - if (infop->retval == false) + if (! infop->retval) return; if (strcmp (sec->name, MMIX_REG_CONTENTS_SECTION_NAME) == 0) @@ -3139,7 +3134,7 @@ mmo_write_object_contents (abfd) bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents, (PTR) &wsecinfo); - if (wsecinfo.retval == false) + if (! wsecinfo.retval) return false; if (wsecinfo.reg_section != NULL) diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c index 0d3919e2d53..6099c2b016e 100644 --- a/bfd/nlm32-alpha.c +++ b/bfd/nlm32-alpha.c @@ -1,5 +1,5 @@ /* Support for 32-bit Alpha NLM (NetWare Loadable Module) - Copyright 1993, 1994, 2000, 2001 Free Software Foundation, Inc. + Copyright 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -654,9 +654,7 @@ nlm_alpha_read_import (abfd, sym) { asection *section; - if (nlm_alpha_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) + if (! nlm_alpha_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) return false; nlm_relocs -> section = section; nlm_relocs++; @@ -846,18 +844,17 @@ nlm_alpha_write_external (abfd, count, sym, relocs) r.address = nlm_alpha_backend_data (abfd)->lita_address; r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1; - if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false) + if (! nlm_alpha_write_import (abfd, (asection *) NULL, &r)) return false; r.address = nlm_alpha_backend_data (abfd)->gp; r.addend = 0; - if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false) + if (! nlm_alpha_write_import (abfd, (asection *) NULL, &r)) return false; for (i = 0; i < count; i++) { - if (nlm_alpha_write_import (abfd, relocs[i].sec, - relocs[i].rel) == false) + if (! nlm_alpha_write_import (abfd, relocs[i].sec, relocs[i].rel)) return false; } diff --git a/bfd/nlm32-i386.c b/bfd/nlm32-i386.c index 32b05b4eb08..095ab63f96c 100644 --- a/bfd/nlm32-i386.c +++ b/bfd/nlm32-i386.c @@ -1,5 +1,5 @@ /* Support for 32-bit i386 NLM (NetWare Loadable Module) - Copyright 1993, 1994, 2000, 2001 Free Software Foundation, Inc. + Copyright 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -378,9 +378,7 @@ nlm_i386_read_import (abfd, sym) { asection *section; - if (nlm_i386_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) + if (! nlm_i386_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) return false; nlm_relocs -> section = section; nlm_relocs++; @@ -414,8 +412,7 @@ nlm_i386_write_external (abfd, count, sym, relocs) for (i = 0; i < count; i++) { - if (nlm_i386_write_import (abfd, relocs[i].sec, - relocs[i].rel) == false) + if (! nlm_i386_write_import (abfd, relocs[i].sec, relocs[i].rel)) return false; } diff --git a/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c index 98410a8d50a..884b85a818f 100644 --- a/bfd/nlm32-ppc.c +++ b/bfd/nlm32-ppc.c @@ -1,5 +1,5 @@ /* Support for 32-bit PowerPC NLM (NetWare Loadable Module) - Copyright 1994, 1995, 2000, 2001 Free Software Foundation, Inc. + Copyright 1994, 1995, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -689,9 +689,7 @@ nlm_powerpc_read_import (abfd, sym) { asection *section; - if (nlm_powerpc_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) + if (! nlm_powerpc_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) return false; nlm_relocs -> section = section; nlm_relocs++; diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c index 0246dd2402a..76b7328f991 100644 --- a/bfd/nlm32-sparc.c +++ b/bfd/nlm32-sparc.c @@ -1,5 +1,5 @@ /* Support for 32-bit SPARC NLM (NetWare Loadable Module) - Copyright 1993, 1994, 2000, 2001 Free Software Foundation, Inc. + Copyright 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -296,9 +296,7 @@ nlm_sparc_read_import (abfd, sym) { asection *section; - if (nlm_sparc_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) + if (! nlm_sparc_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) return false; nlm_relocs -> section = section; nlm_relocs++; @@ -342,7 +340,7 @@ nlm_sparc_write_import (abfd, sec, rel) bfd_put_32 (abfd, (bfd_vma) 1, temp); if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4) return false; - if (nlm_sparc_write_reloc (abfd, sec, rel) == false) + if (! nlm_sparc_write_reloc (abfd, sec, rel)) return false; return true; } @@ -372,8 +370,7 @@ nlm_sparc_write_external (abfd, count, sym, relocs) for (i = 0; i < count; i++) { - if (nlm_sparc_write_reloc (abfd, relocs[i].sec, - relocs[i].rel) == false) + if (! nlm_sparc_write_reloc (abfd, relocs[i].sec, relocs[i].rel)) return false; } diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h index d4501d066fb..741cb323343 100644 --- a/bfd/nlmcode.h +++ b/bfd/nlmcode.h @@ -1,5 +1,5 @@ /* NLM (NetWare Loadable Module) executable support for BFD. - Copyright 1993, 1994, 1995, 1998, 2000, 2001 + Copyright 1993, 1994, 1995, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. Written by Fred Fish @ Cygnus Support, using ELF support as the @@ -936,7 +936,7 @@ nlm_get_symtab (abfd, alocation) nlm_symbol_type *symbase; bfd_size_type counter = 0; - if (nlm_slurp_symbol_table (abfd) == false) + if (! nlm_slurp_symbol_table (abfd)) return -1; symbase = nlm_get_symbols (abfd); while (counter < bfd_get_symcount (abfd)) @@ -1095,7 +1095,7 @@ nlm_slurp_symbol_table (abfd) { /* Most backends can use the code below, but unfortunately some use a different scheme. */ - if ((*set_public_section_func) (abfd, sym) == false) + if (! (*set_public_section_func) (abfd, sym)) return false; } else @@ -1181,7 +1181,7 @@ nlm_slurp_symbol_table (abfd) symcount += i_fxdhdrp->numberOfExternalReferences; while (abfd->symcount < symcount) { - if ((*read_import_func) (abfd, sym) == false) + if (! (*read_import_func) (abfd, sym)) return false; sym++; abfd->symcount++; @@ -1238,7 +1238,7 @@ nlm_slurp_reloc_fixups (abfd) the machine specific reloc information is. */ while (count-- != 0) { - if ((*read_func) (abfd, (nlm_symbol_type *) NULL, secs, rels) == false) + if (! (*read_func) (abfd, (nlm_symbol_type *) NULL, secs, rels)) { nlm_relocation_fixups (abfd) = NULL; nlm_relocation_fixup_secs (abfd) = NULL; @@ -1274,7 +1274,7 @@ nlm_get_reloc_upper_bound (abfd, sec) syms = nlm_get_symbols (abfd); if (syms == NULL) { - if (nlm_slurp_symbol_table (abfd) == false) + if (! nlm_slurp_symbol_table (abfd)) return -1; syms = nlm_get_symbols (abfd); } @@ -1309,7 +1309,7 @@ nlm_canonicalize_reloc (abfd, sec, relptr, symbols) rels = nlm_relocation_fixups (abfd); if (rels == NULL) { - if (nlm_slurp_reloc_fixups (abfd) == false) + if (! nlm_slurp_reloc_fixups (abfd)) return -1; rels = nlm_relocation_fixups (abfd); } @@ -1386,7 +1386,7 @@ nlm_compute_section_file_positions (abfd) asection *bss_sec; asymbol **sym_ptr_ptr; - if (abfd->output_has_begun == true) + if (abfd->output_has_begun) return true; /* Make sure we have a section to hold uninitialized data. */ @@ -1587,8 +1587,8 @@ nlm_set_section_contents (abfd, section, location, offset, count) file_ptr offset; bfd_size_type count; { - if (abfd->output_has_begun == false - && nlm_compute_section_file_positions (abfd) == false) + if (! abfd->output_has_begun + && ! nlm_compute_section_file_positions (abfd)) return false; if (count == 0) @@ -1690,16 +1690,16 @@ nlm_write_object_contents (abfd) if (fixed_header == NULL) goto error_return; - if (abfd->output_has_begun == false - && nlm_compute_section_file_positions (abfd) == false) + if (! abfd->output_has_begun + && ! nlm_compute_section_file_positions (abfd)) goto error_return; /* Write out the variable length headers. */ pos = nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd); if (bfd_seek (abfd, pos, SEEK_SET) != 0) goto error_return; - if (nlm_swap_variable_header_out (abfd) == false - || nlm_swap_auxiliary_headers_out (abfd) == false) + if (! nlm_swap_variable_header_out (abfd) + || ! nlm_swap_auxiliary_headers_out (abfd)) { bfd_set_error (bfd_error_system_call); goto error_return; @@ -1760,7 +1760,7 @@ nlm_write_object_contents (abfd) if (! bfd_is_und_section (bfd_get_section (sym))) { ++internal_reloc_count; - if ((*write_import_func) (abfd, sec, rel) == false) + if (! (*write_import_func) (abfd, sec, rel)) goto error_return; } else @@ -1832,9 +1832,8 @@ nlm_write_object_contents (abfd) j++) ++cnt; - if ((*nlm_write_external_func (abfd)) (abfd, cnt, sym, - &external_relocs[i]) - == false) + if (! (*nlm_write_external_func (abfd)) (abfd, cnt, sym, + &external_relocs[i])) goto error_return; i += cnt; @@ -1902,7 +1901,7 @@ nlm_write_object_contents (abfd) if (write_export_func) { - if ((*write_export_func) (abfd, sym, offset) == false) + if (! (*write_export_func) (abfd, sym, offset)) goto error_return; } else @@ -2036,7 +2035,7 @@ nlm_write_object_contents (abfd) write_prefix_func = nlm_write_prefix_func (abfd); if (write_prefix_func) { - if ((*write_prefix_func) (abfd) == false) + if (! (*write_prefix_func) (abfd)) goto error_return; } diff --git a/bfd/oasys.c b/bfd/oasys.c index 17fc735d779..9035a4fddda 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -254,7 +254,7 @@ oasys_get_symtab (abfd, location) { asymbol *symbase; unsigned int counter; - if (oasys_slurp_symbol_table (abfd) == false) + if (! oasys_slurp_symbol_table (abfd)) { return -1; } @@ -411,7 +411,7 @@ oasys_mkobject (abfd) { bfd_size_type amt = sizeof (oasys_data_type); abfd->tdata.oasys_obj_data = (oasys_data_type *) bfd_alloc (abfd, amt); - return abfd->tdata.oasys_obj_data ? true : false; + return abfd->tdata.oasys_obj_data != NULL; } #define MAX_SECS 16 @@ -496,7 +496,7 @@ oasys_object_p (abfd) case oasys_record_is_module_enum: case oasys_record_is_named_section_enum: case oasys_record_is_end_enum: - if (had_usefull == false) + if (! had_usefull) goto fail; loop = false; break; @@ -600,7 +600,7 @@ oasys_slurp_section_data (abfd) for (s = abfd->sections; s != (asection *) NULL; s = s->next) { per = oasys_per_section (s); - if (per->initialized == true) + if (per->initialized) return true; } @@ -632,7 +632,7 @@ oasys_slurp_section_data (abfd) per = oasys_per_section (section); - if (per->initialized == false) + if (! per->initialized) { per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size); if (!per->data) @@ -646,7 +646,7 @@ oasys_slurp_section_data (abfd) } dst_offset = H_GET_32 (abfd, record.data.addr); - if (per->had_vma == false) + if (! per->had_vma) { /* Take the first vma we see as the base */ section->vma = dst_offset; @@ -728,16 +728,13 @@ oasys_slurp_section_data (abfd) r->relent.sym_ptr_ptr = (asymbol **) NULL; section->reloc_count++; - /* Fake up the data to look like it's got the -ve pc in it, this makes - it much easier to convert into other formats. This is done by - hitting the addend. - */ - if (r->relent.howto->pc_relative == true) - { - r->relent.addend -= dst_ptr - dst_base_ptr; - } - - + /* Fake up the data to look like + it's got the -ve pc in it, this + makes it much easier to convert + into other formats. This is done + by hitting the addend. */ + if (r->relent.howto->pc_relative) + r->relent.addend -= dst_ptr - dst_base_ptr; } break; @@ -772,17 +769,13 @@ oasys_slurp_section_data (abfd) section->reloc_count++; src += 2; - /* Fake up the data to look like it's got the -ve pc in it, this makes - it much easier to convert into other formats. This is done by - hitting the addend. - */ - if (r->relent.howto->pc_relative == true) - { - r->relent.addend -= dst_ptr - dst_base_ptr; - } - - - + /* Fake up the data to look like + it's got the -ve pc in it, this + makes it much easier to convert + into other formats. This is done + by hitting the addend. */ + if (r->relent.howto->pc_relative) + r->relent.addend -= dst_ptr - dst_base_ptr; } break; case RELOCATION_TYPE_COM: @@ -850,7 +843,7 @@ oasys_get_section_contents (abfd, section, location, offset, count) { oasys_per_section_type *p = (oasys_per_section_type *) section->used_by_bfd; oasys_slurp_section_data (abfd); - if (p->initialized == false) + if (! p->initialized) { (void) memset (location, 0, (size_t) count); } diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 90db56b9875..cb47f78bf25 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -1479,9 +1479,9 @@ aout_get_external_symbols (abfd) count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE; #ifdef USE_MMAP - if (bfd_get_file_window (abfd, - obj_sym_filepos (abfd), exec_hdr (abfd)->a_syms, - &obj_aout_sym_window (abfd), true) == false) + if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd), + exec_hdr (abfd)->a_syms, + &obj_aout_sym_window (abfd), true)) return false; syms = (struct external_nlist *) obj_aout_sym_window (abfd).data; #else @@ -1520,8 +1520,8 @@ aout_get_external_symbols (abfd) stringsize = H_GET_32 (abfd, string_chars); #ifdef USE_MMAP - if (bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize, - &obj_aout_string_window (abfd), true) == false) + if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize, + &obj_aout_string_window (abfd), true)) return false; strings = (char *) obj_aout_string_window (abfd).data; #else diff --git a/bfd/peicode.h b/bfd/peicode.h index 323b30d89d0..c20e9a3dfbd 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -1,5 +1,5 @@ /* Support for the generic parts of PE/PEI, for BFD. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Written by Cygnus Solutions. @@ -312,7 +312,7 @@ pe_mkobject_hook (abfd, filehdr, aouthdr) struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr; pe_data_type *pe; - if (pe_mkobject (abfd) == false) + if (! pe_mkobject (abfd)) return NULL; pe = pe_data (abfd); diff --git a/bfd/reloc.c b/bfd/reloc.c index 8d5ee15d81c..2e10dce34d6 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -645,7 +645,7 @@ bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd, reloc_target_output_section = symbol->section->output_section; /* Convert input-section-relative symbol value to absolute. */ - if (output_bfd && howto->partial_inplace == false) + if (output_bfd && ! howto->partial_inplace) output_base = 0; else output_base = reloc_target_output_section->vma; @@ -658,7 +658,7 @@ bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd, /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ - if (howto->pc_relative == true) + if (howto->pc_relative) { /* This is a PC relative relocation. We want to set RELOCATION to the distance between the address of the symbol and the @@ -691,13 +691,13 @@ bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd, relocation -= input_section->output_section->vma + input_section->output_offset; - if (howto->pcrel_offset == true) + if (howto->pcrel_offset) relocation -= reloc_entry->address; } if (output_bfd != (bfd *) NULL) { - if (howto->partial_inplace == false) + if (! howto->partial_inplace) { /* This is a partial relocation, and we want to apply the relocation to the reloc entry rather than the raw data. Modify the reloc @@ -1037,7 +1037,7 @@ bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset, reloc_target_output_section = symbol->section->output_section; /* Convert input-section-relative symbol value to absolute. */ - if (howto->partial_inplace == false) + if (! howto->partial_inplace) output_base = 0; else output_base = reloc_target_output_section->vma; @@ -1050,7 +1050,7 @@ bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset, /* Here the variable relocation holds the final address of the symbol we are relocating against, plus any addend. */ - if (howto->pc_relative == true) + if (howto->pc_relative) { /* This is a PC relative relocation. We want to set RELOCATION to the distance between the address of the symbol and the @@ -1083,11 +1083,11 @@ bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset, relocation -= input_section->output_section->vma + input_section->output_offset; - if (howto->pcrel_offset == true && howto->partial_inplace == true) + if (howto->pcrel_offset && howto->partial_inplace) relocation -= reloc_entry->address; } - if (howto->partial_inplace == false) + if (! howto->partial_inplace) { /* This is a partial relocation, and we want to apply the relocation to the reloc entry rather than the raw data. Modify the reloc diff --git a/bfd/som.c b/bfd/som.c index 68c561c9b36..edc691e34ea 100644 --- a/bfd/som.c +++ b/bfd/som.c @@ -1740,7 +1740,7 @@ som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset) int found; /* som_mkobject will set bfd_error if som_mkobject fails. */ - if (som_mkobject (abfd) != true) + if (! som_mkobject (abfd)) return 0; /* Set BFD flags based on what information is available in the SOM. */ @@ -1905,9 +1905,9 @@ setup_sections (abfd, file_hdr, current_offset) space_asect->flags |= SEC_DEBUGGING; /* Set up all the attributes for the space. */ - if (bfd_som_set_section_attributes (space_asect, space.is_defined, - space.is_private, space.sort_key, - space.space_number) == false) + if (! bfd_som_set_section_attributes (space_asect, space.is_defined, + space.is_private, space.sort_key, + space.space_number)) goto error_return; /* If the space has no subspaces, then we're done. */ @@ -1968,10 +1968,10 @@ setup_sections (abfd, file_hdr, current_offset) goto error_return; /* Store private information about the section. */ - if (bfd_som_set_subsection_attributes (subspace_asect, space_asect, - subspace.access_control_bits, - subspace.sort_key, - subspace.quadrant) == false) + if (! bfd_som_set_subsection_attributes (subspace_asect, space_asect, + subspace.access_control_bits, + subspace.sort_key, + subspace.quadrant)) goto error_return; /* Keep an easy mapping between subspaces and sections. @@ -3457,7 +3457,7 @@ som_begin_writing (abfd) obj_som_file_hdr (abfd)->space_strings_location = current_offset; /* Scribble out the space strings. */ - if (som_write_space_strings (abfd, current_offset, &strings_size) == false) + if (! som_write_space_strings (abfd, current_offset, &strings_size)) return false; /* Record total string table size in the header and update the @@ -3727,10 +3727,9 @@ som_finish_writing (abfd) obj_som_file_hdr (abfd)->symbol_strings_location = current_offset; /* Scribble out the symbol strings. */ - if (som_write_symbol_strings (abfd, current_offset, syms, - num_syms, &strings_size, - obj_som_compilation_unit (abfd)) - == false) + if (! som_write_symbol_strings (abfd, current_offset, syms, + num_syms, &strings_size, + obj_som_compilation_unit (abfd))) return false; /* Record total string table size in header and update the @@ -3751,7 +3750,7 @@ som_finish_writing (abfd) /* Write the fixups and update fields in subspace headers which relate to the fixup stream. */ - if (som_write_fixups (abfd, current_offset, &total_reloc_size) == false) + if (! som_write_fixups (abfd, current_offset, &total_reloc_size)) return false; /* Record the total size of the fixup stream in the file header. */ @@ -3762,7 +3761,7 @@ som_finish_writing (abfd) /* Now that the symbol table information is complete, build and write the symbol table. */ - if (som_build_and_write_symbol_table (abfd) == false) + if (! som_build_and_write_symbol_table (abfd)) return false; /* Subspaces are written first so that we can set up information @@ -4191,7 +4190,7 @@ static boolean som_write_object_contents (abfd) bfd *abfd; { - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* Set up fixed parts of the file, space, and subspace headers. Notify the world that output has begun. */ @@ -5036,7 +5035,7 @@ som_canonicalize_reloc (abfd, section, relptr, symbols) arelent *tblptr; int count; - if (som_slurp_reloc_table (abfd, section, symbols, false) == false) + if (! som_slurp_reloc_table (abfd, section, symbols, false)) return -1; count = section->reloc_count; @@ -5339,7 +5338,7 @@ som_set_section_contents (abfd, section, location, offset, count) file_ptr offset; bfd_size_type count; { - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* Set up fixed parts of the file, space, and subspace headers. Notify the world that output has begun. */ @@ -5749,8 +5748,7 @@ som_slurp_armap (abfd) } /* Count the number of symbols in the library symbol table. */ - if (som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count) - == false) + if (! som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count)) return false; /* Get back to the start of the library symbol table. */ @@ -5767,8 +5765,7 @@ som_slurp_armap (abfd) return false; /* Now fill in the canonical archive symbols. */ - if (som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs) - == false) + if (! som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs)) return false; /* Seek back to the "first" file in the archive. Note the "first" @@ -5814,7 +5811,7 @@ som_bfd_prep_for_ar_write (abfd, num_syms, stringsize) /* Make sure the symbol table has been read, then snag a pointer to it. It's a little slimey to grab the symbols via obj_som_symtab, but doing so avoids allocating lots of extra memory. */ - if (som_slurp_symbol_table (curr_bfd) == false) + if (! som_slurp_symbol_table (curr_bfd)) return false; sym = obj_som_symtab (curr_bfd); @@ -5969,7 +5966,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength) /* Make sure the symbol table has been read, then snag a pointer to it. It's a little slimey to grab the symbols via obj_som_symtab, but doing so avoids allocating lots of extra memory. */ - if (som_slurp_symbol_table (curr_bfd) == false) + if (! som_slurp_symbol_table (curr_bfd)) goto error_return; sym = obj_som_symtab (curr_bfd); @@ -6205,7 +6202,7 @@ som_write_armap (abfd, elength, map, orl_count, stridx) /* Count how many symbols we will have on the hash chains and the size of the associated string table. */ - if (som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize) == false) + if (! som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize)) return false; lst_size += sizeof (struct lst_symbol_record) * nsyms; diff --git a/bfd/srec.c b/bfd/srec.c index e7a27be2ce6..4034e353865 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -160,7 +160,7 @@ srec_init () { static boolean inited = false; - if (inited == false) + if (! inited) { inited = true; hex_init (); diff --git a/bfd/tekhex.c b/bfd/tekhex.c index 034ef28b867..19dcb875597 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -242,7 +242,7 @@ tekhex_init () static boolean inited = false; int val; - if (inited == false) + if (! inited) { inited = true; hex_init (); @@ -485,7 +485,7 @@ pass_over (abfd, func) /* To the front of the file */ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) abort (); - while (eof == false) + while (! eof) { char buffer[MAXCHUNK]; char *src = buffer; @@ -677,7 +677,7 @@ tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do) bfd_size_type bytes_to_do; { - if (abfd->output_has_begun == false) + if (! abfd->output_has_begun) { /* The first time around, allocate enough sections to hold all the chunks */ asection *s = abfd->sections; diff --git a/bfd/vms.c b/bfd/vms.c index 60326179b32..c9d8ab6efd9 100644 --- a/bfd/vms.c +++ b/bfd/vms.c @@ -430,7 +430,7 @@ vms_object_p (abfd) if ((prev_type == EOBJ_S_C_EGSD) && (PRIV (rec_type) != EOBJ_S_C_EGSD)) { - if (vms_fixup_sections (abfd) == false) + if (! vms_fixup_sections (abfd)) { #if VMS_DEBUG vms_debug (2, "vms_fixup_sections failed\n"); @@ -496,7 +496,7 @@ vms_object_p (abfd) if (target_vector == &vms_vax_vec) { - if (vms_fixup_sections (abfd) == false) + if (! vms_fixup_sections (abfd)) { #if VMS_DEBUG vms_debug (2, "vms_fixup_sections failed\n"); diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c index 7215b1bc64a..c1793544e33 100644 --- a/bfd/xcofflink.c +++ b/bfd/xcofflink.c @@ -2878,7 +2878,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, } /* __rtinit */ - if (info->init_function || info->fini_function || rtld == true) + if (info->init_function || info->fini_function || rtld) { struct xcoff_link_hash_entry *hsym; struct internal_ldsym *ldsym; -- 2.39.2