diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/fbsd-nat.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 80b9c2b..0431dc7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-08-03 Tom Tromey <tom@tromey.com> + * fbsd-nat.c (fbsd_find_memory_regions): Update. + +2017-08-03 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; |