Gather association maps into a single structure
The AssociationOwners and AssociationIntefaces maps are passed around
separately in the mapper, but usually they are always used together.
Gather them into a structure to make it easier to write code to use
them, especially because soon there will be another entry in it.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ibd5b622c7c1240ff8e23846368cbfd56e5bba24d
diff --git a/src/processing.hpp b/src/processing.hpp
index e37f279..53669a5 100644
--- a/src/processing.hpp
+++ b/src/processing.hpp
@@ -91,16 +91,14 @@
* @param[in] wellKnown - Well known name that has new owner
* @param[in] oldOwner - Old unique name
* @param[in,out] interfaceMap - Map of interfaces
- * @param[in,out] assocOwners - Owners of associations
- * @param[in,out] assocInterfaces - Associations endpoints
+ * @param[in,out] assocMaps - The association maps
* @param[in,out] server - sdbus system object
*
*/
void processNameChangeDelete(
boost::container::flat_map<std::string, std::string>& nameOwners,
const std::string& wellKnown, const std::string& oldOwner,
- interface_map_type& interfaceMap, AssociationOwnersType& assocOwners,
- AssociationInterfaces& assocInterfaces,
+ interface_map_type& interfaceMap, AssociationMaps& assocMaps,
sdbusplus::asio::object_server& server);
/** @brief Handle an interfaces added signal
@@ -109,8 +107,7 @@
* @param[in] objPath - New path to process
* @param[in] interfacesAdded - New interfaces to process
* @param[in] wellKnown - Well known name that has new owner
- * @param[in,out] assocOwners - Owners of associations
- * @param[in,out] assocInterfaces - Associations endpoints
+ * @param[in,out] assocMaps - The association maps
* @param[in,out] server - sdbus system object
*
*/
@@ -118,6 +115,5 @@
const sdbusplus::message::object_path& objPath,
const InterfacesAdded& intfAdded,
const std::string& wellKnown,
- AssociationOwnersType& assocOwners,
- AssociationInterfaces& assocInterfaces,
+ AssociationMaps& assocMaps,
sdbusplus::asio::object_server& server);