From 0f12b4e58217ed2d8c085cf3a0328d1d8e014e9d Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 31 Aug 2010 18:08:42 +0000 Subject: gdb/ Code cleanup. * defs.h (find_memory_region_ftype): New typedef. (exec_set_find_memory_regions): Use it. * exec.c (exec_set_find_memory_regions): Use find_memory_region_ftype. * fbsd-nat.c (fbsd_find_memory_regions): Likewise. * gcore.c (objfile_find_memory_regions): Likewise. * gnu-nat.c (gnu_find_memory_regions): Likewise. * linux-nat.c (linux_nat_find_memory_regions): Likewise. * procfs.c (iterate_over_mappings_cb_ftype): Remove. (iterate_over_mappings): Rename iterate_over_mappings_cb_ftype to find_memory_region_ftype. (insert_dbx_link_bpt_in_region): Likewise. (iterate_over_mappings): Likewise. Drop the comment part about the function prototype. (find_memory_regions_callback): Use find_memory_region_ftype. (proc_find_memory_regions): Likewise. (info_mappings_callback): Rename iterate_over_mappings_cb_ftype to find_memory_region_ftype. * target.c (dummy_find_memory_regions): Use find_memory_region_ftype. * target.h (struct target_ops) : Likewise. --- gdb/procfs.c | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) (limited to 'gdb/procfs.c') diff --git a/gdb/procfs.c b/gdb/procfs.c index de8e26dd597..8802461e7cf 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -438,17 +438,9 @@ static void free_syscalls (procinfo *pi); static int find_syscall (procinfo *pi, char *name); #endif /* DYNAMIC_SYSCALLS */ -/* A function type used as a callback back iterate_over_mappings. */ -typedef int (iterate_over_mappings_cb_ftype) - (CORE_ADDR vaddr, unsigned long size, int read, int write, int execute, - void *data); - static int iterate_over_mappings - (procinfo *pi, - iterate_over_mappings_cb_ftype *child_func, - void *data, - int (*func) (struct prmap *map, - iterate_over_mappings_cb_ftype *child_func, + (procinfo *pi, find_memory_region_ftype child_func, void *data, + int (*func) (struct prmap *map, find_memory_region_ftype child_func, void *data)); /* The head of the procinfo list: */ @@ -3784,7 +3776,7 @@ solib_mappings_callback (struct prmap *map, int (*func) (int, CORE_ADDR), static int insert_dbx_link_bpt_in_region (struct prmap *map, - iterate_over_mappings_cb_ftype *child_func, + find_memory_region_ftype child_func, void *data) { procinfo *pi = (procinfo *) data; @@ -5226,11 +5218,10 @@ procfs_use_watchpoints (struct target_ops *t) from the callback function, or zero. */ static int -iterate_over_mappings (procinfo *pi, - iterate_over_mappings_cb_ftype *child_func, +iterate_over_mappings (procinfo *pi, find_memory_region_ftype child_func, void *data, int (*func) (struct prmap *map, - iterate_over_mappings_cb_ftype *child_func, + find_memory_region_ftype child_func, void *data)) { char pathname[MAX_PROC_NAME_SIZE]; @@ -5282,23 +5273,12 @@ iterate_over_mappings (procinfo *pi, } /* Implements the to_find_memory_regions method. Calls an external - function for each memory region. The external function will have - the signature: - - int callback (CORE_ADDR vaddr, - unsigned long size, - int read, int write, int execute, - void *data); - + function for each memory region. Returns the integer value returned by the callback. */ static int find_memory_regions_callback (struct prmap *map, - int (*func) (CORE_ADDR, - unsigned long, - int, int, int, - void *), - void *data) + find_memory_region_ftype func, void *data) { return (*func) ((CORE_ADDR) map->pr_vaddr, map->pr_size, @@ -5321,11 +5301,7 @@ find_memory_regions_callback (struct prmap *map, the callback. */ static int -proc_find_memory_regions (int (*func) (CORE_ADDR, - unsigned long, - int, int, int, - void *), - void *data) +proc_find_memory_regions (find_memory_region_ftype func, void *data) { procinfo *pi = find_procinfo_or_die (PIDGET (inferior_ptid), 0); @@ -5364,8 +5340,7 @@ mappingflags (long flags) mappings'. */ static int -info_mappings_callback (struct prmap *map, - iterate_over_mappings_cb_ftype *ignore, +info_mappings_callback (struct prmap *map, find_memory_region_ftype ignore, void *unused) { unsigned int pr_off; -- cgit v1.2.1