diff options
| author | Ed Tanous <ed@tanous.net> | 2020-09-29 00:29:23 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2020-09-29 21:38:42 +0300 |
| commit | 2c70f8004afdc27bd42968b8bf7480f2e534974c (patch) | |
| tree | 569f4cb0110aae2ccd0e4d197efe4c3a36c5b7b6 /include/dbus_monitor.hpp | |
| parent | 3e4c7797033926a0502cdd4491421c8b16684aef (diff) | |
| download | bmcweb-2c70f8004afdc27bd42968b8bf7480f2e534974c.tar.xz | |
Fix naming conventions
Lots of code has been checked in that doesn't match the naming
conventions. Lets fix that.
Tested:
Code compiles. Variable/function renames only.
Signed-off-by: Ed Tanous <ed@tanous.net>
Change-Id: I6bd107811d0b724f1fad990016113cdf035b604b
Diffstat (limited to 'include/dbus_monitor.hpp')
| -rw-r--r-- | include/dbus_monitor.hpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp index 3f0b826a9e..e17738893a 100644 --- a/include/dbus_monitor.hpp +++ b/include/dbus_monitor.hpp @@ -168,9 +168,9 @@ inline void requestRoutes(App& app) paths->size() * (1U + interfaceCount)); } - std::string object_manager_match_string; - std::string properties_match_string; - std::string object_manager_interfaces_match_string; + std::string objectManagerMatchString; + std::string propertiesMatchString; + std::string objectManagerInterfacesMatchString; // These regexes derived on the rules here: // https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names std::regex validPath("^/([A-Za-z0-9_]+/?)*$"); @@ -193,7 +193,7 @@ inline void requestRoutes(App& app) conn.close(); return; } - properties_match_string = + propertiesMatchString = ("type='signal'," "interface='org.freedesktop.DBus.Properties'," "path_namespace='" + @@ -205,12 +205,12 @@ inline void requestRoutes(App& app) if (thisSession.interfaces.size() == 0) { BMCWEB_LOG_DEBUG << "Creating match " - << properties_match_string; + << propertiesMatchString; thisSession.matches.emplace_back( std::make_unique<sdbusplus::bus::match::match>( *crow::connections::systemBus, - properties_match_string, onPropertyUpdate, &conn)); + propertiesMatchString, onPropertyUpdate, &conn)); } else { @@ -225,9 +225,8 @@ inline void requestRoutes(App& app) conn.close(); return; } - std::string ifaceMatchString = properties_match_string + - ",arg0='" + interface + - "'"; + std::string ifaceMatchString = + propertiesMatchString + ",arg0='" + interface + "'"; BMCWEB_LOG_DEBUG << "Creating match " << ifaceMatchString; thisSession.matches.emplace_back( @@ -236,7 +235,7 @@ inline void requestRoutes(App& app) onPropertyUpdate, &conn)); } } - object_manager_match_string = + objectManagerMatchString = ("type='signal'," "interface='org.freedesktop.DBus.ObjectManager'," "path_namespace='" + @@ -244,11 +243,11 @@ inline void requestRoutes(App& app) "'," "member='InterfacesAdded'"); BMCWEB_LOG_DEBUG << "Creating match " - << object_manager_match_string; + << objectManagerMatchString; thisSession.matches.emplace_back( std::make_unique<sdbusplus::bus::match::match>( - *crow::connections::systemBus, - object_manager_match_string, onPropertyUpdate, &conn)); + *crow::connections::systemBus, objectManagerMatchString, + onPropertyUpdate, &conn)); } }); } |