Consitently use dbus::utility types
This saves about 4k on the binary size
Tested: Redfish service validator passes.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I9546227a19c691b1aecb80e80307889548c0293f
diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp
index 481b33d..0c80197 100644
--- a/include/dbus_utility.hpp
+++ b/include/dbus_utility.hpp
@@ -73,6 +73,15 @@
using MapperGetSubTreeResponse =
std::vector<std::pair<std::string, MapperServiceMap>>;
+using MapperGetObject =
+ std::vector<std::pair<std::string, std::vector<std::string>>>;
+
+using MapperGetAncestorsResponse = std::vector<
+ std::pair<std::string,
+ std::vector<std::pair<std::string, std::vector<std::string>>>>>;
+
+using MapperGetSubTreePathsResponse = std::vector<std::string>;
+
inline void escapePathForDbus(std::string& path)
{
const std::regex reg("[^A-Za-z0-9_/]");
@@ -109,13 +118,10 @@
template <typename Callback>
inline void checkDbusPathExists(const std::string& path, Callback&& callback)
{
- using GetObjectType =
- std::vector<std::pair<std::string, std::vector<std::string>>>;
-
crow::connections::systemBus->async_method_call(
[callback{std::forward<Callback>(callback)}](
const boost::system::error_code ec,
- const GetObjectType& objectNames) {
+ const dbus::utility::MapperGetObject& objectNames) {
callback(!ec && !objectNames.empty());
},
"xyz.openbmc_project.ObjectMapper",