diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 14:19:13 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:44:40 -0700 |
| commit | 80e48c2756cc2c453ba221fe38c32f969d5139ea (patch) | |
| tree | 5312d758dde52a1bb733f2b6a18e77c03c628415 | |
| parent | 44cd8f90b156eab59843e5f1622d578d5918151d (diff) | |
| download | vcpkg-80e48c2756cc2c453ba221fe38c32f969d5139ea.tar.gz vcpkg-80e48c2756cc2c453ba221fe38c32f969d5139ea.zip | |
dll_info->DllInfo, lib_info->LibInfo
| -rw-r--r-- | toolsrc/include/coff_file_reader.h | 8 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/coff_file_reader.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/include/coff_file_reader.h b/toolsrc/include/coff_file_reader.h index 24fbf4576..197a61f43 100644 --- a/toolsrc/include/coff_file_reader.h +++ b/toolsrc/include/coff_file_reader.h @@ -5,17 +5,17 @@ namespace vcpkg::COFFFileReader { - struct dll_info + struct DllInfo { MachineType machine_type; }; - struct lib_info + struct LibInfo { std::vector<MachineType> machine_types; }; - dll_info read_dll(const fs::path& path); + DllInfo read_dll(const fs::path& path); - lib_info read_lib(const fs::path& path); + LibInfo read_lib(const fs::path& path); } diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index a1e9fda51..bce29b446 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -337,7 +337,7 @@ namespace vcpkg::PostBuildLint for (const fs::path& file : files) { Checks::check_exit(VCPKG_LINE_INFO, file.extension() == ".dll", "The file extension was not .dll: %s", file.generic_string()); - COFFFileReader::dll_info info = COFFFileReader::read_dll(file); + COFFFileReader::DllInfo info = COFFFileReader::read_dll(file); const std::string actual_architecture = get_actual_architecture(info.machine_type); if (expected_architecture != actual_architecture) @@ -362,7 +362,7 @@ namespace vcpkg::PostBuildLint for (const fs::path& file : files) { Checks::check_exit(VCPKG_LINE_INFO, file.extension() == ".lib", "The file extension was not .lib: %s", file.generic_string()); - COFFFileReader::lib_info info = COFFFileReader::read_lib(file); + COFFFileReader::LibInfo info = COFFFileReader::read_lib(file); Checks::check_exit(VCPKG_LINE_INFO, info.machine_types.size() == 1, "Found more than 1 architecture in file %s", file.generic_string()); const std::string actual_architecture = get_actual_architecture(info.machine_types.at(0)); diff --git a/toolsrc/src/coff_file_reader.cpp b/toolsrc/src/coff_file_reader.cpp index 922d8c420..b0f8b6d55 100644 --- a/toolsrc/src/coff_file_reader.cpp +++ b/toolsrc/src/coff_file_reader.cpp @@ -221,7 +221,7 @@ namespace vcpkg::COFFFileReader verify_equal_strings(VCPKG_LINE_INFO, FILE_START, file_start, FILE_START_SIZE, "LIB FILE_START"); } - dll_info read_dll(const fs::path& path) + DllInfo read_dll(const fs::path& path) { std::fstream fs(path, std::ios::in | std::ios::binary | std::ios::ate); Checks::check_exit(VCPKG_LINE_INFO, fs.is_open(), "Could not open file %s for reading", path.generic_string()); @@ -258,7 +258,7 @@ namespace vcpkg::COFFFileReader fpos_t m_absolute_position = 0; }; - lib_info read_lib(const fs::path& path) + LibInfo read_lib(const fs::path& path) { std::fstream fs(path, std::ios::in | std::ios::binary | std::ios::ate); Checks::check_exit(VCPKG_LINE_INFO, fs.is_open(), "Could not open file %s for reading", path.generic_string()); |
