From 74de023457c7e18e1835f64a5edf7b405e80a095 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Tue, 19 Apr 2011 12:32:20 +0000 Subject: [PATCH] * solib-svr4.c (svr4_keep_data_in_core): Rename local variable lm_name to name_lm to avoid conflict with lm_name function. --- gdb/ChangeLog | 5 +++++ gdb/solib-svr4.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cab3c841172..b758a716442 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-04-19 Pierre Muller + + * solib-svr4.c (svr4_keep_data_in_core): Rename local variable + lm_name to name_lm to avoid conflict with lm_name function. + 2011-04-19 Pierre Muller ARI fixes: Use only lowercase function name for static functions. diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 23d44a695b1..7e2e39c2d09 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -954,7 +954,7 @@ svr4_keep_data_in_core (CORE_ADDR vaddr, unsigned long size) struct so_list *new; struct cleanup *old_chain; struct link_map_offsets *lmo; - CORE_ADDR lm_name; + CORE_ADDR name_lm; info = get_svr4_info (); @@ -977,10 +977,10 @@ svr4_keep_data_in_core (CORE_ADDR vaddr, unsigned long size) new->lm_info->lm = xzalloc (lmo->link_map_size); make_cleanup (xfree, new->lm_info->lm); read_memory (ldsomap, new->lm_info->lm, lmo->link_map_size); - lm_name = lm_name (new); + name_lm = lm_name (new); do_cleanups (old_chain); - return (lm_name >= vaddr && lm_name < vaddr + size); + return (name_lm >= vaddr && name_lm < vaddr + size); } /* -- 2.30.2