diff options
author | Alan Modra <amodra@gmail.com> | 2016-09-30 13:00:18 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2016-09-30 15:17:44 +0930 |
commit | 4eca02287cf48e60ee89338ddd35f8d0d8257a51 (patch) | |
tree | 8ca78e581fa1260b8a1073e7e1a92d46e8bfabf6 /bfd/mmo.c | |
parent | 4519d071387f374932616b588ddb4ec8cabe2a52 (diff) | |
download | gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.zip gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.tar.gz gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.tar.bz2 |
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
Diffstat (limited to 'bfd/mmo.c')
-rw-r--r-- | bfd/mmo.c | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -463,7 +463,7 @@ mmo_make_section (bfd *abfd, const char *secname) if (newsecname == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: No core to allocate section name %s\n"), bfd_get_filename (abfd), secname); bfd_set_error (bfd_error_system_call); @@ -538,7 +538,7 @@ mmo_object_p (bfd *abfd) if (abfd->tdata.mmo_data->lop_stab_symbol == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: No core to allocate a symbol %d bytes long\n"), bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length); goto bad_final; @@ -951,7 +951,7 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, group-wise aligned. */ if ((vma & 3) != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: attempt to emit contents at non-multiple-of-4 address 0x%lx\n"), bfd_get_filename (abfd), (unsigned long) vma); bfd_set_error (bfd_error_bad_value); @@ -1247,7 +1247,7 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum && bfd_get_start_address (abfd) != addr && !mmo_ignore_symbol_consistency (abfd)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"), bfd_get_filename (abfd)); bfd_set_error (bfd_error_bad_value); @@ -1392,7 +1392,7 @@ SUBSECTION abfd->tdata.mmo_data->lop_stab_symbol [abfd->tdata.mmo_data->symbol_position] = 0; - (*_bfd_error_handler) + _bfd_error_handler (_("%s: unsupported wide character sequence" " 0x%02X 0x%02X after symbol name starting with `%s'\n"), bfd_get_filename (abfd), c, c2, @@ -1626,7 +1626,7 @@ mmo_scan (bfd *abfd) switch (buf[1]) { default: - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: unsupported lopcode `%d'\n"), bfd_get_filename (abfd), buf[1]); bfd_set_error (bfd_error_bad_value); @@ -1636,7 +1636,7 @@ mmo_scan (bfd *abfd) /* Quote the next 32-bit word. */ if (y != 0 || z != 1) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"), bfd_get_filename (abfd), y*256+z); bfd_set_error (bfd_error_bad_value); @@ -1672,7 +1672,7 @@ mmo_scan (bfd *abfd) } else { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1721,7 +1721,7 @@ mmo_scan (bfd *abfd) } else { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1760,7 +1760,7 @@ mmo_scan (bfd *abfd) if (y != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"), bfd_get_filename (abfd), y); bfd_set_error (bfd_error_bad_value); @@ -1769,7 +1769,7 @@ mmo_scan (bfd *abfd) if (z != 16 && z != 24) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1792,7 +1792,7 @@ mmo_scan (bfd *abfd) p = vma - 4 * ((delta & 0xffffff) - (1 << z)); else { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"), bfd_get_filename (abfd), buf[0]); bfd_set_error (bfd_error_bad_value); @@ -1815,7 +1815,7 @@ mmo_scan (bfd *abfd) if (fname == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: cannot allocate file name for file number %d, %d bytes\n"), bfd_get_filename (abfd), y, z * 4 + 1); bfd_set_error (bfd_error_system_call); @@ -1835,7 +1835,7 @@ mmo_scan (bfd *abfd) if (file_names[y] != NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: file number %d `%s'," " was already entered as `%s'\n"), bfd_get_filename (abfd), y, fname, file_names[y]); @@ -1848,7 +1848,7 @@ mmo_scan (bfd *abfd) if (file_names[y] == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: file name for number %d" " was not specified before use\n"), bfd_get_filename (abfd), y); @@ -1954,7 +1954,7 @@ mmo_scan (bfd *abfd) /* We read in the symbols now, not later. */ if (y != 0 || z != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: fields y and z of lop_stab" " non-zero, y: %d, z: %d\n"), bfd_get_filename (abfd), y, z); @@ -1990,7 +1990,7 @@ mmo_scan (bfd *abfd) if (statbuf.st_size != curpos) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: lop_end not last item in" " file\n"), bfd_get_filename (abfd)); @@ -2003,7 +2003,7 @@ mmo_scan (bfd *abfd) it. */ if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid mmo file: YZ of lop_end (%ld)" " not equal to the number of tetras to the preceding" " lop_stab (%ld)\n"), @@ -2713,7 +2713,7 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, we discover it and bail out. */ if (trie->sym.name != NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid symbol table: duplicate symbol `%s'\n"), bfd_get_filename (abfd), trie->sym.name); bfd_set_error (bfd_error_bad_value); @@ -2955,7 +2955,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) sprintf_vma (vmas_main, mainvalue); sprintf_vma (vmas_start, vma_start); - (*_bfd_error_handler) + _bfd_error_handler (_("%s: Bad symbol definition: `Main' set to %s rather" " than the start address %s\n"), bfd_get_filename (abfd), vmas_main, vmas_start); @@ -3053,7 +3053,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) There's no specific test-case. */ struct mmo_symbol sym; - (*_bfd_error_handler) + _bfd_error_handler (_("%s: warning: symbol table too large for mmo, larger than 65535" " 32-bit words: %d. Only `Main' will be emitted.\n"), bfd_get_filename (abfd), trie_len); @@ -3098,7 +3098,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) /* I haven't seen this trig. It seems no use claiming this case isn't debugged and abort if we get here. Instead emit a diagnostic and fail "normally". */ - (*_bfd_error_handler) + _bfd_error_handler (_("%s: internal error, symbol table changed size from %d to %d" " words\n"), bfd_get_filename (abfd), trie_len, @@ -3150,7 +3150,7 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) /* Make sure it hasn't got contents. It seems impossible to make it carry contents, so we don't have a test-case for this. */ - (*_bfd_error_handler) + _bfd_error_handler (_("%s: internal error, internal register section %s had" " contents\n"), bfd_get_filename (abfd), sec->name); @@ -3201,18 +3201,18 @@ mmo_write_object_contents (bfd *abfd) if (sec->size == 0) /* There must always be at least one such register. */ - (*_bfd_error_handler) + _bfd_error_handler (_("%s: no initialized registers; section length 0\n"), bfd_get_filename (abfd)); else if (sec->vma > (256 - 32) * 8) /* Provide better error message for the case of too many global registers. */ - (*_bfd_error_handler) + _bfd_error_handler (_("%s: too many initialized registers; section length %ld\n"), bfd_get_filename (abfd), (long) sec->size); else - (*_bfd_error_handler) + _bfd_error_handler (_("%s: invalid start address for initialized registers of" " length %ld: 0x%lx%08lx\n"), bfd_get_filename (abfd), |