diff options
| author | Pierre Muller <muller@sourceware.org> | 2011-04-19 12:32:20 +0000 |
|---|---|---|
| committer | Pierre Muller <muller@sourceware.org> | 2011-04-19 12:32:20 +0000 |
| commit | 74de023457c7e18e1835f64a5edf7b405e80a095 (patch) | |
| tree | 6aaa553b7a51ecf16fe805a875c2faed22a20d51 | |
| parent | b23518f0c81019c66875c68f7a4cf1225134091d (diff) | |
| download | gdb-74de023457c7e18e1835f64a5edf7b405e80a095.zip gdb-74de023457c7e18e1835f64a5edf7b405e80a095.tar.gz gdb-74de023457c7e18e1835f64a5edf7b405e80a095.tar.bz2 | |
* solib-svr4.c (svr4_keep_data_in_core): Rename local variable
lm_name to name_lm to avoid conflict with lm_name function.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/solib-svr4.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cab3c84..b758a71 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-04-19 Pierre Muller <muller@ics.u-strasbg.fr> + * 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 <muller@ics.u-strasbg.fr> + ARI fixes: Use only lowercase function name for static functions. * nto-tdep.c (LM_ADDR): Rename to... (lm_addr): New function name. diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 23d44a6..7e2e39c 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); } /* |