bus/match: Remove redundant inline and stringify
inline + constexpr is redundant for function definitions.
All of our rule functions should return std::strings for consistency.
Change-Id: I8f404b2df879b519d17548e602a105e56fcbecef
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/include/sdbusplus/bus/match.hpp b/include/sdbusplus/bus/match.hpp
index 82414c4..248b3b4 100644
--- a/include/sdbusplus/bus/match.hpp
+++ b/include/sdbusplus/bus/match.hpp
@@ -104,46 +104,46 @@
namespace type
{
-inline constexpr auto signal() noexcept
+constexpr auto signal() noexcept
{
- return "type='signal',";
+ return "type='signal',"s;
}
-inline constexpr auto method() noexcept
+constexpr auto method() noexcept
{
- return "type='method',";
+ return "type='method',"s;
}
-inline constexpr auto method_return() noexcept
+constexpr auto method_return() noexcept
{
- return "type='method_return',";
+ return "type='method_return',"s;
}
-inline constexpr auto error() noexcept
+constexpr auto error() noexcept
{
- return "type='error',";
+ return "type='error',"s;
}
} // namespace type
-inline constexpr auto sender(std::string_view s) noexcept
+constexpr auto sender(std::string_view s) noexcept
{
return "sender='"s.append(s).append("',");
}
-inline constexpr auto interface(std::string_view s) noexcept
+constexpr auto interface(std::string_view s) noexcept
{
return "interface='"s.append(s).append("',");
}
-inline constexpr auto member(std::string_view s) noexcept
+constexpr auto member(std::string_view s) noexcept
{
return "member='"s.append(s).append("',");
}
-inline constexpr auto path(std::string_view s) noexcept
+constexpr auto path(std::string_view s) noexcept
{
return "path='"s.append(s).append("',");
}
-inline constexpr auto path_namespace(std::string_view s) noexcept
+constexpr auto path_namespace(std::string_view s) noexcept
{
return "path_namespace='"s.append(s).append("',");
}
-inline constexpr auto destination(std::string_view s) noexcept
+constexpr auto destination(std::string_view s) noexcept
{
return "destination='"s.append(s).append("',");
}
@@ -158,59 +158,53 @@
.append(s)
.append("',");
}
-inline constexpr auto arg0namespace(std::string_view s) noexcept
+constexpr auto arg0namespace(std::string_view s) noexcept
{
return "arg0namespace='"s.append(s).append("',");
}
-inline constexpr auto eavesdrop() noexcept
+constexpr auto eavesdrop() noexcept
{
- return "eavesdrop='true',";
+ return "eavesdrop='true',"s;
}
-inline constexpr auto nameOwnerChanged() noexcept
+constexpr auto nameOwnerChanged() noexcept
{
- return "type='signal',"
- "sender='org.freedesktop.DBus',"
- "member='NameOwnerChanged',";
+ return "type='signal',sender='org.freedesktop.DBus',member='NameOwnerChanged',"s;
}
-inline constexpr auto interfacesAdded() noexcept
+constexpr auto interfacesAdded() noexcept
{
- return "type='signal',"
- "interface='org.freedesktop.DBus.ObjectManager',"
- "member='InterfacesAdded',";
+ return "type='signal',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesAdded',"s;
}
-inline constexpr auto interfacesRemoved() noexcept
+constexpr auto interfacesRemoved() noexcept
{
- return "type='signal',"
- "interface='org.freedesktop.DBus.ObjectManager',"
- "member='InterfacesRemoved',";
+ return "type='signal',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesRemoved',"s;
}
-inline constexpr std::string interfacesAdded(std::string_view p) noexcept
+constexpr auto interfacesAdded(std::string_view p) noexcept
{
- return std::string(interfacesAdded()).append(path(p));
+ return interfacesAdded().append(path(p));
}
-inline constexpr std::string interfacesRemoved(std::string_view p) noexcept
+constexpr auto interfacesRemoved(std::string_view p) noexcept
{
- return std::string(interfacesRemoved()).append(path(p));
+ return interfacesRemoved().append(path(p));
}
inline auto propertiesChanged(std::string_view p, std::string_view i) noexcept
{
- return std::string(type::signal())
+ return type::signal()
.append(path(p))
.append(member("PropertiesChanged"s))
.append(interface("org.freedesktop.DBus.Properties"s))
.append(argN(0, i));
}
-inline auto propertiesChangedNamespace(std::string_view p,
- std::string_view i) noexcept
+constexpr auto propertiesChangedNamespace(std::string_view p,
+ std::string_view i) noexcept
{
- return std::string(type::signal())
+ return type::signal()
.append(path_namespace(p))
.append(member("PropertiesChanged"s))
.append(interface("org.freedesktop.DBus.Properties"s))
@@ -225,7 +219,7 @@
*/
inline auto nameOwnerChanged(std::string_view s) noexcept
{
- return std::string(nameOwnerChanged()).append(argN(0, s));
+ return nameOwnerChanged().append(argN(0, s));
}
} // namespace rules