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

15
hal/src/main/native/athena/HAL.cpp
View File

@@ -297,20 +297,15 @@ void HAL_GetSerialNumber(struct WPI_String* serialNumber) {
void InitializeRoboRioComments(void) {
if (!roboRioCommentsStringInitialized) {
std::error_code ec;
std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
wpi::MemoryBuffer::GetFile("/etc/machine-info", ec);
std::string_view fileContents;
if (fileBuffer && !ec) {
fileContents =
std::string_view(reinterpret_cast<const char*>(fileBuffer->begin()),
fileBuffer->size());
} else {
auto fileBuffer = wpi::MemoryBuffer::GetFile("/etc/machine-info");
if (!fileBuffer) {
roboRioCommentsStringSize = 0;
roboRioCommentsStringInitialized = true;
return;
}
std::string_view fileContents{
reinterpret_cast<const char*>(fileBuffer.value()->begin()),
fileBuffer.value()->size()};
std::string_view searchString = "PRETTY_HOSTNAME=\"";
size_t start = fileContents.find(searchString);