diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:57:47 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:57:47 +0000 |
| commit | 9dc1ae8ef57989d319ee45e3660b8c9ccfdc87c2 (patch) | |
| tree | 9e52ca4255903007bab83ea0f5b3a116c164ca5c /elfcpp | |
| parent | 41dd4d6be55540ab447717b3f1dca4ab3e8345b9 (diff) | |
| download | binutils-redhat-9dc1ae8ef57989d319ee45e3660b8c9ccfdc87c2.tar.gz | |
* elfcpp_file.h: Revert last patch.
Diffstat (limited to 'elfcpp')
| -rw-r--r-- | elfcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | elfcpp/elfcpp_file.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog index c9ca9f53f7..d2d6251948 100644 --- a/elfcpp/ChangeLog +++ b/elfcpp/ChangeLog @@ -1,3 +1,7 @@ +2009-12-14 Ian Lance Taylor <iant@google.com> + + * elfcpp_file.h: Revert last patch. + 2009-12-11 Nick Clifton <nickc@redhat.com> * elfcpp_file.h: Fix shadowed variable warnings. diff --git a/elfcpp/elfcpp_file.h b/elfcpp/elfcpp_file.h index d7650d6cc1..8dd7ad5cca 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 tshnum = this->shnum(); + unsigned int shnum = this->shnum(); typename File::View v(this->file_->view(this->shoff_, - This::shdr_size * tshnum)); - for (unsigned int i = 0; i < tshnum; i++) + This::shdr_size * shnum)); + for (unsigned int i = 0; i < shnum; 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 fshstrndx = this->shstrndx_; - typename File::View v(file->view(this->section_header_offset(fshstrndx), + const unsigned int shstrndx = this->shstrndx_; + typename File::View v(file->view(this->section_header_offset(shstrndx), This::shdr_size)); Ef_shdr shstr_shdr(v.data()); shstr_off = shstr_shdr.get_sh_offset(); |