diff options
author | Doug Kwan <dougkwan@google.com> | 2009-12-12 01:26:12 +0000 |
---|---|---|
committer | Doug Kwan <dougkwan@google.com> | 2009-12-12 01:26:12 +0000 |
commit | b0eec2ccdafc32f2d0d82d8582fe28d91ea5a679 (patch) | |
tree | 389b8f994b9bf250f380f78e2bebb9e0237f201e /gold/attributes.cc | |
parent | 759a05ce2497537aaf1982648a616ecd04127a4a (diff) | |
download | fsf-binutils-gdb-b0eec2ccdafc32f2d0d82d8582fe28d91ea5a679.zip fsf-binutils-gdb-b0eec2ccdafc32f2d0d82d8582fe28d91ea5a679.tar.gz fsf-binutils-gdb-b0eec2ccdafc32f2d0d82d8582fe28d91ea5a679.tar.bz2 |
2009-12-11 Doug Kwan <dougkwan@google.com>
* arm.cc (Target_arm::do_finalize_sections): Fix build breakage
due to -Wshadow.
* attributes.cc (Object_attribute::size): Ditto.
(Attributes_section_data::size): Ditto.
(Attributes_section_data::Attributes_section_data): Ditto.
(Output_attributes_section_data::do_write): Ditto.
* attributes.h (Object_attribute::set_type): Ditto.
* testsuite/tls_test_main.cc (safe_lock, safe_unlock): Ditto.
Diffstat (limited to 'gold/attributes.cc')
-rw-r--r-- | gold/attributes.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gold/attributes.cc b/gold/attributes.cc index 6b2260d..7d82979 100644 --- a/gold/attributes.cc +++ b/gold/attributes.cc @@ -45,12 +45,12 @@ Object_attribute::size(int tag) const if (this->is_default_attribute()) return 0; - size_t size = get_length_as_unsigned_LEB_128(tag); + size_t uleb128_size = get_length_as_unsigned_LEB_128(tag); if (Object_attribute::attribute_type_has_int_value(this->type_)) - size += get_length_as_unsigned_LEB_128(this->int_value_); + uleb128_size += get_length_as_unsigned_LEB_128(this->int_value_); if (Object_attribute::attribute_type_has_string_value(this->type_)) - size += this->string_value_.size() + 1; - return size; + uleb128_size += this->string_value_.size() + 1; + return uleb128_size; } // Whether this has the default value (0/""). @@ -266,11 +266,11 @@ Attributes_section_data::size() const } // Construct an Attributes_section_data object by parsing section contents -// specified by VIEW and SIZE. +// specified by VIEW and VIEW_SIZE. Attributes_section_data::Attributes_section_data( const unsigned char* view, - section_size_type size) + section_size_type view_size) { for (int vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; ++vendor) this->vendor_object_attributes_[vendor] = @@ -280,16 +280,16 @@ Attributes_section_data::Attributes_section_data( p = view; if (*(p++) == 'A') { - size--; - while (size > 0) + view_size--; + while (view_size > 0) { // Size of vendor attributes section. section_size_type section_size = convert_to_section_size_type(read_from_pointer<32>(&p)); - if (section_size > size) - section_size = size; - size -= section_size; + if (section_size > view_size) + section_size = view_size; + view_size -= section_size; const char* section_name = reinterpret_cast<const char*>(p); section_size_type section_name_size = strlen(section_name) + 1; @@ -443,10 +443,9 @@ Attributes_section_data::write(std::vector<unsigned char>* buffer) const void Output_attributes_section_data::do_write(Output_file* of) { - off_t offset = this->offset(); const section_size_type oview_size = convert_to_section_size_type(this->data_size()); - unsigned char* const oview = of->get_output_view(offset, oview_size); + unsigned char* const oview = of->get_output_view(this->offset(), oview_size); std::vector<unsigned char> buffer; this->attributes_section_data_.write(&buffer); |