diff options
| author | Alan Modra <amodra@gmail.com> | 2013-01-26 02:08:01 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-01-26 02:08:01 +0000 |
| commit | c9ba0c87bf3595762506825b30f0ebcb9da53129 (patch) | |
| tree | 9de13a5457cd32f950d7d63cf1b2bb0fc000779b /bfd/mach-o.c | |
| parent | 39c88814382afb7476b342dc3e1333171d72a144 (diff) | |
| download | gdb-c9ba0c87bf3595762506825b30f0ebcb9da53129.zip gdb-c9ba0c87bf3595762506825b30f0ebcb9da53129.tar.gz gdb-c9ba0c87bf3595762506825b30f0ebcb9da53129.tar.bz2 | |
* 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/mach-o.c')
| -rw-r--r-- | bfd/mach-o.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/bfd/mach-o.c b/bfd/mach-o.c index c853ba1..7f4b968 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -4177,10 +4177,9 @@ bfd_mach_o_header_p (bfd *abfd, bfd_mach_o_filetype filetype, bfd_mach_o_cpu_type cputype) { - struct bfd_preserve preserve; bfd_mach_o_header header; + bfd_mach_o_data_struct *mdata; - preserve.marker = NULL; if (!bfd_mach_o_read_header (abfd, &header)) goto wrong; @@ -4226,24 +4225,19 @@ bfd_mach_o_header_p (bfd *abfd, } } - preserve.marker = bfd_zalloc (abfd, sizeof (bfd_mach_o_data_struct)); - if (preserve.marker == NULL - || !bfd_preserve_save (abfd, &preserve)) + mdata = (bfd_mach_o_data_struct *) bfd_zalloc (abfd, sizeof (*mdata)); + if (mdata == NULL) goto fail; - if (!bfd_mach_o_scan (abfd, &header, - (bfd_mach_o_data_struct *) preserve.marker)) + if (!bfd_mach_o_scan (abfd, &header, mdata)) 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; } |