darlinghq/darling-gdb
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-gdb.git synced 2025-02-26 04:15:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* objfiles.h (gdb_bfd_close_or_warn): Declare.

Browse Source 
* objfiles.c (gdb_bfd_close_or_warn): New.
	* corelow.c: Include objfiles.h
	(core_close): Use gdb_bfd_close_or_warn.
	* elfread.c (build_id_verify): Ditto.
	* exec.c (exec_close, exec_close_1): Ditto.
This commit is contained in:
Pedro Alves 2010-04-14 17:26:11 +00:00
parent 048d532d6e
commit 516ba65938
6 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2010-04-14 Pedro Alves <pedro@codesourcery.com>
* objfiles.h (gdb_bfd_close_or_warn): Declare.
* objfiles.c (gdb_bfd_close_or_warn): New.
* corelow.c: Include objfiles.h
(core_close): Use gdb_bfd_close_or_warn.
* elfread.c (build_id_verify): Ditto.
* exec.c (exec_close, exec_close_1): Ditto.
2010-04-14 Daniel Jacobowitz <dan@codesourcery.com>
Pedro Alves <pedro@codesourcery.com>

5
gdb/corelow.c
View File

@ -46,6 +46,7 @@
#include "solib.h"
#include "filenames.h"
#include "progspace.h"
#include "objfiles.h"
#ifndef O_LARGEFILE
@ -221,9 +222,7 @@ core_close (int quitting)
core_has_fake_pid = 0;
name = bfd_get_filename (core_bfd);
if (!bfd_close (core_bfd))
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
gdb_bfd_close_or_warn (core_bfd);
xfree (name);
core_bfd = NULL;
}

4
gdb/elfread.c
View File

@ -618,9 +618,7 @@ build_id_verify (const char *filename, struct build_id *check)
else
retval = 1;
if (!bfd_close (abfd))
warning (_("cannot close \"%s\": %s"), filename,
bfd_errmsg (bfd_get_error ()));
gdb_bfd_close_or_warn (abfd);
xfree (found);

8
gdb/exec.c
View File

@ -101,9 +101,7 @@ exec_close (void)
bfd *abfd = exec_bfd;
char *name = bfd_get_filename (abfd);
if (!bfd_close (abfd))
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
gdb_bfd_close_or_warn (abfd);
xfree (name);
/* Removing target sections may close the exec_ops target.
@ -141,9 +139,7 @@ exec_close_1 (int quitting)
}
else if (vp->bfd != exec_bfd)
/* FIXME-leak: We should be freeing vp->name too, I think. */
if (!bfd_close (vp->bfd))
warning (_("cannot close \"%s\": %s"),
vp->name, bfd_errmsg (bfd_get_error ()));
gdb_bfd_close_or_warn (vp->bfd);
xfree (vp);
}

21
gdb/objfiles.c
View File

@ -1471,6 +1471,23 @@ objfiles_changed (void)
get_objfile_pspace_data (current_program_space)->objfiles_changed_p = 1;
}
/* Close ABFD, and warn if that fails. */
int
gdb_bfd_close_or_warn (struct bfd *abfd)
{
int ret;
char *name = bfd_get_filename (abfd);
ret = bfd_close (abfd);
if (!ret)
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
return ret;
}
/* Add reference to ABFD. Returns ABFD. */
struct bfd *
gdb_bfd_ref (struct bfd *abfd)
@ -1519,9 +1536,7 @@ gdb_bfd_unref (struct bfd *abfd)
bfd_usrdata (abfd) = NULL; /* Paranoia. */
name = bfd_get_filename (abfd);
if (!bfd_close (abfd))
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
gdb_bfd_close_or_warn (abfd);
xfree (name);
}

1
gdb/objfiles.h
View File

@ -533,6 +533,7 @@ extern void *objfile_data (struct objfile *objfile,
extern struct bfd *gdb_bfd_ref (struct bfd *abfd);
extern void gdb_bfd_unref (struct bfd *abfd);
extern int gdb_bfd_close_or_warn (struct bfd *abfd);
/* Traverse all object files in the current program space.