Ack.
I think this entire if block can be removed and Restarting macro can be
Ored with Assigning macro in if-else block:
diff --git a/src/amf/amfnd/comp.cc b/src/amf/amfnd/comp.cc
index 74b33a3..2f8bb3a 100644
--- a/src/amf/amfnd/comp.cc
+++ b/src/amf/amfnd/comp.cc
@@ -1615,19 +1615,14 @@ uint32_t avnd_comp_csi_assign_done(AVND_CB *cb,
AVND_COMP *comp,
/* delete any pending cbk rec for csi assignment / removal */
avnd_comp_cbq_csi_rec_del(cb, comp, (csi) ? csi->name : "");
- /* while restarting, we wont use assign all, so csi will not be null */
- if (csi && m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_RESTARTING(csi)) {
- m_AVND_COMP_CSI_CURR_ASSIGN_STATE_SET(csi,
-
AVND_COMP_CSI_ASSIGN_STATE_ASSIGNED);
- goto done;
- }
if (!csi && m_AVND_COMP_IS_ALL_CSI(comp)) {
m_AVND_COMP_ALL_CSI_RESET(comp);
}
/* mark the csi(s) assigned */
if (csi) {
- if (m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_ASSIGNING(csi)) {
+ if (m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_ASSIGNING(csi) ||
+ m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_RESTARTING(csi)) {
m_AVND_COMP_CSI_CURR_ASSIGN_STATE_SET(
csi, AVND_COMP_CSI_ASSIGN_STATE_ASSIGNED);
}
Thanks
Praveen
On 13-Jun-17 8:29 AM, Minh Chau wrote:
---
src/amf/amfnd/comp.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/amf/amfnd/comp.cc b/src/amf/amfnd/comp.cc
index 9dfe87a12..4693df217 100644
--- a/src/amf/amfnd/comp.cc
+++ b/src/amf/amfnd/comp.cc
@@ -1621,7 +1621,6 @@ uint32_t avnd_comp_csi_assign_done(AVND_CB *cb, AVND_COMP
*comp,
if (csi && m_AVND_COMP_CSI_CURR_ASSIGN_STATE_IS_RESTARTING(csi)) {
m_AVND_COMP_CSI_CURR_ASSIGN_STATE_SET(csi,
AVND_COMP_CSI_ASSIGN_STATE_ASSIGNED);
- goto done;
}
if (!csi && m_AVND_COMP_IS_ALL_CSI(comp)) {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
