diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-27 18:08:52 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-27 18:59:57 -0700 |
| commit | 1e9471a1489156720362ef12e1ec6849ea9b45b6 (patch) | |
| tree | 46f0f35093ecd18034c9f9463d6f8b7aa590ade0 /toolsrc/src/coff_file_reader.cpp | |
| parent | 75e8752cb90eb8bc7717518d9d6a5c68f27f2b0f (diff) | |
| download | vcpkg-1e9471a1489156720362ef12e1ec6849ea9b45b6.tar.gz vcpkg-1e9471a1489156720362ef12e1ec6849ea9b45b6.zip | |
Run clang-format over the cpp files
Diffstat (limited to 'toolsrc/src/coff_file_reader.cpp')
| -rw-r--r-- | toolsrc/src/coff_file_reader.cpp | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/toolsrc/src/coff_file_reader.cpp b/toolsrc/src/coff_file_reader.cpp index e2bab3090..d97a25b9c 100644 --- a/toolsrc/src/coff_file_reader.cpp +++ b/toolsrc/src/coff_file_reader.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "coff_file_reader.h" #include "vcpkg_Checks.h" @@ -6,13 +7,13 @@ using namespace std; namespace vcpkg::COFFFileReader { - template <class T> + template<class T> static T reinterpret_bytes(const char* data) { - return (*reinterpret_cast<const T *>(&data[0])); + return (*reinterpret_cast<const T*>(&data[0])); } - template <class T> + template<class T> static T read_value_from_stream(fstream& fs) { T data; @@ -20,7 +21,7 @@ namespace vcpkg::COFFFileReader return data; } - template <class T> + template<class T> static T peek_value_from_stream(fstream& fs) { fpos_t original_pos = fs.tellg().seekpos(); @@ -30,9 +31,15 @@ namespace vcpkg::COFFFileReader return data; } - static void verify_equal_strings(const LineInfo& line_info, const char* expected, const char* actual, int size, const char* label) + static void verify_equal_strings( + const LineInfo& line_info, const char* expected, const char* actual, int size, const char* label) { - Checks::check_exit(line_info, memcmp(expected, actual, size) == 0, "Incorrect string (%s) found. Expected: (%s) but found (%s)", label, expected, actual); + Checks::check_exit(line_info, + memcmp(expected, actual, size) == 0, + "Incorrect string (%s) found. Expected: (%s) but found (%s)", + label, + expected, + actual); } static void read_and_verify_PE_signature(fstream& fs) @@ -104,7 +111,8 @@ namespace vcpkg::COFFFileReader if (ret.data[0] != '\0') // Due to freeglut. github issue #223 { const std::string header_end = ret.data.substr(HEADER_END_OFFSET, HEADER_END_SIZE); - verify_equal_strings(VCPKG_LINE_INFO, HEADER_END, header_end.c_str(), HEADER_END_SIZE, "LIB HEADER_END"); + verify_equal_strings( + VCPKG_LINE_INFO, HEADER_END, header_end.c_str(), HEADER_END_SIZE, "LIB HEADER_END"); } return ret; @@ -229,30 +237,18 @@ namespace vcpkg::COFFFileReader read_and_verify_PE_signature(fs); CoffFileHeader header = CoffFileHeader::read(fs); MachineType machine = header.machineType(); - return {machine}; + return { machine }; } struct Marker { - void set_to_offset(const fpos_t position) - { - this->m_absolute_position = position; - } + void set_to_offset(const fpos_t position) { this->m_absolute_position = position; } - void set_to_current_pos(fstream& fs) - { - this->m_absolute_position = fs.tellg().seekpos(); - } + void set_to_current_pos(fstream& fs) { this->m_absolute_position = fs.tellg().seekpos(); } - void seek_to_marker(fstream& fs) const - { - fs.seekg(this->m_absolute_position, ios_base::beg); - } + void seek_to_marker(fstream& fs) const { fs.seekg(this->m_absolute_position, ios_base::beg); } - void advance_by(const uint64_t offset) - { - this->m_absolute_position += offset; - } + void advance_by(const uint64_t offset) { this->m_absolute_position += offset; } private: fpos_t m_absolute_position = 0; @@ -270,12 +266,16 @@ namespace vcpkg::COFFFileReader // First Linker Member const ArchiveMemberHeader first_linker_member_header = ArchiveMemberHeader::read(fs); - Checks::check_exit(VCPKG_LINE_INFO, first_linker_member_header.name().substr(0, 2) == "/ ", "Could not find proper first linker member"); + Checks::check_exit(VCPKG_LINE_INFO, + first_linker_member_header.name().substr(0, 2) == "/ ", + "Could not find proper first linker member"); marker.advance_by(ArchiveMemberHeader::HEADER_SIZE + first_linker_member_header.member_size()); marker.seek_to_marker(fs); const ArchiveMemberHeader second_linker_member_header = ArchiveMemberHeader::read(fs); - Checks::check_exit(VCPKG_LINE_INFO, second_linker_member_header.name().substr(0, 2) == "/ ", "Could not find proper second linker member"); + Checks::check_exit(VCPKG_LINE_INFO, + second_linker_member_header.name().substr(0, 2) == "/ ", + "Could not find proper second linker member"); // The first 4 bytes contains the number of archive members const uint32_t archive_member_count = read_value_from_stream<uint32_t>(fs); const OffsetsArray offsets = OffsetsArray::read(fs, archive_member_count); @@ -298,10 +298,11 @@ namespace vcpkg::COFFFileReader marker.seek_to_marker(fs); 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 ? ImportHeader::read(fs).machineType() : CoffFileHeader::read(fs).machineType(); + const MachineType machine = + isImportHeader ? ImportHeader::read(fs).machineType() : CoffFileHeader::read(fs).machineType(); machine_types.insert(machine); } - return {std::vector<MachineType>(machine_types.cbegin(), machine_types.cend())}; + return { std::vector<MachineType>(machine_types.cbegin(), machine_types.cend()) }; } } |
