Hi Praveen, any update on this?/BR HansN -----Original Message----- From: Hans Nordebäck Sent: den 11 februari 2014 09:32 To: 'praveen malviya' Cc: opensaf-devel@lists.sourceforge.net Subject: RE: [PATCH 1 of 1] amfd: use bool instead of SaBoolT V3 [#713]
Hi Praveen, "Review Request for amf refactoring v7 [#713]" from 2014-01-17 should be reviewed and is about replacing the patricia tree with an stl map. Three patches follows (to start with) where app, comp and the csi db are changed to use the stl map instead. There are also a patch called " amfnd: use bool instead of SaBoolT [#713]" from 2014-01-14 which HansF has commented. I think you mean "... and AMFD patch for the SaBoolT changes seems ok to me" below./BR HansN -----Original Message----- From: praveen malviya [mailto:praveen.malv...@oracle.com] Sent: den 11 februari 2014 06:36 To: Hans Nordebäck Cc: opensaf-devel@lists.sourceforge.net Subject: Re: [PATCH 1 of 1] amfd: use bool instead of SaBoolT V3 [#713] This patch and AMFND patch for the SaBoolT changes seems ok to me. But a there are lot of changes and discussion under the same ticket and I am seeing a lot of patches. So for patches 3 of 4 and 4 of 4 which are all to be reviewed or shall I review these two patches floated on 14th Jan. Thanks Praveen On 06-Feb-14 6:01 PM, Hans Nordeback wrote: > osaf/services/saf/amf/amfd/apptype.cc | 6 +- > osaf/services/saf/amf/amfd/clm.cc | 8 ++-- > osaf/services/saf/amf/amfd/cluster.cc | 2 +- > osaf/services/saf/amf/amfd/comp.cc | 6 +- > osaf/services/saf/amf/amfd/comptype.cc | 6 +- > osaf/services/saf/amf/amfd/csi.cc | 14 +++--- > osaf/services/saf/amf/amfd/csiattr.cc | 1 - > osaf/services/saf/amf/amfd/cstype.cc | 6 +- > osaf/services/saf/amf/amfd/dmsg.cc | 2 +- > osaf/services/saf/amf/amfd/include/amfd.h | 1 - > osaf/services/saf/amf/amfd/include/cb.h | 5 +-- > osaf/services/saf/amf/amfd/include/csi.h | 2 +- > osaf/services/saf/amf/amfd/include/node.h | 1 - > osaf/services/saf/amf/amfd/include/sg.h | 2 +- > osaf/services/saf/amf/amfd/include/util.h | 2 - > osaf/services/saf/amf/amfd/main.cc | 2 +- > osaf/services/saf/amf/amfd/node.cc | 8 ++-- > osaf/services/saf/amf/amfd/role.cc | 52 > ++++++++++++++-------------- > osaf/services/saf/amf/amfd/sg.cc | 12 +++--- > osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 20 +++++----- > osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 12 +++--- > osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 12 +++--- > osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 14 +++--- > osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 12 +++--- > osaf/services/saf/amf/amfd/sgproc.cc | 10 ++-- > osaf/services/saf/amf/amfd/sgtype.cc | 6 +- > osaf/services/saf/amf/amfd/si.cc | 2 +- > osaf/services/saf/amf/amfd/su.cc | 18 ++++---- > osaf/services/saf/amf/amfd/sutype.cc | 6 +- > osaf/services/saf/amf/amfd/svctype.cc | 6 +- > 30 files changed, 124 insertions(+), 132 deletions(-) > > > Since bool is a fundamental datatype in C++ let's use it > > diff --git a/osaf/services/saf/amf/amfd/apptype.cc > b/osaf/services/saf/amf/amfd/apptype.cc > --- a/osaf/services/saf/amf/amfd/apptype.cc > +++ b/osaf/services/saf/amf/amfd/apptype.cc > @@ -144,7 +144,7 @@ static SaAisErrorT apptype_ccb_completed > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > AVD_APP_TYPE *app_type; > AVD_APP *app; > - SaBoolT app_exist = SA_FALSE; > + bool app_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -167,12 +167,12 @@ static SaAisErrorT apptype_ccb_completed > while (app != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &app->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - app_exist = SA_TRUE; > + app_exist = true; > break; > } > app = app->app_type_list_app_next; > } > - if (app_exist == SA_TRUE) { > + if (app_exist == true) { > report_ccb_validation_error(opdata, > "SaAmfAppType '%s' is in use", app_type->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/clm.cc > b/osaf/services/saf/amf/amfd/clm.cc > --- a/osaf/services/saf/amf/amfd/clm.cc > +++ b/osaf/services/saf/amf/amfd/clm.cc > @@ -84,14 +84,14 @@ static void clm_node_exit_validate(AVD_A > { > AVD_SU *su; > AVD_SU_SI_REL *susi; > - SaBoolT reject = SA_FALSE; > + bool reject = false; > SaAisErrorT rc = SA_AIS_OK; > > /* > * Reject validate step on self node as this is active controller > */ > if (node->node_info.nodeId == avd_cb->node_id_avd) { > - reject = SA_TRUE; > + reject = true; > LOG_NO("Validate Step on Active Controller %d", > avd_cb->node_id_avd); > goto done; > @@ -109,7 +109,7 @@ static void clm_node_exit_validate(AVD_A > (susi->si->saAmfSINumCurrStandbyAssignments == 0) && > (su->sg_of_su->sg_redundancy_model != > SA_AMF_NO_REDUNDANCY_MODEL)) { > /* there is only one active assignment w.r.t > this SUSI */ > - reject = SA_TRUE; > + reject = true; > goto done; > } > susi = susi->su_next; > @@ -117,7 +117,7 @@ static void clm_node_exit_validate(AVD_A > } > > done: > - if(reject == SA_FALSE) { > + if(reject == false) { > rc = saClmResponse_4(avd_cb->clmHandle, node->clm_pend_inv, > SA_CLM_CALLBACK_RESPONSE_OK); > LOG_NO("CLM track callback VALIDATE::ACCEPTED %u", rc); > diff --git a/osaf/services/saf/amf/amfd/cluster.cc > b/osaf/services/saf/amf/amfd/cluster.cc > --- a/osaf/services/saf/amf/amfd/cluster.cc > +++ b/osaf/services/saf/amf/amfd/cluster.cc > @@ -81,7 +81,7 @@ void avd_cluster_tmr_init_evh(AVD_CL_CB > for (i_sg = avd_sg_getnext(&lsg_name); i_sg != NULL; i_sg = > avd_sg_getnext(&lsg_name)) { > lsg_name = i_sg->name; > > - if ((i_sg->list_of_su == NULL) || (i_sg->sg_ncs_spec == > SA_TRUE)) { > + if ((i_sg->list_of_su == NULL) || (i_sg->sg_ncs_spec == true)) { > continue; > } > > diff --git a/osaf/services/saf/amf/amfd/comp.cc > b/osaf/services/saf/amf/amfd/comp.cc > --- a/osaf/services/saf/amf/amfd/comp.cc > +++ b/osaf/services/saf/amf/amfd/comp.cc > @@ -1469,7 +1469,7 @@ static void comp_ccb_apply_delete_hdlr(s > AVD_AVND *su_node_ptr = NULL; > AVSV_PARAM_INFO param; > SaBoolT old_val; > - SaBoolT su_delete = SA_FALSE; > + bool su_delete = false; > struct CcbUtilOperationData *t_opData; > > TRACE_ENTER(); > @@ -1512,12 +1512,12 @@ static void comp_ccb_apply_delete_hdlr(s > /* check whether the SU is also undergoing delete operation */ > t_opData = ccbutil_getCcbOpDataByDN(opdata->ccbId, &comp->su->name); > if (t_opData && t_opData->operationType == CCBUTIL_DELETE) { > - su_delete = SA_TRUE; > + su_delete = true; > } > > /* if SU is not being deleted and the PreInstantiable state has changed > * then update the IMM with the new value for saAmfSUPreInstantiable */ > - if (su_delete == SA_FALSE && old_val != > comp->su->saAmfSUPreInstantiable) { > + if (su_delete == false && old_val != comp->su->saAmfSUPreInstantiable) { > avd_saImmOiRtObjectUpdate(&comp->su->name, > const_cast<SaImmAttrNameT>("saAmfSUPreInstantiable"), > SA_IMM_ATTR_SAUINT32T, > &comp->su->saAmfSUPreInstantiable); > /* If SU becomes NPI then enable saAmfSUFailover flag Sec > 3.11.1.3.2 AMF-B.04.01 spec */ > diff --git a/osaf/services/saf/amf/amfd/comptype.cc > b/osaf/services/saf/amf/amfd/comptype.cc > --- a/osaf/services/saf/amf/amfd/comptype.cc > +++ b/osaf/services/saf/amf/amfd/comptype.cc > @@ -440,7 +440,7 @@ static SaAisErrorT comptype_ccb_complete > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > AVD_COMP_TYPE *comp_type; > AVD_COMP *comp; > - SaBoolT comp_exist = SA_FALSE; > + bool comp_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -464,12 +464,12 @@ static SaAisErrorT comptype_ccb_complete > while (comp != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &comp->comp_info.name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - comp_exist = SA_TRUE; > + comp_exist = true; > break; > } > comp = comp->comp_type_list_comp_next; > } > - if (comp_exist == SA_TRUE) { > + if (comp_exist == true) { > report_ccb_validation_error(opdata, > "SaAmfCompType '%s' is in use",comp_type->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/csi.cc > b/osaf/services/saf/amf/amfd/csi.cc > --- a/osaf/services/saf/amf/amfd/csi.cc > +++ b/osaf/services/saf/amf/amfd/csi.cc > @@ -61,7 +61,7 @@ void avd_csi_delete(AVD_CSI *csi) > TRACE_LEAVE2(); > } > > -void csi_cmplt_delete(AVD_CSI *csi, SaBoolT ckpt) > +void csi_cmplt_delete(AVD_CSI *csi, bool ckpt) > { > AVD_PG_CSI_NODE *curr; > TRACE_ENTER2("%s", csi->name.value); > @@ -694,7 +694,7 @@ static void ccb_apply_delete_hdlr(CcbUti > AVD_CSI *csi = static_cast<AVD_CSI*>(opdata->userData); > AVD_CSI *csi_db; > > - SaBoolT first_sisu = static_cast<SaBoolT>(true); > + bool first_sisu = true; > > if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { > /* A double check whether csi has been deleted from DB or not > and whether pointer stored userData > @@ -740,7 +740,7 @@ static void ccb_apply_delete_hdlr(CcbUti > /* Mark comp-csi and sisu to be under csi add/rem.*/ > /* Send csi assignment for act susi first to the > corresponding amfnd. */ > if ((SA_AMF_HA_ACTIVE == t_sisu->state) && (true == > first_sisu)) { > - first_sisu = static_cast<SaBoolT>(false); > + first_sisu = false; > if (avd_snd_susi_msg(avd_cb, t_sisu->su, > t_sisu, AVSV_SUSI_ACT_DEL, true, t_csicomp) != NCSCC_RC_SUCCESS) { > LOG_ER("susi send failure for su'%s' > and si'%s'", t_sisu->su->name.value, t_sisu->si->name.value); > goto done; > @@ -755,7 +755,7 @@ static void ccb_apply_delete_hdlr(CcbUti > }/* while(t_sisu) */ > > } else { /* if (NULL != csi->si->list_of_sisu) */ > - csi_cmplt_delete(csi, static_cast<SaBoolT>(false)); > + csi_cmplt_delete(csi, false); > } > > /* Send pg update and delete csi after all csi gets removed. */ > @@ -825,7 +825,7 @@ static void csi_ccb_apply_create_hdlr(st > AVD_CSI *csi = NULL; > AVD_COMP *t_comp; > AVD_SU_SI_REL *t_sisu; > - SaBoolT first_sisu = static_cast<SaBoolT>(true); > + bool first_sisu = true; > AVD_COMP_CSI_REL *compcsi; > AVD_COMPCS_TYPE *cst; > > @@ -857,7 +857,7 @@ static void csi_ccb_apply_create_hdlr(st > > compcsi = t_sisu->list_of_csicomp; > while (compcsi != NULL) { > - compcsi->comp->assign_flag = > static_cast<SaBoolT>(true); > + compcsi->comp->assign_flag = true; > compcsi = compcsi->susi_csicomp_next; > } > > @@ -911,7 +911,7 @@ static void csi_ccb_apply_create_hdlr(st > /* Mark comp-csi and sisu to be under csi add/rem.*/ > /* Send csi assignment for act susi first to the > corresponding amfnd. */ > if ((SA_AMF_HA_ACTIVE == t_sisu->state) && (true == > first_sisu)) { > - first_sisu = static_cast<SaBoolT>(false); > + first_sisu = false; > if (avd_snd_susi_msg(avd_cb, t_sisu->su, > t_sisu, AVSV_SUSI_ACT_ASGN, true, compcsi) != NCSCC_RC_SUCCESS) { > /* free all the CSI assignments and end > this loop */ > avd_compcsi_delete(avd_cb, t_sisu, > true); > diff --git a/osaf/services/saf/amf/amfd/csiattr.cc > b/osaf/services/saf/amf/amfd/csiattr.cc > --- a/osaf/services/saf/amf/amfd/csiattr.cc > +++ b/osaf/services/saf/amf/amfd/csiattr.cc > @@ -16,7 +16,6 @@ > * > */ > > -#include <stdbool.h> > #include <logtrace.h> > #include <util.h> > #include <amf_util.h> > diff --git a/osaf/services/saf/amf/amfd/cstype.cc > b/osaf/services/saf/amf/amfd/cstype.cc > --- a/osaf/services/saf/amf/amfd/cstype.cc > +++ b/osaf/services/saf/amf/amfd/cstype.cc > @@ -218,7 +218,7 @@ static SaAisErrorT cstype_ccb_completed_ > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > avd_cstype_t *cst; > AVD_CSI *csi; > - SaBoolT csi_exist = SA_FALSE; > + bool csi_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -241,12 +241,12 @@ static SaAisErrorT cstype_ccb_completed_ > while (csi != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &csi->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - csi_exist = SA_TRUE; > + csi_exist = true; > break; > } > csi = csi->csi_list_cs_type_next; > } > - if (csi_exist == SA_TRUE) { > + if (csi_exist == true) { > report_ccb_validation_error(opdata, > "SaAmfCSType '%s' is in use", cst->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/dmsg.cc > b/osaf/services/saf/amf/amfd/dmsg.cc > --- a/osaf/services/saf/amf/amfd/dmsg.cc > +++ b/osaf/services/saf/amf/amfd/dmsg.cc > @@ -182,7 +182,7 @@ uint32_t avd_d2d_msg_rcv(AVD_D2D_MSG *rc > switch (rcv_msg->msg_type) { > case AVD_D2D_CHANGE_ROLE_REQ: > if (SA_AMF_HA_ACTIVE == > rcv_msg->msg_info.d2d_chg_role_req.role) { > - cb->swap_switch = SA_TRUE; > + cb->swap_switch = true; > TRACE("amfd role change req stdby -> actv, posting to > mail box"); > avd_post_amfd_switch_role_change_evt(cb, > SA_AMF_HA_ACTIVE); > } else { > diff --git a/osaf/services/saf/amf/amfd/include/amfd.h > b/osaf/services/saf/amf/amfd/include/amfd.h > --- a/osaf/services/saf/amf/amfd/include/amfd.h > +++ b/osaf/services/saf/amf/amfd/include/amfd.h > @@ -64,6 +64,5 @@ > #include "ckpt_msg.h" > #include "ckpt_edu.h" > #include "ckpt_updt.h" > -#include <stdbool.h> > > #endif > diff --git a/osaf/services/saf/amf/amfd/include/cb.h > b/osaf/services/saf/amf/amfd/include/cb.h > --- a/osaf/services/saf/amf/amfd/include/cb.h > +++ b/osaf/services/saf/amf/amfd/include/cb.h > @@ -33,8 +33,6 @@ > #ifndef AVD_CB_H > #define AVD_CB_H > > -#include <stdbool.h> > - > #include <saImmOi.h> > #include <saClm.h> > > @@ -228,8 +226,7 @@ typedef struct cl_cb_tag { > SaClmHandleT clmHandle; > SaSelectionObjectT clm_sel_obj; > > - // TODO swap_switch: use bool as type and change to a better name! > - SaBoolT swap_switch; /* true - In middle of role switch. */ > + bool swap_switch; /* true - In middle of role switch. */ > > /** true when active services (IMM, LOG, NTF, etc.) exist > * Set to true when leaving the no-active state > diff --git a/osaf/services/saf/amf/amfd/include/csi.h > b/osaf/services/saf/amf/amfd/include/csi.h > --- a/osaf/services/saf/amf/amfd/include/csi.h > +++ b/osaf/services/saf/amf/amfd/include/csi.h > @@ -157,7 +157,7 @@ extern SaAisErrorT avd_csiattr_config_ge > extern void avd_csiattr_constructor(void); > extern void avd_compcsi_from_csi_and_susi_delete(struct avd_su_si_rel_tag > *susi, struct avd_comp_csi_rel_tag *comp_csi, bool ckpt); > extern void avd_csi_delete(struct avd_csi_tag *csi); > -extern void csi_cmplt_delete(struct avd_csi_tag *csi, SaBoolT ckpt); > +extern void csi_cmplt_delete(struct avd_csi_tag *csi, bool ckpt); > extern AVD_CSI *csi_create(const SaNameT *csi_name); > extern bool csi_assignment_validate(struct avd_sg_tag *sg); > > diff --git a/osaf/services/saf/amf/amfd/include/node.h > b/osaf/services/saf/amf/amfd/include/node.h > --- a/osaf/services/saf/amf/amfd/include/node.h > +++ b/osaf/services/saf/amf/amfd/include/node.h > @@ -34,7 +34,6 @@ > #ifndef AVD_AVND_H > #define AVD_AVND_H > > -#include <stdbool.h> > #include <saAmf.h> > #include <saImm.h> > #include <ncspatricia.h> > diff --git a/osaf/services/saf/amf/amfd/include/sg.h > b/osaf/services/saf/amf/amfd/include/sg.h > --- a/osaf/services/saf/amf/amfd/include/sg.h > +++ b/osaf/services/saf/amf/amfd/include/sg.h > @@ -146,7 +146,7 @@ typedef struct avd_sg_tag { > * Checkpointing - Updated > independently. > */ > > - SaBoolT sg_ncs_spec; /* This is set to true if the SG > + bool sg_ncs_spec; /* This is set to true if the SG > * is a NCS specific SG. > * Checkpointing - Sent as a one time update. > */ > diff --git a/osaf/services/saf/amf/amfd/include/util.h > b/osaf/services/saf/amf/amfd/include/util.h > --- a/osaf/services/saf/amf/amfd/include/util.h > +++ b/osaf/services/saf/amf/amfd/include/util.h > @@ -34,10 +34,8 @@ > #ifndef AVD_MSG_H > #define AVD_MSG_H > > -#include <stdbool.h> > #include <amf_d2nmsg.h> > #include <cb.h> > -#include <stdbool.h> > #include <amf_util.h> > > typedef enum { > diff --git a/osaf/services/saf/amf/amfd/main.cc > b/osaf/services/saf/amf/amfd/main.cc > --- a/osaf/services/saf/amf/amfd/main.cc > +++ b/osaf/services/saf/amf/amfd/main.cc > @@ -507,7 +507,7 @@ static uint32_t initialize(void) > } > > cb->init_state = AVD_INIT_BGN; > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > cb->active_services_exist = true; > cb->stby_sync_state = AVD_STBY_IN_SYNC; > cb->sync_required = true; > 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 > @@ -433,7 +433,7 @@ static SaAisErrorT node_ccb_completed_de > SaAisErrorT rc = SA_AIS_OK; > AVD_AVND *node = avd_node_get(&opdata->objectName); > AVD_SU *su; > - SaBoolT su_exist = SA_FALSE; > + bool su_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("'%s'", opdata->objectName.value); > @@ -463,12 +463,12 @@ static SaAisErrorT node_ccb_completed_de > while (su != NULL) { > t_opData = ccbutil_getCcbOpDataByDN(opdata->ccbId, > &su->name); > if ((t_opData == NULL) || (t_opData->operationType != > CCBUTIL_DELETE)) { > - su_exist = SA_TRUE; > + su_exist = true; > break; > } > su = su->avnd_list_su_next; > } > - if (su_exist == SA_TRUE) { > + if (su_exist == true) { > report_ccb_validation_error(opdata, "Node '%s' still > has SUs", opdata->objectName.value); > rc = SA_AIS_ERR_BAD_OPERATION; > goto done; > @@ -1304,7 +1304,7 @@ void avd_node_remove_su(AVD_SU *su) > AVD_SU *prev_su = NULL; > bool isNcs; > > - if ((su->sg_of_su) && (su->sg_of_su->sg_ncs_spec == SA_TRUE)) > + if ((su->sg_of_su) && (su->sg_of_su->sg_ncs_spec == true)) > isNcs = true; > else > isNcs = false; > diff --git a/osaf/services/saf/amf/amfd/role.cc > b/osaf/services/saf/amf/amfd/role.cc > --- a/osaf/services/saf/amf/amfd/role.cc > +++ b/osaf/services/saf/amf/amfd/role.cc > @@ -85,7 +85,7 @@ void avd_role_change_evh(AVD_CL_CB *cb, > > if ((cause == AVD_SWITCH_OVER) && > (cb->avail_state_avd == SA_AMF_HA_ACTIVE) && (role == > SA_AMF_HA_QUIESCED)) { > - if (SA_TRUE == cb->swap_switch ) { > + if (true == cb->swap_switch ) { > /* swap resulted Switch Active -> Quiesced */ > amfd_switch_actv_qsd(cb); > status = NCSCC_RC_SUCCESS; > @@ -95,7 +95,7 @@ void avd_role_change_evh(AVD_CL_CB *cb, > > if ((cause == AVD_SWITCH_OVER) && > (role == SA_AMF_HA_ACTIVE) && (cb->avail_state_avd == > SA_AMF_HA_QUIESCED)) { > - if (SA_TRUE == cb->swap_switch ) { > + if (true == cb->swap_switch ) { > /* swap resulted Switch Quiesced -> Active */ > amfd_switch_qsd_actv(cb); > status = NCSCC_RC_SUCCESS; > @@ -105,7 +105,7 @@ void avd_role_change_evh(AVD_CL_CB *cb, > > if ((cause == AVD_SWITCH_OVER) && > (role == SA_AMF_HA_STANDBY) && (cb->avail_state_avd == > SA_AMF_HA_QUIESCED)) { > - if (SA_TRUE == cb->swap_switch ) { > + if (true == cb->swap_switch ) { > /* swap resulted Switch Quiesced -> standby */ > amfd_switch_qsd_stdby(cb); > status = NCSCC_RC_SUCCESS; > @@ -115,7 +115,7 @@ void avd_role_change_evh(AVD_CL_CB *cb, > > if ((cause == AVD_SWITCH_OVER) && > (role == SA_AMF_HA_ACTIVE) && (cb->avail_state_avd == > SA_AMF_HA_STANDBY)) { > - if (SA_TRUE == cb->swap_switch ) { > + if (true == cb->swap_switch ) { > /* swap resulted Switch standby -> Active */ > amfd_switch_stdby_actv(cb); > status = NCSCC_RC_SUCCESS; > @@ -252,8 +252,8 @@ static uint32_t avd_role_failover(AVD_CL > LOG_NO("FAILOVER StandBy --> Active"); > > /* If we are in the middle of admin switch, ignore it */ > - if (cb->swap_switch == SA_TRUE) { > - cb->swap_switch = SA_FALSE; > + if (cb->swap_switch == true) { > + cb->swap_switch = false; > } > > /* > @@ -375,8 +375,8 @@ static uint32_t avd_role_failover_qsd_ac > LOG_NO("FAILOVER Quiesced --> Active"); > > /* If we are in the middle of admin switch, ignore it */ > - if (cb->swap_switch == SA_TRUE) { > - cb->swap_switch = SA_FALSE; > + if (cb->swap_switch == true) { > + cb->swap_switch = false; > } > > /* > @@ -571,7 +571,7 @@ void avd_mds_qsd_role_evh(AVD_CL_CB *cb, > /* Only accept this event in controller switch-over state, in other > * states it is invalid and indicates severe cluster problems. > */ > - if (cb->swap_switch == SA_FALSE) { > + if (cb->swap_switch == false) { > LOG_NO("%s: MDS unexpectedly changed role to QUIESCED", > __FUNCTION__); > LOG_CR("Duplicate ACTIVE detected, exiting"); > _exit(EXIT_FAILURE); // should never get here... > @@ -601,7 +601,7 @@ void avd_mds_qsd_role_evh(AVD_CL_CB *cb, > /* Now Dispatch all the messages from the MBCSv mail-box */ > if (NCSCC_RC_SUCCESS != (rc = avsv_mbcsv_dispatch(cb, > SA_DISPATCH_ALL))) { > LOG_EM("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd_other); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return; > } > > @@ -609,7 +609,7 @@ void avd_mds_qsd_role_evh(AVD_CL_CB *cb, > if (NCSCC_RC_SUCCESS != (rc= avd_d2d_chg_role_req(cb, AVD_SWITCH_OVER > ,SA_AMF_HA_ACTIVE))) { > /* Log error */ > LOG_ER("Unable to send the AMFD change role request from > Standby to Active"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > amfd_switch_qsd_actv(cb); > } > > @@ -654,11 +654,11 @@ void amfd_switch(AVD_CL_CB *cb) > } > } > > - cb->swap_switch = SA_TRUE; > + cb->swap_switch = true; > /* Post a evt to the AVD mailbox for the admin switch role change */ > if (NCSCC_RC_SUCCESS != avd_post_amfd_switch_role_change_evt(cb, > SA_AMF_HA_QUIESCED)) { > LOG_ER("unable to post to mailbox for amfd switch"); > - cb->swap_switch= SA_FALSE; > + cb->swap_switch = false; > return ; > } > > @@ -804,21 +804,21 @@ uint32_t amfd_switch_actv_qsd(AVD_CL_CB > > if (cb->init_state != AVD_APP_STATE) { > LOG_ER("ROLE SWITCH Active --> Quiesced, AMFD not in APP > State"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return NCSCC_RC_FAILURE; > } > > /* get the avnd from node_id */ > if (NULL == (avnd = avd_node_find_nodeid(cb->node_id_avd))) { > LOG_ER("ROLE SWITCH Active --> Quiesced, Local Node not found"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return NCSCC_RC_FAILURE; > } > > /* get the avnd from node_id */ > if (NULL == (avnd_other = avd_node_find_nodeid(cb->node_id_avd_other))) > { > LOG_ER("ROLE SWITCH Active --> Quiesced, remote Node not > found"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return NCSCC_RC_FAILURE; > } > > @@ -829,7 +829,7 @@ uint32_t amfd_switch_actv_qsd(AVD_CL_CB > (avnd->node_state != AVD_AVND_STATE_PRESENT) || > (avnd_other->node_state != AVD_AVND_STATE_PRESENT)) { > LOG_NO("Peer controller not available for switch over"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return NCSCC_RC_FAILURE; > } > > @@ -843,7 +843,7 @@ uint32_t amfd_switch_actv_qsd(AVD_CL_CB > /* Go ahead and set mds role as already the NCS SU has been switched */ > if (NCSCC_RC_SUCCESS != (rc = avd_mds_set_vdest_role(cb, > SA_AMF_HA_QUIESCED))) { > LOG_ER("ROLE SWITCH Active --> Quiesced, vdest role set > failed"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > return NCSCC_RC_FAILURE; > } > > @@ -887,7 +887,7 @@ uint32_t amfd_switch_qsd_stdby(AVD_CL_CB > TRACE_ENTER(); > LOG_NO("Switching Quiesced --> StandBy"); > > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > > if (NCSCC_RC_SUCCESS != (status = avd_mds_set_vdest_role(cb, > SA_AMF_HA_STANDBY))) { > LOG_ER("Switch Quiesced --> StandBy, Vdest set role failed"); > @@ -960,14 +960,14 @@ uint32_t amfd_switch_stdby_actv(AVD_CL_C > */ > if (AVD_STBY_OUT_OF_SYNC == cb->stby_sync_state) { > LOG_ER("Switch Standby --> Active FAILED, Standby OUT OF SYNC"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > avd_d2d_chg_role_rsp(cb, NCSCC_RC_FAILURE, SA_AMF_HA_ACTIVE); > return NCSCC_RC_FAILURE; > } > > if (NCSCC_RC_SUCCESS != (status = avsv_set_ckpt_role(cb, > SA_AMF_HA_ACTIVE))) { > LOG_ER("Switch Standby --> Active FAILED, Mbcsv role set > failed"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > avd_d2d_chg_role_rsp(cb, NCSCC_RC_FAILURE, SA_AMF_HA_ACTIVE); > return NCSCC_RC_FAILURE; > } > @@ -975,7 +975,7 @@ uint32_t amfd_switch_stdby_actv(AVD_CL_C > /* Now Dispatch all the messages from the MBCSv mail-box */ > if (NCSCC_RC_SUCCESS != (status = avsv_mbcsv_dispatch(cb, > SA_DISPATCH_ALL))) { > LOG_ER("Switch Standby --> Active FAILED, Mbcsv Dispatch > failed"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > avd_d2d_chg_role_rsp(cb, NCSCC_RC_FAILURE, SA_AMF_HA_ACTIVE); > return NCSCC_RC_FAILURE; > } > @@ -991,7 +991,7 @@ uint32_t amfd_switch_stdby_actv(AVD_CL_C > /* Declare this standby as Active. Set Vdest role role */ > if (NCSCC_RC_SUCCESS != (status = avd_mds_set_vdest_role(cb, > SA_AMF_HA_ACTIVE))) { > LOG_ER("Switch Standby --> Active FAILED, MDS role set failed"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > avd_d2d_chg_role_rsp(cb, NCSCC_RC_FAILURE, SA_AMF_HA_ACTIVE); > return NCSCC_RC_FAILURE; > } > @@ -1006,12 +1006,12 @@ uint32_t amfd_switch_stdby_actv(AVD_CL_C > } else { > avd_d2n_msg_dequeue(cb); > } > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > > /* Give up our IMM OI Applier role */ > if ((rc = immutil_saImmOiImplementerClear(cb->immOiHandle)) != > SA_AIS_OK) { > LOG_ER("Switch Standby --> Active FAILED, ImplementerClear > failed %u", rc); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > avd_d2d_chg_role_rsp(cb, NCSCC_RC_FAILURE, SA_AMF_HA_ACTIVE); > return NCSCC_RC_FAILURE; > } > @@ -1072,7 +1072,7 @@ uint32_t amfd_switch_stdby_actv(AVD_CL_C > uint32_t amfd_switch_qsd_actv (AVD_CL_CB *cb) > { > LOG_NO("ROLE SWITCH Quiesced --> Active"); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > if (NCSCC_RC_SUCCESS != avd_rde_set_role(SA_AMF_HA_ACTIVE)) { > LOG_ER("rde role change failed from qsd -> actv"); > } > diff --git a/osaf/services/saf/amf/amfd/sg.cc > b/osaf/services/saf/amf/amfd/sg.cc > --- a/osaf/services/saf/amf/amfd/sg.cc > +++ b/osaf/services/saf/amf/amfd/sg.cc > @@ -76,7 +76,7 @@ static void sg_add_to_model(AVD_SG *sg) > > /* SGs belonging to a magic app will be NCS, TODO Better name! */ > if (!strcmp((char *)dn.value, "safApp=OpenSAF")) > - sg->sg_ncs_spec = static_cast<SaBoolT>(true); > + sg->sg_ncs_spec = true; > > m_AVSV_SEND_CKPT_UPDT_ASYNC_ADD(avd_cb, sg, AVSV_CKPT_AVD_SG_CONFIG); > done: > @@ -105,7 +105,7 @@ AVD_SG *avd_sg_new(const SaNameT *dn) > memcpy(sg->name.value, dn->value, dn->length); > sg->name.length = dn->length; > sg->tree_node.key_info = (uint8_t *)&(sg->name); > - sg->sg_ncs_spec = SA_FALSE; > + sg->sg_ncs_spec = false; > sg->sg_fsm_state = AVD_SG_FSM_STABLE; > sg->adjust_state = AVSV_SG_STABLE; > > @@ -1135,7 +1135,7 @@ static void sg_admin_op_cb(SaImmOiHandle > TRACE_ENTER2("'%s', %llu", object_name->value, op_id); > sg = avd_sg_get(object_name); > > - if (sg->sg_ncs_spec == SA_TRUE) { > + if (sg->sg_ncs_spec == true) { > report_admin_op_error(immOiHandle, invocation, > SA_AIS_ERR_BAD_OPERATION, NULL, > "Admin Op on OpenSAF MW SG is not allowed"); > goto done; > @@ -1337,7 +1337,7 @@ static SaAisErrorT sg_ccb_completed_cb(C > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > AVD_SG *sg; > AVD_SI *si; > - SaBoolT si_exist = SA_FALSE; > + bool si_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -1363,13 +1363,13 @@ static SaAisErrorT sg_ccb_completed_cb(C > while (si != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &si->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - si_exist = SA_TRUE; > + si_exist = true; > break; > } > si = si->sg_list_of_si_next; > } > } > - if (si_exist == SA_TRUE) { > + if (si_exist == true) { > report_ccb_validation_error(opdata, "SIs still > exist in SG '%s'", sg->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc > b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc > @@ -715,7 +715,7 @@ uint32_t avd_sg_2n_si_func(AVD_CL_CB *cb > goto done; > } > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_NO("%s: state: %u", __FUNCTION__, cb->init_state); > goto done; > } > @@ -814,7 +814,7 @@ SaAisErrorT avd_sg_2n_siswap_func(AVD_SI > goto done; > } > if (susi->si->sg_of_si->sg_ncs_spec) { > - if (SA_TRUE == avd_cb->swap_switch ) { > + if (true == avd_cb->swap_switch ) { > LOG_NO("SI Swap not possible, Controller role switch > under progress"); > rc = SA_AIS_ERR_TRY_AGAIN; > goto done; > @@ -844,7 +844,7 @@ SaAisErrorT avd_sg_2n_siswap_func(AVD_SI > saflog(LOG_NOTICE, amfSvcUsrName, "%s Swap initiated", > susi->si->name.value); > > if (susi->si->sg_of_si->sg_ncs_spec) { > - avd_cb->swap_switch = SA_TRUE; > + avd_cb->swap_switch = true; > avd_cb->active_services_exist = false; > } > > @@ -1456,7 +1456,7 @@ uint32_t avd_sg_2n_su_insvc_func(AVD_CL_ > goto done; > } > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > goto done; > } > > @@ -2940,7 +2940,7 @@ uint32_t avd_sg_2n_realign_func(AVD_CL_C > TRACE_ENTER2("'%s'", sg->name.value); > > /* If the SG FSM state is not stable just return success. */ > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > goto done; > } > > @@ -3399,9 +3399,9 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > TRACE_ENTER2("'%s', %u", su->name.value, su->sg_of_su->sg_fsm_state); > > /* If we are in the middle of admin switch, Reset the flag. */ > - if ((cb->swap_switch == SA_TRUE) && (SA_TRUE == > su->sg_of_su->sg_ncs_spec)) { > + if ((cb->swap_switch == true) && (true == su->sg_of_su->sg_ncs_spec)) { > TRACE("Resetting swap_switch."); > - cb->swap_switch = SA_FALSE; > + cb->swap_switch = false; > } > > if (su->list_of_susi == AVD_SU_SI_REL_NULL) > @@ -3703,7 +3703,7 @@ uint32_t avd_sg_2n_su_admin_fail(AVD_CL_ > TRACE_ENTER2("'%s'", su->name.value); > TRACE("SG state %u", su->sg_of_su->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > TRACE("state:%u, ncs:%u", cb->init_state, > su->sg_of_su->sg_ncs_spec); > goto done; > } > @@ -3846,7 +3846,7 @@ uint32_t avd_sg_2n_si_admin_down(AVD_CL_ > > TRACE_ENTER2("'%s', %u", si->name.value, si->sg_of_si->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_NO("%s: state: %u", __FUNCTION__, cb->init_state); > goto done; > } > @@ -3972,7 +3972,7 @@ uint32_t avd_sg_2n_sg_admin_down(AVD_CL_ > > TRACE_ENTER2("'%s', %u", sg->name.value, sg->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > LOG_NO("%s: state: %u", __FUNCTION__, cb->init_state); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc > b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc > @@ -142,7 +142,7 @@ uint32_t avd_sg_nored_si_func(AVD_CL_CB > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_ER("%s:%u: %u", __FILE__, __LINE__, > si->sg_of_si->sg_ncs_spec); > return NCSCC_RC_SUCCESS; > } > @@ -394,7 +394,7 @@ uint32_t avd_sg_nored_su_insvc_func(AVD_ > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_SUCCESS; > } > > @@ -922,7 +922,7 @@ uint32_t avd_sg_nored_realign_func(AVD_C > TRACE_ENTER2("'%s'", sg->name.value); > > /* If the SG FSM state is not stable just return success. */ > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > goto done; > } > > @@ -1185,7 +1185,7 @@ uint32_t avd_sg_nored_su_admin_fail(AVD_ > { > TRACE_ENTER2("%u", su->sg_of_su->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > > @@ -1260,7 +1260,7 @@ uint32_t avd_sg_nored_si_admin_down(AVD_ > { > TRACE_ENTER2("%u", si->sg_of_si->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > if (si->list_of_sisu == AVD_SU_SI_REL_NULL) { > @@ -1341,7 +1341,7 @@ uint32_t avd_sg_nored_sg_admin_down(AVD_ > > TRACE_ENTER2("%u", sg->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > return NCSCC_RC_FAILURE; > } > > diff --git a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc > b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc > @@ -908,7 +908,7 @@ uint32_t avd_sg_npm_si_func(AVD_CL_CB *c > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_ER("%s:%u: %u", __FILE__, __LINE__, > si->sg_of_si->sg_ncs_spec); > return NCSCC_RC_SUCCESS; > } > @@ -1533,7 +1533,7 @@ uint32_t avd_sg_npm_su_insvc_func(AVD_CL > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_SUCCESS; > } > > @@ -3253,7 +3253,7 @@ uint32_t avd_sg_npm_realign_func(AVD_CL_ > TRACE_ENTER2("'%s'", sg->name.value); > > /* If the SG FSM state is not stable just return success. */ > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > goto done; > } > > @@ -4323,7 +4323,7 @@ uint32_t avd_sg_npm_su_admin_fail(AVD_CL > > TRACE_ENTER2("%u", su->sg_of_su->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > > @@ -4419,7 +4419,7 @@ uint32_t avd_sg_npm_si_admin_down(AVD_CL > > TRACE_ENTER2("%u", si->sg_of_si->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > if (si->list_of_sisu == AVD_SU_SI_REL_NULL) { > @@ -4518,7 +4518,7 @@ uint32_t avd_sg_npm_sg_admin_down(AVD_CL > > TRACE_ENTER2("%u", sg->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > return NCSCC_RC_FAILURE; > } > > diff --git a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc > b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc > @@ -109,7 +109,7 @@ uint32_t avd_sg_nway_si_func(AVD_CL_CB * > goto done; > } > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_ER("%s:%u: %u", __FILE__, __LINE__, > si->sg_of_si->sg_ncs_spec); > goto done; > } > @@ -150,7 +150,7 @@ uint32_t avd_sg_nway_siswitch_func(AVD_C > * not stable. > */ > if ((cb->init_state != AVD_APP_STATE) || > - (si->sg_of_si->sg_ncs_spec == SA_TRUE) || > + (si->sg_of_si->sg_ncs_spec == true) || > (si->sg_of_si->sg_fsm_state != AVD_SG_FSM_STABLE) || > (si->list_of_sisu == AVD_SU_SI_REL_NULL)) { > rc = NCSCC_RC_FAILURE; > goto done; > @@ -282,7 +282,7 @@ uint32_t avd_sg_nway_su_insvc_func(AVD_C > if (su->sg_of_su->sg_fsm_state != AVD_SG_FSM_STABLE) > goto done; > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) > goto done; > > /* a new su is available for assignments.. start assigning */ > @@ -568,7 +568,7 @@ uint32_t avd_sg_nway_realign_func(AVD_CL > TRACE_ENTER2("'%s'", sg->name.value); > > /* If the SG FSM state is not stable just return success. */ > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > goto done; > } > > @@ -689,7 +689,7 @@ uint32_t avd_sg_nway_su_admin_fail(AVD_C > > TRACE_ENTER2("su '%s' sg_fsm_state:%u",su->name.value, > su->sg_of_su->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > goto done; > } > > @@ -795,7 +795,7 @@ uint32_t avd_sg_nway_si_admin_down(AVD_C > > TRACE_ENTER2("%u", si->sg_of_si->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > rc = NCSCC_RC_FAILURE; > goto done; > } > @@ -888,7 +888,7 @@ uint32_t avd_sg_nway_sg_admin_down(AVD_C > > TRACE_ENTER2("%u", sg->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > TRACE_LEAVE(); > return NCSCC_RC_FAILURE; > } > diff --git a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > @@ -252,7 +252,7 @@ uint32_t avd_sg_nacvred_si_func(AVD_CL_C > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > LOG_ER("%s:%u: %u", __FILE__, __LINE__, > si->sg_of_si->sg_ncs_spec); > return NCSCC_RC_SUCCESS; > } > @@ -571,7 +571,7 @@ uint32_t avd_sg_nacvred_su_insvc_func(AV > return NCSCC_RC_SUCCESS; > } > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_SUCCESS; > } > > @@ -1350,7 +1350,7 @@ uint32_t avd_sg_nacvred_realign_func(AVD > TRACE_ENTER2("'%s'", sg->name.value); > > /* If the SG FSM state is not stable just return success. */ > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > goto done; > } > > @@ -1682,7 +1682,7 @@ uint32_t avd_sg_nacvred_su_admin_fail(AV > { > TRACE_ENTER2("%u", su->sg_of_su->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (su->sg_of_su->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > > @@ -1788,7 +1788,7 @@ uint32_t avd_sg_nacvred_si_admin_down(AV > > TRACE_ENTER2("%u", si->sg_of_si->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > SA_FALSE)) { > + if ((cb->init_state != AVD_APP_STATE) && (si->sg_of_si->sg_ncs_spec == > false)) { > return NCSCC_RC_FAILURE; > } > if (si->list_of_sisu == AVD_SU_SI_REL_NULL) { > @@ -1874,7 +1874,7 @@ uint32_t avd_sg_nacvred_sg_admin_down(AV > > TRACE_ENTER2("%u", sg->sg_fsm_state); > > - if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == SA_FALSE)) > { > + if ((cb->init_state != AVD_APP_STATE) && (sg->sg_ncs_spec == false)) { > return NCSCC_RC_FAILURE; > } > > diff --git a/osaf/services/saf/amf/amfd/sgproc.cc > b/osaf/services/saf/amf/amfd/sgproc.cc > --- a/osaf/services/saf/amf/amfd/sgproc.cc > +++ b/osaf/services/saf/amf/amfd/sgproc.cc > @@ -465,7 +465,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb > if (n2d_msg->msg_info.n2d_opr_state.su_oper_state == > SA_AMF_OPERATIONAL_DISABLED) { > /* if the SU is NCS SU, call the node FSM routine to handle the > failure. > */ > - if (su->sg_of_su->sg_ncs_spec == SA_TRUE) { > + if (su->sg_of_su->sg_ncs_spec == true) { > avd_su_oper_state_set(su, SA_AMF_OPERATIONAL_DISABLED); > avd_nd_ncs_su_failed(cb, node); > goto done; > @@ -646,7 +646,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb > /* if the SU is NCS SU, mark the SU readiness state as in > service and call > * the SG FSM. > */ > - if (su->sg_of_su->sg_ncs_spec == SA_TRUE) { > + if (su->sg_of_su->sg_ncs_spec == true) { > m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); > if (su->saAmfSUAdminState == SA_AMF_ADMIN_UNLOCKED) { > avd_su_readiness_state_set(su, > SA_AMF_READINESS_IN_SERVICE); > @@ -661,7 +661,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb > goto done; > } > } > - } else { /* if(su->sg_of_su->sg_ncs_spec == SA_TRUE) */ > + } else { /* if(su->sg_of_su->sg_ncs_spec == true) */ > > old_state = su->saAmfSuReadinessState; > m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); > @@ -941,7 +941,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb, > }/* while(t_sisu) */ > if (true == all_csi_rem) { > /* All the csi removed, so now delete > pg tracking and CSI. */ > - csi_cmplt_delete(csi_tobe_deleted, > static_cast<SaBoolT>(false)); > + csi_cmplt_delete(csi_tobe_deleted, > false); > } > /* Comsume this message. */ > goto done; > @@ -1083,7 +1083,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb, > > n2d_msg->msg_info.n2d_su_si_assign.msg_act, > > n2d_msg->msg_info.n2d_su_si_assign.ha_state); > if ((n2d_msg->msg_info.n2d_su_si_assign.msg_act > == AVSV_SUSI_ACT_ASGN) && > - > (susi->su->sg_of_su->sg_ncs_spec == SA_TRUE)) { > + > (susi->su->sg_of_su->sg_ncs_spec == true)) { > /* Since a NCS SU has been assigned > trigger the node FSM. */ > /* For (ncs_spec == SA_TRUE), su will > not be external, so su > will have node attached. */ > diff --git a/osaf/services/saf/amf/amfd/sgtype.cc > b/osaf/services/saf/amf/amfd/sgtype.cc > --- a/osaf/services/saf/amf/amfd/sgtype.cc > +++ b/osaf/services/saf/amf/amfd/sgtype.cc > @@ -367,7 +367,7 @@ static SaAisErrorT sgtype_ccb_completed_ > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > AVD_AMF_SG_TYPE *sgt; > AVD_SG *sg; > - SaBoolT sg_exist = SA_FALSE; > + bool sg_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -390,12 +390,12 @@ static SaAisErrorT sgtype_ccb_completed_ > while (sg != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &sg->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - sg_exist = SA_TRUE; > + sg_exist = true; > break; > } > sg = sg->sg_list_sg_type_next; > } > - if (sg_exist == SA_TRUE) { > + if (sg_exist == true) { > report_ccb_validation_error(opdata, "SGs exist > of this SG type '%s'",sgt->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/si.cc > b/osaf/services/saf/amf/amfd/si.cc > --- a/osaf/services/saf/amf/amfd/si.cc > +++ b/osaf/services/saf/amf/amfd/si.cc > @@ -816,7 +816,7 @@ static void si_admin_op_cb(SaImmOiHandle > > si = avd_si_get(objectName); > > - if ((operationId != SA_AMF_ADMIN_SI_SWAP) && (si->sg_of_si->sg_ncs_spec > == SA_TRUE)) { > + if ((operationId != SA_AMF_ADMIN_SI_SWAP) && (si->sg_of_si->sg_ncs_spec > == true)) { > report_admin_op_error(immOiHandle, invocation, > SA_AIS_ERR_NOT_SUPPORTED, NULL, > "Admin operation %llu on MW SI is not allowed", > operationId); > goto done; > diff --git a/osaf/services/saf/amf/amfd/su.cc > b/osaf/services/saf/amf/amfd/su.cc > --- a/osaf/services/saf/amf/amfd/su.cc > +++ b/osaf/services/saf/amf/amfd/su.cc > @@ -59,7 +59,7 @@ AVD_SU *avd_su_new(const SaNameT *dn) > su->tree_node.key_info = (uint8_t *)&(su->name); > avsv_sanamet_init(dn, &sg_name, "safSg"); > su->saAmfSUFailover = false; > - su->term_state = static_cast<SaBoolT>(false); > + su->term_state = false; > su->su_switch = AVSV_SI_TOGGLE_STABLE; > su->saAmfSUPreInstantiable = static_cast<SaBoolT>(false); > /* saAmfSUOperState is set when the SU is added to model depending on > @@ -549,14 +549,14 @@ static AVD_AVND *map_su_to_node(AVD_SU * > node = avd_node_get(&ng->saAmfNGNodeList[i]); > osafassert(node); > > - if (su->sg_of_su->sg_ncs_spec == SA_TRUE) { > + if (su->sg_of_su->sg_ncs_spec == true) { > for (su_temp = node->list_of_ncs_su; su_temp != NULL; > su_temp = su_temp->avnd_list_su_next) { > if (su_temp->sg_of_su == su->sg_of_su) > break; > } > } > > - if (su->sg_of_su->sg_ncs_spec == SA_FALSE) { > + if (su->sg_of_su->sg_ncs_spec == false) { > for (su_temp = node->list_of_su; su_temp != NULL; > su_temp = su_temp->avnd_list_su_next) { > if (su_temp->sg_of_su == su->sg_of_su) > break; > @@ -867,7 +867,7 @@ static void su_admin_op_cb(SaImmOiHandle > AVD_CL_CB *cb = (AVD_CL_CB*) avd_cb; > AVD_SU *su, *su_ptr; > AVD_AVND *node; > - SaBoolT is_oper_successful = SA_TRUE; > + bool is_oper_successful = true; > SaAmfAdminStateT adm_state = > static_cast<SaAmfAdminStateT>(SA_AMF_ADMIN_LOCK); > SaAmfReadinessStateT back_red_state; > SaAmfAdminStateT back_admin_state; > @@ -892,7 +892,7 @@ static void su_admin_op_cb(SaImmOiHandle > goto done; > } > > - if ((su->sg_of_su->sg_ncs_spec == SA_TRUE) > + if ((su->sg_of_su->sg_ncs_spec == true) > && (cb->node_id_avd == su->su_on_node->node_info.nodeId)) { > report_admin_op_error(immoi_handle, invocation, > SA_AIS_ERR_NOT_SUPPORTED, NULL, > "Admin operation on Active middleware SU is not > allowed"); > @@ -985,13 +985,13 @@ static void su_admin_op_cb(SaImmOiHandle > */ > avd_su_readiness_state_set(su, > SA_AMF_READINESS_IN_SERVICE); > if (su->sg_of_su->su_insvc(cb, su) != NCSCC_RC_SUCCESS) > - is_oper_successful = SA_FALSE; > + is_oper_successful = false; > > avd_sg_app_su_inst_func(cb, su->sg_of_su); > } else > LOG_IN("SU is not in service"); > > - if ( is_oper_successful == SA_TRUE ) { > + if ( is_oper_successful == true ) { > if ( su->sg_of_su->sg_fsm_state == > AVD_SG_FSM_SG_REALIGN ) { > /* Store the callback parameters to send > operation result later on. */ > su->pend_cbk.admin_oper = > static_cast<SaAmfAdminOperationIdT>(op_id); > @@ -1030,11 +1030,11 @@ static void su_admin_op_cb(SaImmOiHandle > avd_su_admin_state_set(su, adm_state); > > if (su->sg_of_su->su_admin_down(cb, su, node) != > NCSCC_RC_SUCCESS) > - is_oper_successful = SA_FALSE; > + is_oper_successful = false; > > avd_sg_app_su_inst_func(avd_cb, su->sg_of_su); > > - if ( is_oper_successful == SA_TRUE ) { > + if ( is_oper_successful == true ) { > if ( (su->sg_of_su->sg_fsm_state == > AVD_SG_FSM_SG_REALIGN) || > (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SU_OPER) > ) { > /* Store the callback parameters to send > operation result later on. */ > diff --git a/osaf/services/saf/amf/amfd/sutype.cc > b/osaf/services/saf/amf/amfd/sutype.cc > --- a/osaf/services/saf/amf/amfd/sutype.cc > +++ b/osaf/services/saf/amf/amfd/sutype.cc > @@ -359,7 +359,7 @@ static SaAisErrorT sutype_ccb_completed_ > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > struct avd_sutype *sut; > AVD_SU *su; > - SaBoolT su_exist = SA_FALSE; > + bool su_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -382,12 +382,12 @@ static SaAisErrorT sutype_ccb_completed_ > while (su != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &su->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - su_exist = SA_TRUE; > + su_exist = true; > break; > } > su = su->su_list_su_type_next; > } > - if (su_exist == SA_TRUE) { > + if (su_exist == true) { > report_ccb_validation_error(opdata, > "SaAmfSUType '%s'is in use",sut->name.value); > goto done; > } > diff --git a/osaf/services/saf/amf/amfd/svctype.cc > b/osaf/services/saf/amf/amfd/svctype.cc > --- a/osaf/services/saf/amf/amfd/svctype.cc > +++ b/osaf/services/saf/amf/amfd/svctype.cc > @@ -145,7 +145,7 @@ static SaAisErrorT svctype_ccb_completed > SaAisErrorT rc = SA_AIS_ERR_BAD_OPERATION; > AVD_SVC_TYPE *svc_type; > AVD_SI *si; > - SaBoolT si_exist = SA_FALSE; > + bool si_exist = false; > CcbUtilOperationData_t *t_opData; > > TRACE_ENTER2("CCB ID %llu, '%s'", opdata->ccbId, > opdata->objectName.value); > @@ -168,12 +168,12 @@ static SaAisErrorT svctype_ccb_completed > while (si != NULL) { > t_opData = > ccbutil_getCcbOpDataByDN(opdata->ccbId, &si->name); > if ((t_opData == NULL) || > (t_opData->operationType != CCBUTIL_DELETE)) { > - si_exist = SA_TRUE; > + si_exist = true; > break; > } > si = si->si_list_svc_type_next; > } > - if (si_exist == SA_TRUE) { > + if (si_exist == true) { > report_ccb_validation_error(opdata, > "SaAmfSvcType '%s' is in use",svc_type->name.value); > goto done; > } ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
