osaf/services/saf/amf/amfd/node.cc |  8 ++------
 1 files changed, 2 insertions(+), 6 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
@@ -817,7 +817,7 @@
                                    SaInvocationT invocation, 
SaAmfAdminOperationIdT operationId)
 {
        AVD_CL_CB *cb = (AVD_CL_CB *)avd_cb;
-       AVD_SU *su, *su_sg;
+       AVD_SU *su;
        bool su_admin = false;
        AVD_SU_SI_REL *curr_susi;
        AVD_AVND *su_node_ptr = NULL;
@@ -926,8 +926,7 @@
                                /* 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();
 
@@ -949,9 +948,6 @@
                                                } 
                                                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 

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to