diff options
author | Ed Tanous <edtanous@google.com> | 2022-02-08 10:53:03 +0300 |
---|---|---|
committer | Ed Tanous <edtanous@google.com> | 2022-03-08 00:38:18 +0300 |
commit | fffb8c1fae42bc5ed3b07a700b71fdaf7b59eab8 (patch) | |
tree | 3923bef9524b58d21f159287ee17043f80100c8b /redfish-core/lib/message_registries.hpp | |
parent | 8cc8edec45fb504457933c2c3f2625fa876493e6 (diff) | |
download | bmcweb-fffb8c1fae42bc5ed3b07a700b71fdaf7b59eab8.tar.xz |
Change message_registries namespace to registries
The message_registries namespace is overly wordy, and results in very
long defines. Doing this one minor change reduces the code by 50 lines.
This seems worthwhile.
Tested: Unit tests pass. Namespace change only.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ib1401580b3fa47596eb56cdc86e60eeeb1c2f952
Diffstat (limited to 'redfish-core/lib/message_registries.hpp')
-rw-r--r-- | redfish-core/lib/message_registries.hpp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp index c2848c398b..c0c6205454 100644 --- a/redfish-core/lib/message_registries.hpp +++ b/redfish-core/lib/message_registries.hpp @@ -64,29 +64,29 @@ inline void handleMessageRoutesMessageRegistryFileGet( const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& registry) { - const message_registries::Header* header = nullptr; + const registries::Header* header = nullptr; std::string dmtf = "DMTF "; const char* url = nullptr; if (registry == "Base") { - header = &message_registries::base::header; - url = message_registries::base::url; + header = ®istries::base::header; + url = registries::base::url; } else if (registry == "TaskEvent") { - header = &message_registries::task_event::header; - url = message_registries::task_event::url; + header = ®istries::task_event::header; + url = registries::task_event::url; } else if (registry == "OpenBMC") { - header = &message_registries::openbmc::header; + header = ®istries::openbmc::header; dmtf.clear(); } else if (registry == "ResourceEvent") { - header = &message_registries::resource_event::header; - url = message_registries::resource_event::url; + header = ®istries::resource_event::header; + url = registries::resource_event::url; } else { @@ -130,40 +130,39 @@ inline void handleMessageRegistryGet( const std::string& registry, const std::string& registryMatch) { - const message_registries::Header* header = nullptr; - std::vector<const message_registries::MessageEntry*> registryEntries; + const registries::Header* header = nullptr; + std::vector<const registries::MessageEntry*> registryEntries; if (registry == "Base") { - header = &message_registries::base::header; - for (const message_registries::MessageEntry& entry : - message_registries::base::registry) + header = ®istries::base::header; + for (const registries::MessageEntry& entry : registries::base::registry) { registryEntries.emplace_back(&entry); } } else if (registry == "TaskEvent") { - header = &message_registries::task_event::header; - for (const message_registries::MessageEntry& entry : - message_registries::task_event::registry) + header = ®istries::task_event::header; + for (const registries::MessageEntry& entry : + registries::task_event::registry) { registryEntries.emplace_back(&entry); } } else if (registry == "OpenBMC") { - header = &message_registries::openbmc::header; - for (const message_registries::MessageEntry& entry : - message_registries::openbmc::registry) + header = ®istries::openbmc::header; + for (const registries::MessageEntry& entry : + registries::openbmc::registry) { registryEntries.emplace_back(&entry); } } else if (registry == "ResourceEvent") { - header = &message_registries::resource_event::header; - for (const message_registries::MessageEntry& entry : - message_registries::resource_event::registry) + header = ®istries::resource_event::header; + for (const registries::MessageEntry& entry : + registries::resource_event::registry) { registryEntries.emplace_back(&entry); } @@ -195,7 +194,7 @@ inline void handleMessageRegistryGet( nlohmann::json& messageObj = asyncResp->res.jsonValue["Messages"]; // Go through the Message Registry and populate each Message - for (const message_registries::MessageEntry* message : registryEntries) + for (const registries::MessageEntry* message : registryEntries) { nlohmann::json& obj = messageObj[message->first]; obj = {{"Description", message->second.description}, |