Patchwork [RFA,v3,04/23] Use gdb_file_up in fbsd-nat.c

login
register
mail settings
Submitter Tom Tromey
Date Aug. 2, 2017, 3:02 p.m.
Message ID <20170802150227.24460-5-tom@tromey.com>
Download mbox | patch
Permalink /patch/21864/
State New
Headers show

Comments

Tom Tromey - Aug. 2, 2017, 3:02 p.m.
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.

ChangeLog
2017-08-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(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c976483..e3ff571 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@ 
 2017-08-02  Tom Tromey  <tom@tromey.com>
 
+	* fbsd-nat.c (fbsd_find_memory_regions): Update.
+
+2017-08-02  Tom Tromey  <tom@tromey.com>
+
 	* cli/cli-cmds.c (find_and_open_script): Change return type.
 	Remove "streamp" and "full_path" parameters.
 	(source_script_with_search): Update.
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 85f5605..833f460 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -161,7 +161,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;
@@ -169,17 +168,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;