Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Return wpi::expected from MemoryBuffer::GetFile (#7069)

Browse Source
This commit is contained in:
Joseph Eng
2024-09-12 23:45:35 -07:00
committed by GitHub
parent d44b651558
commit 1f3ef019ce
15 changed files with 87 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
datalogtool/src/main/native/cpp/Exporter.cpp
View File

@@ -180,17 +180,16 @@ InputFile::~InputFile() {
}
static std::unique_ptr<InputFile> LoadDataLog(std::string_view filename) {
std::error_code ec;
auto buf = wpi::MemoryBuffer::GetFile(filename, ec);
std::string fn{filename};
if (ec) {
auto fileBuffer = wpi::MemoryBuffer::GetFile(filename);
if (!fileBuffer) {
return std::make_unique<InputFile>(
fn, fmt::format("Could not open file: {}", ec.message()));
filename,
fmt::format("Could not open file: {}", fileBuffer.error().message()));
}
wpi::log::DataLogReader reader{std::move(buf)};
wpi::log::DataLogReader reader{std::move(*fileBuffer)};
if (!reader.IsValid()) {
return std::make_unique<InputFile>(fn, "Not a valid datalog file");
return std::make_unique<InputFile>(filename, "Not a valid datalog file");
}
return std::make_unique<InputFile>(