aboutsummaryrefslogtreecommitdiff
path: root/elfcpp
diff options
context:
space:
mode:
Diffstat (limited to 'elfcpp')
-rw-r--r--elfcpp/ChangeLog4
-rw-r--r--elfcpp/elfcpp_file.h10
2 files changed, 9 insertions, 5 deletions
diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index ca6b78b..c9ca9f5 100644
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-11 Nick Clifton <nickc@redhat.com>
+
+ * elfcpp_file.h: Fix shadowed variable warnings.
+
2009-12-10 Doug Kwan <dougkwan@google.com>
* arm.h: New enums for EABI object attribute tags and values.
diff --git a/elfcpp/elfcpp_file.h b/elfcpp/elfcpp_file.h
index 8dd7ad5..d7650d6 100644
--- a/elfcpp/elfcpp_file.h
+++ b/elfcpp/elfcpp_file.h
@@ -449,10 +449,10 @@ template<int size, bool big_endian, typename File>
unsigned int
Elf_file<size, big_endian, File>::find_section_by_type(unsigned int type)
{
- unsigned int shnum = this->shnum();
+ unsigned int tshnum = this->shnum();
typename File::View v(this->file_->view(this->shoff_,
- This::shdr_size * shnum));
- for (unsigned int i = 0; i < shnum; i++)
+ This::shdr_size * tshnum));
+ for (unsigned int i = 0; i < tshnum; i++)
{
Ef_shdr shdr(v.data() + This::shdr_size * i);
if (shdr.get_sh_type() == type)
@@ -494,8 +494,8 @@ Elf_file<size, big_endian, File>::section_name(unsigned int shndx)
off_t shstr_off;
typename Elf_types<size>::Elf_WXword shstr_size;
{
- const unsigned int shstrndx = this->shstrndx_;
- typename File::View v(file->view(this->section_header_offset(shstrndx),
+ const unsigned int fshstrndx = this->shstrndx_;
+ typename File::View v(file->view(this->section_header_offset(fshstrndx),
This::shdr_size));
Ef_shdr shstr_shdr(v.data());
shstr_off = shstr_shdr.get_sh_offset();