Ack with comment: - there are 2 occurrences of "x != true", please change to "x == false"
Thanks, Hans > -----Original Message----- > From: Hans Nordebäck > Sent: den 14 januari 2014 13:24 > To: Hans Feldt; [email protected]; [email protected] > Cc: [email protected] > Subject: [PATCH 2 of 4] amfnd: use bool instead of SaBoolT [#713] > > osaf/services/saf/amf/amfnd/clc.cc | 6 +++--- > osaf/services/saf/amf/amfnd/clm.cc | 8 ++++---- > osaf/services/saf/amf/amfnd/comp.cc | 4 +--- > osaf/services/saf/amf/amfnd/compdb.cc | 14 ++++++-------- > osaf/services/saf/amf/amfnd/di.cc | 2 +- > osaf/services/saf/amf/amfnd/err.cc | 4 ++-- > osaf/services/saf/amf/amfnd/include/avnd_cb.h | 2 +- > osaf/services/saf/amf/amfnd/include/avnd_comp.h | 2 +- > osaf/services/saf/amf/amfnd/susm.cc | 1 - > osaf/services/saf/amf/amfnd/term.cc | 2 +- > 10 files changed, 20 insertions(+), 25 deletions(-) > > > Since bool is a fundamental datatype in C++ let's use it > > diff --git a/osaf/services/saf/amf/amfnd/clc.cc > b/osaf/services/saf/amf/amfnd/clc.cc > --- a/osaf/services/saf/amf/amfnd/clc.cc > +++ b/osaf/services/saf/amf/amfnd/clc.cc > @@ -895,7 +895,7 @@ uint32_t avnd_comp_clc_st_chng_prc(AVND_ > */ > > /* Count the number of restarts if not due to admin restart*/ > - if (SA_AMF_PRESENCE_RESTARTING == final_st && comp->admin_oper != > SA_TRUE) { > + if (SA_AMF_PRESENCE_RESTARTING == final_st && comp->admin_oper != true) > { > comp->err_info.restart_cnt++; > > m_AVND_SEND_CKPT_UPDT_ASYNC_UPDT(cb, comp, > AVND_CKPT_COMP_ERR_INFO); > @@ -915,9 +915,9 @@ uint32_t avnd_comp_clc_st_chng_prc(AVND_ > goto done; > } > /* reset the admin-oper flag to false */ > - if (comp->admin_oper == SA_TRUE) { > + if (comp->admin_oper == true) { > TRACE_1("Component restart is through admin opration, admin > oper flag reset"); > - comp->admin_oper = SA_FALSE; > + comp->admin_oper = false; > } > > if ((SA_AMF_PRESENCE_INSTANTIATED == prv_st) && > (SA_AMF_PRESENCE_UNINSTANTIATED != final_st)) { > diff --git a/osaf/services/saf/amf/amfnd/clm.cc > b/osaf/services/saf/amf/amfnd/clm.cc > --- a/osaf/services/saf/amf/amfnd/clm.cc > +++ b/osaf/services/saf/amf/amfnd/clm.cc > @@ -206,7 +206,7 @@ static void clm_track_cb(const SaClmClus > "notifItem->clusterNode.nodeId %u, > avnd_cb->node_info.nodeId %u", > > notifItem->clusterNode.nodeName.value,avnd_cb->first_time_up, > > notifItem->clusterNode.nodeId,avnd_cb->node_info.nodeId); > - if(SA_FALSE == avnd_cb->first_time_up) { > + if(false == avnd_cb->first_time_up) { > /* When node reboots, we will get an exit cbk, > so ignore if avnd_cb->first_time_up > is false. */ > if(notifItem->clusterNode.nodeId == > avnd_cb->node_info.nodeId) { > @@ -231,7 +231,7 @@ static void clm_track_cb(const SaClmClus > SA_TRACK_CURRENT|CHANGES_ONLY and supply no buffer > in saClmClusterTrack call so update the local database > */ > if (notifItem->clusterNode.nodeId == > m_NCS_NODE_ID_FROM_MDS_DEST(avnd_cb->avnd_dest)) { > - if (avnd_cb->first_time_up == SA_TRUE) { > + if (avnd_cb->first_time_up == true) { > /* store the local node info */ > memcpy(&(avnd_cb->node_info), > &(notifItem->clusterNode), > @@ -239,7 +239,7 @@ static void clm_track_cb(const SaClmClus > /*get the amf node from clm node name */ > clm_to_amf_node(); > avnd_send_node_up_msg(); > - avnd_cb->first_time_up = SA_FALSE; > + avnd_cb->first_time_up = false; > } > } > } > @@ -265,7 +265,7 @@ SaAisErrorT avnd_clm_init(void) > SaUint8T trackFlags = SA_TRACK_CURRENT|SA_TRACK_CHANGES_ONLY; > > TRACE_ENTER(); > - avnd_cb->first_time_up = SA_TRUE; > + avnd_cb->first_time_up = true; > error = saClmInitialize_4(&avnd_cb->clmHandle, &callbacks, &Version); > if (SA_AIS_OK != error) { > LOG_ER("Failed to Initialize with CLM: %u", error); > diff --git a/osaf/services/saf/amf/amfnd/comp.cc > b/osaf/services/saf/amf/amfnd/comp.cc > --- a/osaf/services/saf/amf/amfnd/comp.cc > +++ b/osaf/services/saf/amf/amfnd/comp.cc > @@ -32,9 +32,7 @@ > > ****************************************************************************** > */ > > -#include <stdbool.h> > #include "avnd.h" > -#include <stdbool.h> > #include <immutil.h> > > /*** Static function declarations ***/ > @@ -2677,7 +2675,7 @@ uint32_t avnd_evt_comp_admin_op_req(AVND > case SA_AMF_ADMIN_RESTART: > if (comp->pres == SA_AMF_PRESENCE_INSTANTIATED) { > /* Now trigger the component admin restart */ > - comp->admin_oper = SA_TRUE; > + comp->admin_oper = true; > LOG_NO("Admin restart requested for '%s'", > info->dn.value); > rc = comp_restart_initiate(comp); > } > diff --git a/osaf/services/saf/amf/amfnd/compdb.cc > b/osaf/services/saf/amf/amfnd/compdb.cc > --- a/osaf/services/saf/amf/amfnd/compdb.cc > +++ b/osaf/services/saf/amf/amfnd/compdb.cc > @@ -31,8 +31,6 @@ > > ****************************************************************************** > */ > > -#include <stdbool.h> > - > #include <saImmOm.h> > #include <amf_util.h> > #include <immutil.h> > @@ -87,7 +85,7 @@ typedef struct amf_comp_type { > SaStringT *osafAmfCtDefHcCmdArgv; > SaTimeT saAmfCompQuiescingCompleteTimeout; > SaAmfRecommendedRecoveryT saAmfCtDefRecoveryOnError; > - SaBoolT saAmfCtDefDisableRestart; > + bool saAmfCtDefDisableRestart; > } amf_comp_type_t; > > > /***************************************************************************** > @@ -810,8 +808,8 @@ uint32_t avnd_comp_oper_req(AVND_CB *cb, > uint32_t disable_restart; > osafassert(sizeof(uint32_t) == > param->value_len); > disable_restart = ntohl(*(uint32_t > *)(param->value)); > - osafassert(disable_restart <= SA_TRUE); > - comp->is_restart_en = (disable_restart == > SA_TRUE) ? false : true; > + osafassert(disable_restart <= true); > + comp->is_restart_en = (disable_restart == true) > ? false : true; > LOG_NO("saAmfCompDisableRestart changed to %u > for '%s'", > disable_restart, comp->name.value); > break; > @@ -1075,7 +1073,7 @@ static amf_comp_type_t *avnd_comptype_cr > } > > if > (immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCtDefDisableRestart"), > attributes, 0, &compt- > >saAmfCtDefDisableRestart) != SA_AIS_OK) > - compt->saAmfCtDefDisableRestart = SA_FALSE; > + compt->saAmfCtDefDisableRestart = false; > > rc = 0; > > @@ -1356,7 +1354,7 @@ static int comp_init(AVND_COMP *comp, co > AVND_COMP_CLC_CMD_PARAM *cmd; > amf_comp_type_t *comptype; > SaNameT nodeswbundle_name; > - SaBoolT disable_restart; > + bool disable_restart; > char *path_prefix = NULL; > unsigned int i; > unsigned int num_of_comp_env = 0; > @@ -1472,7 +1470,7 @@ static int comp_init(AVND_COMP *comp, co > if > (immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompDisableRestart"), > attributes, 0, &disable_restart) != > SA_AIS_OK) > disable_restart = comptype->saAmfCtDefDisableRestart; > > - comp->is_restart_en = (disable_restart == SA_TRUE) ? false : true; > + comp->is_restart_en = (disable_restart == true) ? false : true; > > init_comp_category(comp, comptype->saAmfCtCompCategory); > > diff --git a/osaf/services/saf/amf/amfnd/di.cc > b/osaf/services/saf/amf/amfnd/di.cc > --- a/osaf/services/saf/amf/amfnd/di.cc > +++ b/osaf/services/saf/amf/amfnd/di.cc > @@ -334,7 +334,7 @@ void avnd_send_node_up_msg(void) > > TRACE_ENTER(); > > - if (cb->node_info.member != SA_TRUE) { > + if (cb->node_info.member != true) { > TRACE("not member"); > goto done; > } > diff --git a/osaf/services/saf/amf/amfnd/err.cc > b/osaf/services/saf/amf/amfnd/err.cc > --- a/osaf/services/saf/amf/amfnd/err.cc > +++ b/osaf/services/saf/amf/amfnd/err.cc > @@ -310,7 +310,7 @@ uint32_t avnd_err_process(AVND_CB *cb, A > } > > /* when undergoing admin oper do not process any component errors */ > - if (comp->admin_oper == SA_TRUE) > + if (comp->admin_oper == true) > goto done; > > /* Level3 escalation is node failover. we dont expect any > @@ -323,7 +323,7 @@ uint32_t avnd_err_process(AVND_CB *cb, A > * component) is done for components which goes down after > AVND_ERR_ESC_LEVEL_3 is set > */ > if ((cb->node_err_esc_level == AVND_ERR_ESC_LEVEL_3) && > - (comp->su->is_ncs == SA_FALSE) && (esc_rcvr != > SA_AMF_NODE_FAILFAST) && > + (comp->su->is_ncs == false) && (esc_rcvr != SA_AMF_NODE_FAILFAST) && > (AVND_ERR_SRC_AVA_DN != err_info->src)) > { > /* For external component, comp->su->is_ncs is false, so no > need to > put a check here for external component explicitely. */ > diff --git a/osaf/services/saf/amf/amfnd/include/avnd_cb.h > b/osaf/services/saf/amf/amfnd/include/avnd_cb.h > --- a/osaf/services/saf/amf/amfnd/include/avnd_cb.h > +++ b/osaf/services/saf/amf/amfnd/include/avnd_cb.h > @@ -126,7 +126,7 @@ typedef struct avnd_cb_tag { > > SaClmHandleT clmHandle; > SaSelectionObjectT clm_sel_obj; > - SaBoolT first_time_up; > + bool first_time_up; > bool reboot_in_progress; > AVND_SU *failed_su; > bool cont_reboot_in_progress; > diff --git a/osaf/services/saf/amf/amfnd/include/avnd_comp.h > b/osaf/services/saf/amf/amfnd/include/avnd_comp.h > --- a/osaf/services/saf/amf/amfnd/include/avnd_comp.h > +++ b/osaf/services/saf/amf/amfnd/include/avnd_comp.h > @@ -356,7 +356,7 @@ typedef struct avnd_comp_tag { > bool reg_resp_pending; /* If the reg resp is pending from > proxied comp AvND, it true. */ > SaNameT proxy_comp_name; /* Used for Checkpointing. */ > - SaBoolT admin_oper; /*set to true if undergoing admin operation */ > + bool admin_oper; /*set to true if undergoing admin operation */ > int config_is_valid; /* Used to indicate that config has to be > refreshed from IMM */ > bool assigned_flag; /* Used in finding multiple csi for a single comp > while csi mod.*/ > > diff --git a/osaf/services/saf/amf/amfnd/susm.cc > b/osaf/services/saf/amf/amfnd/susm.cc > --- a/osaf/services/saf/amf/amfnd/susm.cc > +++ b/osaf/services/saf/amf/amfnd/susm.cc > @@ -33,7 +33,6 @@ > > ****************************************************************************** > */ > > -#include <stdbool.h> > #include "avnd.h" > > /* static function declarations */ > diff --git a/osaf/services/saf/amf/amfnd/term.cc > b/osaf/services/saf/amf/amfnd/term.cc > --- a/osaf/services/saf/amf/amfnd/term.cc > +++ b/osaf/services/saf/amf/amfnd/term.cc > @@ -76,7 +76,7 @@ void avnd_last_step_clean(AVND_CB *cb) > } > > /* make avnd_err_process() a nop, will be called due to > ava mds down */ > - comp->admin_oper = SA_TRUE; > + comp->admin_oper = true; > } > > comp = (AVND_COMP *) ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
