aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/coff_file_reader.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-17 16:22:22 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-17 16:22:22 -0800
commitc6ac0e5ca74a719a6990f6bba5002883900ad85c (patch)
tree8385f847e01164db22df03ef3aa7df94f72790c6 /toolsrc/src/coff_file_reader.cpp
parentf0ef09c3fcd78936b8219a7530f17b21911cc8cd (diff)
downloadvcpkg-c6ac0e5ca74a719a6990f6bba5002883900ad85c.tar.gz
vcpkg-c6ac0e5ca74a719a6990f6bba5002883900ad85c.zip
[coff] Eliminate another peek() function
Diffstat (limited to 'toolsrc/src/coff_file_reader.cpp')
-rw-r--r--toolsrc/src/coff_file_reader.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/toolsrc/src/coff_file_reader.cpp b/toolsrc/src/coff_file_reader.cpp
index 9ea79bf99..6a2a57159 100644
--- a/toolsrc/src/coff_file_reader.cpp
+++ b/toolsrc/src/coff_file_reader.cpp
@@ -75,14 +75,6 @@ namespace vcpkg { namespace COFFFileReader
return ret;
}
- static coff_file_header peek(fstream& fs)
- {
- auto original_pos = fs.tellg().seekpos();
- coff_file_header ret = read(fs);
- fs.seekg(original_pos);
- return ret;
- }
-
MachineType machineType() const
{
static const size_t MACHINE_TYPE_OFFSET = 0;
@@ -272,7 +264,7 @@ namespace vcpkg { namespace COFFFileReader
{
const uint16_t first_two_bytes = peek_value_from_stream<uint16_t>(fs);
const bool isImportHeader = getMachineType(first_two_bytes) == MachineType::UNKNOWN;
- const MachineType machine = isImportHeader ? import_header::read(fs).machineType() : coff_file_header::peek(fs).machineType();
+ const MachineType machine = isImportHeader ? import_header::read(fs).machineType() : coff_file_header::read(fs).machineType();
machine_types.insert(machine);
}
marker.advance_by(archive_member_header::HEADER_SIZE + header.member_size());