diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2013-01-26 02:07:58 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2013-01-26 02:07:58 +0000 |
| commit | 2f8f5697e4df9a119ea0c71aa920756e72fd1775 (patch) | |
| tree | 57903d4313b74fb72a7e9517d2db57f77d8ed7b3 /bfd/xsym.c | |
| parent | 3efc239754ec850208ad8200747f6c5694ea2c82 (diff) | |
| download | gdb-2f8f5697e4df9a119ea0c71aa920756e72fd1775.tar.gz | |
* bfd.c (struct bfd_preserve, bfd_preserve_save, bfd_preserve_restore,
bfd_preserve_finish): Move to..
* format.c: ..here, splitting out..
(bfd_reinit): ..this. New function.
(bfd_check_format_matches): Use bfd_preserve_save/restore to
keep bfd state for a match.
* elfcode.h (elf_object_p): Don't use bfd_preserve_save/restore.
* elfcore.h (elf_core_file_p): Likewise.
* mach-o.c (bfd_mach_o_header_p): Likewise.
* pef.c (bfd_pef_object_p, bfd_pef_xlib_object_p): Likewise.
* xsym.c (bfd_sym_object_p): Likewise.
* mmo.c (mmo_scan): Clear abfd->symcount.
* opncls.c (_bfd_new_bfd): Use a smaller section hash table.
* section.c (bfd_section_list_clear): Clear section_htab.count.
* bfd-in2.h: Regenerate.
Diffstat (limited to 'bfd/xsym.c')
| -rw-r--r-- | bfd/xsym.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/bfd/xsym.c b/bfd/xsym.c index e0819a9b1a8..5000f83195a 100644 --- a/bfd/xsym.c +++ b/bfd/xsym.c @@ -2249,32 +2249,26 @@ bfd_sym_scan (bfd *abfd, bfd_sym_version version, bfd_sym_data_struct *mdata) const bfd_target * bfd_sym_object_p (bfd *abfd) { - struct bfd_preserve preserve; bfd_sym_version version = -1; + bfd_sym_data_struct *mdata; - preserve.marker = NULL; bfd_seek (abfd, 0, SEEK_SET); if (bfd_sym_read_version (abfd, &version) != 0) goto wrong; - preserve.marker = bfd_alloc (abfd, sizeof (bfd_sym_data_struct)); - if (preserve.marker == NULL - || ! bfd_preserve_save (abfd, &preserve)) + mdata = (bfd_sym_data_struct *) bfd_alloc (abfd, sizeof (*mdata)); + if (mdata == NULL) goto fail; - if (bfd_sym_scan (abfd, version, - (bfd_sym_data_struct *) preserve.marker) != 0) + if (bfd_sym_scan (abfd, version, mdata) != 0) goto wrong; - bfd_preserve_finish (abfd, &preserve); return abfd->xvec; wrong: bfd_set_error (bfd_error_wrong_format); fail: - if (preserve.marker != NULL) - bfd_preserve_restore (abfd, &preserve); return NULL; } |