diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
| commit | 2ea97941102380c28117882600265c1187c6fc8b (patch) | |
| tree | 8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/compressed_output.cc | |
| parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
| download | gdb-2ea97941102380c28117882600265c1187c6fc8b.zip gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2 | |
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com>
2009-12-11 Nick Clifton <nickc@redhat.com>
* configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/compressed_output.cc')
| -rw-r--r-- | gold/compressed_output.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gold/compressed_output.cc b/gold/compressed_output.cc index 814bd25..a0f8ed1 100644 --- a/gold/compressed_output.cc +++ b/gold/compressed_output.cc @@ -1,6 +1,6 @@ // compressed_output.cc -- manage compressed output sections for gold -// Copyright 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2007, 2008 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -137,14 +137,14 @@ Output_compressed_section::set_final_data_size() void Output_compressed_section::do_write(Output_file* of) { - off_t off = this->offset(); - off_t datasize = this->data_size(); - unsigned char* view = of->get_output_view(off, datasize); + off_t offset = this->offset(); + off_t data_size = this->data_size(); + unsigned char* view = of->get_output_view(offset, data_size); if (this->data_ == NULL) - memcpy(view, this->postprocessing_buffer(), datasize); + memcpy(view, this->postprocessing_buffer(), data_size); else - memcpy(view, this->data_, datasize); - of->write_output_view(off, datasize, view); + memcpy(view, this->data_, data_size); + of->write_output_view(offset, data_size, view); } } // End namespace gold. |