osaf/services/saf/amf/amfd/node.cc | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/node.cc
b/osaf/services/saf/amf/amfd/node.cc
--- a/osaf/services/saf/amf/amfd/node.cc
+++ b/osaf/services/saf/amf/amfd/node.cc
@@ -868,7 +868,6 @@ void avd_node_admin_lock_unlock_shutdown
SaInvocationT invocation,
SaAmfAdminOperationIdT operationId)
{
AVD_CL_CB *cb = (AVD_CL_CB *)avd_cb;
- AVD_SU *su_sg;
bool su_admin = false;
AVD_SU_SI_REL *curr_susi;
AVD_AVND *su_node_ptr = NULL;
@@ -969,8 +968,7 @@ void avd_node_admin_lock_unlock_shutdown
/* verify that two assigned SUs belonging to
the same SG are not
* on this node
*/
- su_sg = su->sg_of_su->list_of_su;
- while (su_sg != NULL) {
+ for (const auto& su_sg :
su->sg_of_su->list_of_su) {
su_node_ptr = su->get_node_ptr();
su_sg_node_ptr = su_sg->get_node_ptr();
@@ -992,10 +990,7 @@ void avd_node_admin_lock_unlock_shutdown
}
goto end;
}
-
- su_sg = su_sg->sg_list_su_next;
-
- } /* while (su_sg != AVD_SU_NULL) */
+ }
/* if SG to which this SU belongs and has SI
assignments is undergoing
* any semantics other than for this SU return
error.
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
