From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 04/23] Use gdb_file_up in fbsd-nat.c
Date: Wed, 03 May 2017 22:46:00 -0000 [thread overview]
Message-ID: <20170503224626.2818-5-tom@tromey.com> (raw)
In-Reply-To: <20170503224626.2818-1-tom@tromey.com>
This updates fbsd-nat.c to use gdb_file_up. This removes a use of a
cleanup, and helps remove make_cleanup_fclose in a later patch.
I have no way to test this patch.
2017-05-02 Tom Tromey <tom@tromey.com>
* fbsd-nat.c (fbsd_find_memory_regions): Update.
---
gdb/ChangeLog | 4 ++++
gdb/fbsd-nat.c | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 76c53be..799b727 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2017-05-02 Tom Tromey <tom@tromey.com>
+ * fbsd-nat.c (fbsd_find_memory_regions): Update.
+
+2017-05-02 Tom Tromey <tom@tromey.com>
+
* cli/cli-cmds.c (find_and_open_script): Return gdb_file_p.
Remove "streamp" argument. Change "full_path" to a
unique_xmalloc_ptr.
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index ef5ad1e..3a84abc 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -160,7 +160,6 @@ fbsd_find_memory_regions (struct target_ops *self,
{
pid_t pid = ptid_get_pid (inferior_ptid);
char *mapfilename;
- FILE *mapfile;
unsigned long start, end, size;
char protection[4];
int read, write, exec;
@@ -168,17 +167,16 @@ fbsd_find_memory_regions (struct target_ops *self,
mapfilename = xstrprintf ("/proc/%ld/map", (long) pid);
cleanup = make_cleanup (xfree, mapfilename);
- mapfile = fopen (mapfilename, "r");
+ gdb_file_up mapfile = fopen (mapfilename, "r");
if (mapfile == NULL)
error (_("Couldn't open %s."), mapfilename);
- make_cleanup_fclose (mapfile);
if (info_verbose)
fprintf_filtered (gdb_stdout,
"Reading memory regions from %s\n", mapfilename);
/* Now iterate until end-of-file. */
- while (fbsd_read_mapping (mapfile, &start, &end, &protection[0]))
+ while (fbsd_read_mapping (mapfile.get (), &start, &end, &protection[0]))
{
size = end - start;
--
2.9.3
next prev parent reply other threads:[~2017-05-03 22:46 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 22:46 [RFA 00/23] More miscellaneous C++-ification Tom Tromey
2017-05-03 22:46 ` [RFA 11/23] Remove make_cleanup_free_so Tom Tromey
2017-06-02 18:25 ` Pedro Alves
2017-05-03 22:46 ` [RFA 22/23] Make gdb_buildargv return a unique pointer Tom Tromey
2017-06-05 16:21 ` Pedro Alves
2017-07-23 17:26 ` Tom Tromey
2017-05-03 22:46 ` [RFA 08/23] Remove an unlink cleanup Tom Tromey
2017-06-02 17:37 ` Pedro Alves
2017-05-03 22:46 ` [RFA 21/23] Remove a cleanup in Python Tom Tromey
2017-06-05 13:56 ` Pedro Alves
2017-05-03 22:46 ` [RFA 14/23] Use unique_xmalloc_ptr in jit.c Tom Tromey
2017-06-02 18:42 ` Pedro Alves
2017-06-05 13:09 ` Tom Tromey
2017-05-03 22:46 ` [RFA 07/23] Remove make_cleanup_fclose Tom Tromey
2017-06-02 17:32 ` Pedro Alves
2017-05-03 22:46 ` [RFA 15/23] Use std::vector to avoid cleanups Tom Tromey
2017-06-02 19:22 ` Pedro Alves
2017-07-23 16:06 ` Tom Tromey
2017-05-03 22:46 ` [RFA 05/23] Use gdb_file_up in source.c Tom Tromey
2017-06-02 17:27 ` Pedro Alves
2017-05-03 22:46 ` [RFA 16/23] Remove in_user_command Tom Tromey
2017-06-05 13:27 ` Pedro Alves
2017-05-03 22:46 ` [RFA 19/23] Replace do_restore_instream_cleanup with scoped_restore Tom Tromey
2017-06-05 13:49 ` Pedro Alves
2017-05-03 22:46 ` [RFA 18/23] Use a scoped_restore for command_nest_depth Tom Tromey
2017-06-05 13:38 ` Pedro Alves
2017-05-03 22:46 ` [RFA 06/23] Change open_terminal_stream to return a gdb_file_up Tom Tromey
2017-06-02 17:31 ` Pedro Alves
2017-05-03 22:46 ` [RFA 13/23] Replace tui_restore_gdbout with scoped_restore Tom Tromey
2017-06-02 18:34 ` Pedro Alves
2017-05-03 22:46 ` Tom Tromey [this message]
2017-05-03 23:52 ` [RFA 04/23] Use gdb_file_up in fbsd-nat.c John Baldwin
2017-05-03 22:46 ` [RFA 17/23] Use a scoped_restore for user_call_depth Tom Tromey
2017-06-05 13:32 ` Pedro Alves
2017-06-05 16:56 ` Tom Tromey
2017-05-03 22:46 ` [RFA 10/23] Remove make_cleanup_restore_current_language Tom Tromey
2017-06-02 18:18 ` Pedro Alves
2017-06-05 13:09 ` Tom Tromey
2017-05-03 22:46 ` [RFA 03/23] Use gdb_file_up in find_and_open_script Tom Tromey
2017-06-02 17:24 ` Pedro Alves
2017-07-23 16:08 ` Tom Tromey
2017-05-03 22:46 ` [RFA 01/23] Introduce and use ui_out_emit_table Tom Tromey
2017-06-02 17:04 ` Pedro Alves
2017-05-03 22:46 ` [RFA 20/23] Avoid some manual memory management in Python Tom Tromey
2017-06-05 13:55 ` Pedro Alves
2017-05-03 22:46 ` [RFA 12/23] More uses of scoped_restore Tom Tromey
2017-06-02 18:31 ` Pedro Alves
2017-05-03 22:46 ` [RFA 09/23] Remove close cleanup Tom Tromey
2017-06-02 18:08 ` Pedro Alves
2017-07-19 22:52 ` Tom Tromey
2017-07-31 19:08 ` Simon Marchi
2017-08-01 21:52 ` Tom Tromey
2017-05-03 22:46 ` [RFA 02/23] Introduce and use gdb_file_up Tom Tromey
2017-06-02 17:08 ` Pedro Alves
2017-05-03 22:46 ` [RFA 23/23] Use gdb_argv_up in Python Tom Tromey
2017-06-05 16:29 ` Pedro Alves
2017-07-19 22:52 ` Tom Tromey
2017-07-19 22:51 ` Tom Tromey
2017-05-29 17:31 ` [RFA 00/23] More miscellaneous C++-ification Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170503224626.2818-5-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).