From 770234d33bd301dd1893457a90e4b02cfec5c87a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:46:03 -0700 Subject: convert to_pid_to_str 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_pid_to_str): Unconditionally delegate. (init_dummy_target): Don't initialize to_pid_to_str. (default_pid_to_str): Rename from dummy_pid_to_str. * target.h (struct target_ops) : Use TARGET_DEFAULT_FUNC. --- gdb/target.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gdb/target.c') diff --git a/gdb/target.c b/gdb/target.c index 59c593f..53a8e2b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -89,6 +89,8 @@ static int dummy_find_memory_regions (struct target_ops *self, static char *dummy_make_corefile_notes (struct target_ops *self, bfd *ignore1, int *ignore2); +static char *default_pid_to_str (struct target_ops *ops, ptid_t ptid); + static int find_default_can_async_p (struct target_ops *ignore); static int find_default_is_async_p (struct target_ops *ignore); @@ -2540,15 +2542,7 @@ target_wait (ptid_t ptid, struct target_waitstatus *status, int options) char * target_pid_to_str (ptid_t ptid) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - { - if (t->to_pid_to_str != NULL) - return (*t->to_pid_to_str) (t, ptid); - } - - return normal_pid_to_str (ptid); + return (*current_target.to_pid_to_str) (¤t_target, ptid); } char * @@ -3500,7 +3494,7 @@ normal_pid_to_str (ptid_t ptid) } static char * -dummy_pid_to_str (struct target_ops *ops, ptid_t ptid) +default_pid_to_str (struct target_ops *ops, ptid_t ptid) { return normal_pid_to_str (ptid); } @@ -3536,7 +3530,6 @@ init_dummy_target (void) dummy_target.to_supports_non_stop = find_default_supports_non_stop; dummy_target.to_supports_disable_randomization = find_default_supports_disable_randomization; - dummy_target.to_pid_to_str = dummy_pid_to_str; dummy_target.to_stratum = dummy_stratum; dummy_target.to_has_all_memory = (int (*) (struct target_ops *)) return_zero; dummy_target.to_has_memory = (int (*) (struct target_ops *)) return_zero; -- cgit v1.1