osaf/services/saf/amf/amfd/hlt.cc | 1 +
osaf/services/saf/amf/amfd/imm.cc | 1 +
osaf/services/saf/amf/amfd/include/ntf.h | 4 ++--
osaf/services/saf/amf/amfd/include/sg.h | 1 -
osaf/services/saf/amf/amfd/include/susi.h | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
* Dereference null return value (NULL_RETURNS)
* Uninitialized scalar variable (UNINIT)
* Big parameter passed by value (PASS_BY_VALUE)
* Remove saAmfStgValidSuTypes from AVD_AMF_SG_TYPE, as it
appears to be a typo of saAmfSGtValidSuTypes
diff --git a/osaf/services/saf/amf/amfd/hlt.cc
b/osaf/services/saf/amf/amfd/hlt.cc
--- a/osaf/services/saf/amf/amfd/hlt.cc
+++ b/osaf/services/saf/amf/amfd/hlt.cc
@@ -64,6 +64,7 @@
avsv_sanamet_init(&opdata->objectName, &comp_name, "safComp=");
comp = avd_comp_get(&comp_name);
+ osafassert(comp);
if (comp->su->saAmfSUAdminState != SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
report_ccb_validation_error(opdata, "SU admin state is not
locked instantiation required for deletion");
diff --git a/osaf/services/saf/amf/amfd/imm.cc
b/osaf/services/saf/amf/amfd/imm.cc
--- a/osaf/services/saf/amf/amfd/imm.cc
+++ b/osaf/services/saf/amf/amfd/imm.cc
@@ -1083,6 +1083,7 @@
type = object_name_to_class_type(&next->opdata->objectName);
if ((type == AVSV_SA_AMF_SG) && (next->opdata->operationType ==
CCBUTIL_CREATE)) {
AVD_SG *sg = avd_sg_get(&next->opdata->objectName);
+ osafassert(sg);
avd_sg_adjust_config(sg);
}
next = next->next_ccb_to_apply;
diff --git a/osaf/services/saf/amf/amfd/include/ntf.h
b/osaf/services/saf/amf/amfd/include/ntf.h
--- a/osaf/services/saf/amf/amfd/include/ntf.h
+++ b/osaf/services/saf/amf/amfd/include/ntf.h
@@ -69,7 +69,7 @@
int type); /* add_info 0 --> no, 1-->
node_name, 2--> si_name*/
uint32_t sendAlarmNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT comp_name,
+ const SaNameT& comp_name,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
@@ -79,7 +79,7 @@
int type); /* add_info 0 --> no, 1-->
node_name, 2--> si_name*/
uint32_t sendStateChangeNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT comp_name,
+ const SaNameT& comp_name,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
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
@@ -247,7 +247,6 @@
/******************** B.04 model
*************************************************/
SaNameT *saAmfSGtValidSuTypes; /* array of DNs, size in number_su_type
*/
SaAmfRedundancyModelT saAmfSgtRedundancyModel;
- SaNameT *saAmfStgValidSuTypes;
SaBoolT saAmfSgtDefAutoRepair;
SaBoolT saAmfSgtDefAutoAdjust;
SaTimeT saAmfSgtDefAutoAdjustProb;
diff --git a/osaf/services/saf/amf/amfd/include/susi.h
b/osaf/services/saf/amf/amfd/include/susi.h
--- a/osaf/services/saf/amf/amfd/include/susi.h
+++ b/osaf/services/saf/amf/amfd/include/susi.h
@@ -145,8 +145,8 @@
AVD_SU_SI_REL *avd_susi_find_next(AVD_CL_CB *cb, SaNameT su_name, SaNameT
si_name);
uint32_t avd_susi_delete(AVD_CL_CB *cb, AVD_SU_SI_REL *susi, bool ckpt);
extern AVD_SUS_PER_SI_RANK *avd_sirankedsu_getnext_valid(AVD_CL_CB *cb,
- AVD_SUS_PER_SI_RANK_INDX indx, AVD_SU **o_su);
-extern AVD_SUS_PER_SI_RANK *avd_sirankedsu_getnext(AVD_CL_CB *cb,
AVD_SUS_PER_SI_RANK_INDX indx);
+ const AVD_SUS_PER_SI_RANK_INDX& indx, AVD_SU **o_su);
+extern AVD_SUS_PER_SI_RANK *avd_sirankedsu_getnext(AVD_CL_CB *cb, const
AVD_SUS_PER_SI_RANK_INDX& indx);
extern SaAisErrorT avd_sirankedsu_config_get(SaNameT *si_name, AVD_SI *si);
extern void avd_sirankedsu_constructor(void);
extern void avd_susi_ha_state_set(AVD_SU_SI_REL *susi, SaAmfHAStateT ha_state);
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
