Rename the 'obfd' argument to fbsd_nat_target::find_memory_regions.

The argument is passed as a generic cookie value to the supplied
callback and is not necessarily a pointer to a bfd.

gdb/ChangeLog:

	* fbsd-nat.c (fbsd_nat_target::find_memory_regions): Rename 'obfd'
	argument to 'data'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da904f16c2f5213364c0e171b133d12f9f483de3..4014fe4405e7ba6991001fb03bff5d173bba2569 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-08  John Baldwin  <jhb@FreeBSD.org>
+
+       * fbsd-nat.c (fbsd_nat_target::find_memory_regions): Rename 'obfd'
+       argument to 'data'.
+
 2020-07-08  Tom Tromey  <tromey@adacore.com>
 
        * ada-lang.c (ada_exception_message_1): Use read_memory.

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 1d189a250136525244ea0adfe8071b6500fdcdaf..a63ad2a8f28f7122714b36c4b8eb302294e36706 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -86,12 +86,12 @@ fbsd_nat_target::pid_to_exec_file (int pid)
 
 #ifdef HAVE_KINFO_GETVMMAP
 /* Iterate over all the memory regions in the current inferior,
-   calling FUNC for each memory region.  OBFD is passed as the last
+   calling FUNC for each memory region.  DATA is passed as the last
    argument to FUNC.  */
 
 int
 fbsd_nat_target::find_memory_regions (find_memory_region_ftype func,
-                                     void *obfd)
+                                     void *data)
 {
   pid_t pid = inferior_ptid.pid ();
   struct kinfo_vmentry *kve;
@@ -133,7 +133,7 @@ fbsd_nat_target::find_memory_regions (find_memory_region_ftype func,
         Pass MODIFIED as true, we do not know the real modification state.  */
       func (kve->kve_start, size, kve->kve_protection & KVME_PROT_READ,
            kve->kve_protection & KVME_PROT_WRITE,
-           kve->kve_protection & KVME_PROT_EXEC, 1, obfd);
+           kve->kve_protection & KVME_PROT_EXEC, 1, data);
     }
   return 0;
 }
@@ -160,12 +160,12 @@ fbsd_read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end,
 }
 
 /* Iterate over all the memory regions in the current inferior,
-   calling FUNC for each memory region.  OBFD is passed as the last
+   calling FUNC for each memory region.  DATA is passed as the last
    argument to FUNC.  */
 
 int
 fbsd_nat_target::find_memory_regions (find_memory_region_ftype func,
-                                     void *obfd)
+                                     void *data)
 {
   pid_t pid = inferior_ptid.pid ();
   unsigned long start, end, size;
@@ -202,7 +202,7 @@ fbsd_nat_target::find_memory_regions (find_memory_region_ftype func,
 
       /* Invoke the callback function to create the corefile segment.
         Pass MODIFIED as true, we do not know the real modification state.  */
-      func (start, size, read, write, exec, 1, obfd);
+      func (start, size, read, write, exec, 1, data);
     }
 
   return 0;