From 40b35c78b62eec2ab41219906a7ea0c0be323499 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 3 Mar 2020 00:08:42 +1030 Subject: [PATCH] Re: bfd_cleanup for object_p I hate files that you can't compile. * cisco-core.c (cisco_core_file_p): Return bfd_cleanup. * hpux-core.c (hpux_core_core_file_p): Update prototype. * sco5-core.c (sco5_core_file_p): Return bfd_cleanup. (core_sco5_vec): Correct initialisers. --- bfd/ChangeLog | 7 +++++++ bfd/cisco-core.c | 10 +++++----- bfd/hpux-core.c | 2 +- bfd/sco5-core.c | 16 ++++++++++------ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4a64400ca64..1f9e20581fe 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2020-03-02 Alan Modra + + * cisco-core.c (cisco_core_file_p): Return bfd_cleanup. + * hpux-core.c (hpux_core_core_file_p): Update prototype. + * sco5-core.c (sco5_core_file_p): Return bfd_cleanup. + (core_sco5_vec): Correct initialisers. + 2020-03-02 Alan Modra * aix386-core.c (aix386_core_file_p): Return bfd_cleanup. diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c index e43982bf08f..b733d142494 100644 --- a/bfd/cisco-core.c +++ b/bfd/cisco-core.c @@ -286,19 +286,19 @@ cisco_core_file_validate (bfd *abfd, int crash_info_loc) return NULL; } -static const bfd_target * +static bfd_cleanup cisco_core_file_p (bfd *abfd) { int *crash_info_locp; - const bfd_target *target = NULL; + bfd_cleanup cleanup = NULL; for (crash_info_locp = crash_info_locs; - *crash_info_locp != -1 && target == NULL; + *crash_info_locp != -1 && cleanup == NULL; crash_info_locp++) { - target = cisco_core_file_validate (abfd, *crash_info_locp); + cleanup = cisco_core_file_validate (abfd, *crash_info_locp); } - return (target); + return cleanup; } static char * diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c index 2b4de9e530e..2ecd4f17d59 100644 --- a/bfd/hpux-core.c +++ b/bfd/hpux-core.c @@ -106,7 +106,7 @@ struct hpux_core_struct static asection *make_bfd_asection (bfd *, const char *, flagword, bfd_size_type, bfd_vma, unsigned int); -static const bfd_target *hpux_core_core_file_p (bfd *); +static bfd_cleanup hpux_core_core_file_p (bfd *); static char *hpux_core_core_file_failing_command (bfd *); static int hpux_core_core_file_failing_signal (bfd *); static void swap_abort (void); diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c index 84dbf4f27fc..71e264da4aa 100644 --- a/bfd/sco5-core.c +++ b/bfd/sco5-core.c @@ -101,7 +101,7 @@ read_uarea (bfd *abfd, int filepos) return &rawptr->u; } -const bfd_cleanup +bfd_cleanup sco5_core_file_p (bfd *abfd) { int coffset_siz, val, nsecs, cheadoffs; @@ -172,7 +172,7 @@ sco5_core_file_p (bfd *abfd) (file_ptr) coffsets.u_stack)) goto fail; - return abfd->xvec; /* Done for version 1 */ + return _bfd_no_cleanup; /* Done for version 1 */ } /* Immediately before coreoffsets region is a long with offset in core @@ -372,12 +372,16 @@ const bfd_target core_sco5_vec = sco5_core_file_p /* a core file */ }, { /* bfd_set_format */ - _bfd_bool_bfd_false_error, bfd_false, - _bfd_bool_bfd_false_error, bfd_false + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error }, { /* bfd_write_contents */ - _bfd_bool_bfd_false_error, bfd_false, - _bfd_bool_bfd_false_error, bfd_false + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error }, BFD_JUMP_TABLE_GENERIC (_bfd_generic), -- 2.30.2