* solib-svr4.c (svr4_keep_data_in_core): Rename local variable
lm_name to name_lm to avoid conflict with lm_name function.
This commit is contained in:
parent
b23518f0c8
commit
74de023457
2 changed files with 8 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
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>
|
2011-04-19 Pierre Muller <muller@ics.u-strasbg.fr>
|
||||||
|
|
||||||
ARI fixes: Use only lowercase function name for static functions.
|
ARI fixes: Use only lowercase function name for static functions.
|
||||||
|
|
|
@ -954,7 +954,7 @@ svr4_keep_data_in_core (CORE_ADDR vaddr, unsigned long size)
|
||||||
struct so_list *new;
|
struct so_list *new;
|
||||||
struct cleanup *old_chain;
|
struct cleanup *old_chain;
|
||||||
struct link_map_offsets *lmo;
|
struct link_map_offsets *lmo;
|
||||||
CORE_ADDR lm_name;
|
CORE_ADDR name_lm;
|
||||||
|
|
||||||
info = get_svr4_info ();
|
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);
|
new->lm_info->lm = xzalloc (lmo->link_map_size);
|
||||||
make_cleanup (xfree, new->lm_info->lm);
|
make_cleanup (xfree, new->lm_info->lm);
|
||||||
read_memory (ldsomap, new->lm_info->lm, lmo->link_map_size);
|
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);
|
do_cleanups (old_chain);
|
||||||
|
|
||||||
return (lm_name >= vaddr && lm_name < vaddr + size);
|
return (name_lm >= vaddr && name_lm < vaddr + size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Reference in a new issue