Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glass] Add protobuf decode error log message (#5812)

Browse Source
This commit is contained in:
Peter Johnson
2023-10-23 23:36:23 -07:00
committed by GitHub
parent 928e87b4f4
commit 23ea188e60
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp
View File

@@ -12,12 +12,15 @@ using google::protobuf::Arena;
using google::protobuf::FileDescriptorProto;
using google::protobuf::Message;
void ProtobufMessageDatabase::Add(std::string_view filename,
bool ProtobufMessageDatabase::Add(std::string_view filename,
std::span<const uint8_t> data) {
auto& file = m_files[filename];
if (file.complete) {
file.complete = false;
m_factory.reset();
m_msgs.clear();
// rebuild the pool EXCEPT for this descriptor
m_pool = std::make_unique<google::protobuf::DescriptorPool>();
@@ -31,7 +34,6 @@ void ProtobufMessageDatabase::Add(std::string_view filename,
}
// clear messages and reset factory; Find() will recreate as needed
m_msgs.clear();
m_factory = std::make_unique<google::protobuf::DynamicMessageFactory>();
}
@@ -49,10 +51,11 @@ void ProtobufMessageDatabase::Add(std::string_view filename,
// parse data
if (!file.proto->ParseFromArray(data.data(), data.size())) {
return;
return false;
}
Build(filename, file);
return true;
}
Message* ProtobufMessageDatabase::Find(std::string_view name) const {