osaf/libs/agents/saf/imma/imma_db.cc | 7 +-
osaf/libs/agents/saf/imma/imma_init.cc | 4 +-
osaf/libs/agents/saf/imma/imma_mds.cc | 4 +-
osaf/libs/agents/saf/imma/imma_oi_api.cc | 34 +++---
osaf/libs/agents/saf/imma/imma_om_api.cc | 144 +++++++++++++++---------------
osaf/libs/agents/saf/imma/imma_proc.cc | 96 ++++++++++----------
osaf/libs/agents/saf/imma/imma_proc.h | 8 +-
7 files changed, 147 insertions(+), 150 deletions(-)
Fix "invalid conversion" errors.
diff --git a/osaf/libs/agents/saf/imma/imma_db.cc
b/osaf/libs/agents/saf/imma/imma_db.cc
--- a/osaf/libs/agents/saf/imma/imma_db.cc
+++ b/osaf/libs/agents/saf/imma/imma_db.cc
@@ -227,7 +227,7 @@ void imma_oi_ccb_record_add(IMMA_CLIENT_
return;
}
- new_ccb = calloc(1, sizeof(struct imma_oi_ccb_record));
+ new_ccb = (imma_oi_ccb_record *) calloc(1, sizeof(imma_oi_ccb_record));
new_ccb->ccbId = ccbId;
if(!inv) {/* zero inv =>PBE or Applier => count ops. */
@@ -1206,7 +1206,7 @@ uint32_t imma_search_node_delete(IMMA_CB
}
if (search_node->mLastAttributes) {
- imma_freeSearchAttrs(search_node->mLastAttributes);
+ imma_freeSearchAttrs((SaImmAttrValuesT_2 **)
search_node->mLastAttributes);
search_node->mLastAttributes = NULL;
}
@@ -1354,7 +1354,7 @@ SaStringT* imma_getErrorStrings(IMMSV_SA
errStrs = errStrs->next;
}
- errStringArr = calloc(listSize + 1, sizeof(SaStringT));
+ errStringArr = (SaStringT *) calloc(listSize + 1, sizeof(SaStringT));
errStrs = errRsp->errStrings;
listSize = 0;
@@ -1393,7 +1393,6 @@ void imma_freeSearchAttrs(SaImmAttrValue
free(att->attrValues); /*free-4 */
att->attrValues = NULL;
att->attrValuesNumber = 0;
- att->attrValueType = 0;
free(att); /*free-2 */
attr[ix] = NULL;
diff --git a/osaf/libs/agents/saf/imma/imma_init.cc
b/osaf/libs/agents/saf/imma/imma_init.cc
--- a/osaf/libs/agents/saf/imma/imma_init.cc
+++ b/osaf/libs/agents/saf/imma/imma_init.cc
@@ -184,7 +184,6 @@ static uint32_t imma_create(NCSMDS_SVC_I
imma_mds_unregister(cb);
mds_reg_fail:
- cb->sv_id = 0;
imma_db_destroy(cb);
db_init_fail:
@@ -226,7 +225,6 @@ static uint32_t imma_destroy(NCSMDS_SVC_
/* Destroy the IMMA database */
osafassert(cb->sv_id == sv_id);
- cb->sv_id = 0;
imma_db_destroy(cb);
/* destroy the lock */
@@ -455,7 +453,7 @@ void imma_copyAttrValue(IMMSV_EDU_ATTR_V
}
p->val.x.size = valueSize;
- p->val.x.buf = (valueSize) ? malloc(valueSize) : NULL;
+ p->val.x.buf = (valueSize) ? (char *) malloc(valueSize) : NULL;
if (attrValue && valueSize) {
switch (attrValueType) {
diff --git a/osaf/libs/agents/saf/imma/imma_mds.cc
b/osaf/libs/agents/saf/imma/imma_mds.cc
--- a/osaf/libs/agents/saf/imma/imma_mds.cc
+++ b/osaf/libs/agents/saf/imma/imma_mds.cc
@@ -542,7 +542,7 @@ static uint32_t imma_mds_dec(IMMA_CB *cb
}
#endif /*ABT DOES NOT WORK */
- evt = calloc(1, sizeof(IMMSV_EVT)); /* calloc zeroes memory */
+ evt = (IMMSV_EVT *) calloc(1, sizeof(IMMSV_EVT)); /* calloc
zeroes memory */
if (!evt)
return NCSCC_RC_FAILURE;
@@ -604,7 +604,7 @@ uint32_t imma_mds_msg_sync_send(uint32_t
rc = ncsmds_api(&mds_info);
if (rc == NCSCC_RC_SUCCESS)
- *o_evt = mds_info.info.svc_send.info.sndrsp.o_rsp;
+ *o_evt = (IMMSV_EVT *) mds_info.info.svc_send.info.sndrsp.o_rsp;
return rc;
}
diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.cc
b/osaf/libs/agents/saf/imma/imma_oi_api.cc
--- a/osaf/libs/agents/saf/imma/imma_oi_api.cc
+++ b/osaf/libs/agents/saf/imma/imma_oi_api.cc
@@ -1028,7 +1028,7 @@ static SaAisErrorT admin_op_result_commo
for (i = 0; returnParams[i]; ++i) {
param = returnParams[i];
/*alloc-a */
- IMMSV_ADMIN_OPERATION_PARAM *p =
malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
+ IMMSV_ADMIN_OPERATION_PARAM *p =
(IMMSV_ADMIN_OPERATION_PARAM *) malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
memset(p, 0, sizeof(IMMSV_ADMIN_OPERATION_PARAM));
TRACE("PARAM:%s \n", param->paramName);
@@ -1066,7 +1066,7 @@ static SaAisErrorT admin_op_result_commo
goto mds_send_fail;
}
/*alloc-b */
- p->paramName.buf = malloc(p->paramName.size);
+ p->paramName.buf = (char *) malloc(p->paramName.size);
strncpy(p->paramName.buf, param->paramName,
p->paramName.size);
p->paramType = param->paramType;
@@ -1123,7 +1123,7 @@ static SaAisErrorT admin_op_result_commo
free(p->paramName.buf);
p->paramName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->paramBuffer), p->paramType);
/*free-c */
+ immsv_evt_free_att_val(&(p->paramBuffer), (SaImmValueTypeT)
p->paramType); /*free-c */
p->next = NULL;
free(p); /*free-a */
}
@@ -1418,7 +1418,7 @@ SaAisErrorT saImmOiImplementerSet(SaImmO
rc = out_evt->info.imma.info.implSetRsp.error;
if (rc == SA_AIS_OK) {
cl_node->mImplementerId =
out_evt->info.imma.info.implSetRsp.implId;
- cl_node->mImplementerName = calloc(1, nameLen);
+ cl_node->mImplementerName = (char *) calloc(1,
nameLen);
strncpy(cl_node->mImplementerName,
implementerName, nameLen);
}
}
@@ -2563,12 +2563,12 @@ static SaAisErrorT rt_object_update_comm
}
/*alloc-2 */
- p = calloc(1, sizeof(IMMSV_ATTR_MODS_LIST));
+ p = (IMMSV_ATTR_MODS_LIST *) calloc(1,
sizeof(IMMSV_ATTR_MODS_LIST));
p->attrModType = attrMod->modType;
p->attrValue.attrName.size = strlen(attrMod->modAttr.attrName)
+ 1;
/* alloc 3 */
- p->attrValue.attrName.buf = malloc(p->attrValue.attrName.size);
+ p->attrValue.attrName.buf = (char *)
malloc(p->attrValue.attrName.size);
strncpy(p->attrValue.attrName.buf, attrMod->modAttr.attrName,
p->attrValue.attrName.size);
p->attrValue.attrValuesNumber =
attrMod->modAttr.attrValuesNumber;
@@ -2584,7 +2584,7 @@ static SaAisErrorT rt_object_update_comm
unsigned int i;
for (i = 1; i <= numAdded; ++i) {
/*alloc-5 */
- IMMSV_EDU_ATTR_VAL_LIST *al = calloc(1,
sizeof(IMMSV_EDU_ATTR_VAL_LIST));
+ IMMSV_EDU_ATTR_VAL_LIST *al =
(IMMSV_EDU_ATTR_VAL_LIST *) calloc(1, sizeof(IMMSV_EDU_ATTR_VAL_LIST));
/*alloc-6 */
imma_copyAttrValue(&(al->n),
attrMod->modAttr.attrValueType, avarr[i]);
al->next = p->attrValue.attrMoreValues;
/*NULL initially */
@@ -2692,13 +2692,13 @@ static SaAisErrorT rt_object_update_comm
if (p->attrValue.attrValuesNumber) {
immsv_evt_free_att_val(&(p->attrValue.attrValue),
/*free-4 */
- p->attrValue.attrValueType);
+ (SaImmValueTypeT)
p->attrValue.attrValueType);
while (p->attrValue.attrMoreValues) {
IMMSV_EDU_ATTR_VAL_LIST *al =
p->attrValue.attrMoreValues;
p->attrValue.attrMoreValues = al->next;
al->next = NULL;
- immsv_evt_free_att_val(&(al->n),
p->attrValue.attrValueType); /*free-6 */
+ immsv_evt_free_att_val(&(al->n),
(SaImmValueTypeT) p->attrValue.attrValueType); /*free-6 */
free(al); /*free-5 */
}
}
@@ -2853,7 +2853,7 @@ static SaAisErrorT rt_object_create_comm
evt.info.immnd.info.objCreate.className.size = strlen(className) + 1;
/*alloc-1 */
- evt.info.immnd.info.objCreate.className.buf =
malloc(evt.info.immnd.info.objCreate.className.size);
+ evt.info.immnd.info.objCreate.className.buf = (char *)
malloc(evt.info.immnd.info.objCreate.className.size);
strncpy(evt.info.immnd.info.objCreate.className.buf, className,
evt.info.immnd.info.objCreate.className.size);
if(objectName) {
@@ -2922,7 +2922,7 @@ static SaAisErrorT rt_object_create_comm
} else if(attr->attrValueType == SA_IMM_ATTR_SANAMET) {
int n;
for(n=0; n<attr->attrValuesNumber; n++) {
-
if(!osaf_is_extended_name_valid(attr->attrValues[n])) {
+
if(!osaf_is_extended_name_valid((SaNameT*) attr->attrValues[n])) {
rc = SA_AIS_ERR_INVALID_PARAM;
TRACE_2("ERR_INVALID_PARAM:
Attribute '%s' value is not valid", attr->attrName);
goto mds_send_fail;
@@ -2931,7 +2931,7 @@ static SaAisErrorT rt_object_create_comm
}
/*alloc-3 */
- p = calloc(1, sizeof(IMMSV_ATTR_VALUES_LIST));
+ p = (IMMSV_ATTR_VALUES_LIST *) calloc(1,
sizeof(IMMSV_ATTR_VALUES_LIST));
p->n.attrName.size = strlen(attr->attrName) + 1;
if (p->n.attrName.size >= IMMSV_MAX_ATTR_NAME_LENGTH) {
@@ -2942,7 +2942,7 @@ static SaAisErrorT rt_object_create_comm
}
/*alloc-4 */
- p->n.attrName.buf = malloc(p->n.attrName.size);
+ p->n.attrName.buf = (char *) malloc(p->n.attrName.size);
strncpy(p->n.attrName.buf, attr->attrName,
p->n.attrName.size);
p->n.attrValuesNumber = attr->attrValuesNumber;
@@ -2957,7 +2957,7 @@ static SaAisErrorT rt_object_create_comm
unsigned int i;
for (i = 1; i <= numAdded; ++i) {
/*alloc-6 */
- IMMSV_EDU_ATTR_VAL_LIST *al = calloc(1,
sizeof(IMMSV_EDU_ATTR_VAL_LIST));
+ IMMSV_EDU_ATTR_VAL_LIST *al =
(IMMSV_EDU_ATTR_VAL_LIST *) calloc(1, sizeof(IMMSV_EDU_ATTR_VAL_LIST));
/*alloc-7 */
imma_copyAttrValue(&(al->n),
attr->attrValueType, avarr[i]);
@@ -3036,13 +3036,13 @@ static SaAisErrorT rt_object_create_comm
p->n.attrName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->n.attrValue), p->n.attrValueType);
/*free-5 */
+ immsv_evt_free_att_val(&(p->n.attrValue), (SaImmValueTypeT)
p->n.attrValueType); /*free-5 */
while (p->n.attrMoreValues) {
IMMSV_EDU_ATTR_VAL_LIST *al = p->n.attrMoreValues;
p->n.attrMoreValues = al->next;
al->next = NULL;
- immsv_evt_free_att_val(&(al->n), p->n.attrValueType);
/*free-7 */
+ immsv_evt_free_att_val(&(al->n), (SaImmValueTypeT)
p->n.attrValueType); /*free-7 */
free(al); /*free-6 */
}
@@ -3567,7 +3567,7 @@ static SaAisErrorT
getAdmoName(SaImmHandleT privateOmHandle, IMMA_CALLBACK_INFO * cbi, SaNameT*
admoNameOut)
{
SaAisErrorT rc = SA_AIS_OK;
- const SaImmAttrNameT admoNameAttr = SA_IMM_ATTR_ADMIN_OWNER_NAME;
+ const SaImmAttrNameT admoNameAttr = (char *) SA_IMM_ATTR_ADMIN_OWNER_NAME;
SaImmAttrValuesT_2 **attributes = NULL;
SaImmAttrValuesT_2 *attrVal = NULL;
TRACE_ENTER();
diff --git a/osaf/libs/agents/saf/imma/imma_om_api.cc
b/osaf/libs/agents/saf/imma/imma_om_api.cc
--- a/osaf/libs/agents/saf/imma/imma_om_api.cc
+++ b/osaf/libs/agents/saf/imma/imma_om_api.cc
@@ -49,7 +49,7 @@ static const char *immLoaderName = IMMSV
/* TODO: ABT move these to cb ? OR stop using the cb*/
static SaInt32T immInvocations = 0;
-static SaBoolT immOmIsLoader = SA_FALSE;
+static bool immOmIsLoader = false;
static const char *sysaClName = SA_IMM_ATTR_CLASS_NAME;
static const char *sysaAdmName = SA_IMM_ATTR_ADMIN_OWNER_NAME;
@@ -1020,7 +1020,7 @@ SaAisErrorT saImmOmAdminOwnerInitialize(
osaf_extended_name_alloc(adminOwnerName,
&evt.info.immnd.info.adminitReq.i.adminOwnerName);
if (releaseOwnershipOnFinalize) {
- evt.info.immnd.info.adminitReq.i.releaseOwnershipOnFinalize =
true;
+ evt.info.immnd.info.adminitReq.i.releaseOwnershipOnFinalize =
SA_TRUE;
/* Release on finalize can not be undone in case of IMMND crash.
The om-handle can then not be resurrected unless this
admin-owner
has been finalized before the IMMND crash.
@@ -1102,7 +1102,7 @@ SaAisErrorT saImmOmAdminOwnerInitialize(
rc = out_evt->info.imma.info.admInitRsp.error;
if (rc == SA_AIS_OK) {
ao_node->mAdminOwnerId =
out_evt->info.imma.info.admInitRsp.ownerId;
- ao_node->mAdminOwnerName = calloc(1, nameLen+1);
+ ao_node->mAdminOwnerName = (char *) calloc(1,
nameLen+1);
strncpy(ao_node->mAdminOwnerName, adminOwnerName,
nameLen);
} else {goto admin_owner_node_free;}
} else {
@@ -1834,7 +1834,7 @@ static SaAisErrorT ccb_object_create_com
evt.info.immnd.info.objCreate.className.size = strlen(className) + 1;
/*alloc-1 */
- evt.info.immnd.info.objCreate.className.buf =
malloc(evt.info.immnd.info.objCreate.className.size);
+ evt.info.immnd.info.objCreate.className.buf = (char *)
malloc(evt.info.immnd.info.objCreate.className.size);
if (evt.info.immnd.info.objCreate.className.buf == NULL) {
rc = SA_AIS_ERR_NO_MEMORY;
goto mds_send_fail;
@@ -1933,7 +1933,7 @@ static SaAisErrorT ccb_object_create_com
}
/*alloc-3 */
- p = calloc(1, sizeof(IMMSV_ATTR_VALUES_LIST));
+ p = (IMMSV_ATTR_VALUES_LIST *) calloc(1,
sizeof(IMMSV_ATTR_VALUES_LIST));
p->n.attrName.size = strlen(attr->attrName) + 1;
if (p->n.attrName.size >= IMMSV_MAX_ATTR_NAME_LENGTH) {
@@ -1945,7 +1945,7 @@ static SaAisErrorT ccb_object_create_com
}
/*alloc-4 */
- p->n.attrName.buf = malloc(p->n.attrName.size);
+ p->n.attrName.buf = (char *) malloc(p->n.attrName.size);
strncpy(p->n.attrName.buf, attr->attrName,
p->n.attrName.size);
@@ -1961,7 +1961,7 @@ static SaAisErrorT ccb_object_create_com
unsigned int i;
for (i = 1; i <= numAdded; ++i) {
/*alloc-6 */
- IMMSV_EDU_ATTR_VAL_LIST *al = calloc(1,
sizeof(IMMSV_EDU_ATTR_VAL_LIST));
+ IMMSV_EDU_ATTR_VAL_LIST *al =
(IMMSV_EDU_ATTR_VAL_LIST *) calloc(1, sizeof(IMMSV_EDU_ATTR_VAL_LIST));
/*alloc-7 */
imma_copyAttrValue(&(al->n),
attr->attrValueType, avarr[i]);
@@ -2022,13 +2022,13 @@ static SaAisErrorT ccb_object_create_com
p->n.attrName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->n.attrValue), p->n.attrValueType);
/*free-5 */
+ immsv_evt_free_att_val(&(p->n.attrValue), (SaImmValueTypeT)
p->n.attrValueType); /*free-5 */
while (p->n.attrMoreValues) {
IMMSV_EDU_ATTR_VAL_LIST *al = p->n.attrMoreValues;
p->n.attrMoreValues = al->next;
al->next = NULL;
- immsv_evt_free_att_val(&(al->n), p->n.attrValueType);
/*free-7 */
+ immsv_evt_free_att_val(&(al->n), (SaImmValueTypeT)
p->n.attrValueType); /*free-7 */
free(al); /*free-6 */
}
@@ -2449,12 +2449,12 @@ static SaAisErrorT ccb_object_modify_com
/*alloc-2 */
- p = calloc(1, sizeof(IMMSV_ATTR_MODS_LIST));
+ p = (IMMSV_ATTR_MODS_LIST *) calloc(1,
sizeof(IMMSV_ATTR_MODS_LIST));
p->attrModType = attrMod->modType;
p->attrValue.attrName.size = strlen(attrMod->modAttr.attrName)
+ 1;
/* alloc 3 */
- p->attrValue.attrName.buf = malloc(p->attrValue.attrName.size);
+ p->attrValue.attrName.buf = (char *)
malloc(p->attrValue.attrName.size);
strncpy(p->attrValue.attrName.buf, attrMod->modAttr.attrName,
p->attrValue.attrName.size);
p->attrValue.attrValuesNumber =
attrMod->modAttr.attrValuesNumber;
@@ -2470,7 +2470,7 @@ static SaAisErrorT ccb_object_modify_com
unsigned int i;
for (i = 1; i <= numAdded; ++i) {
/*alloc-5 */
- IMMSV_EDU_ATTR_VAL_LIST *al = calloc(1,
sizeof(IMMSV_EDU_ATTR_VAL_LIST));
+ IMMSV_EDU_ATTR_VAL_LIST *al =
(IMMSV_EDU_ATTR_VAL_LIST *) calloc(1, sizeof(IMMSV_EDU_ATTR_VAL_LIST));
/*alloc-6 */
imma_copyAttrValue(&(al->n),
attrMod->modAttr.attrValueType, avarr[i]);
al->next = p->attrValue.attrMoreValues;
/*NULL initially */
@@ -2521,13 +2521,13 @@ static SaAisErrorT ccb_object_modify_com
if (p->attrValue.attrValuesNumber) {
immsv_evt_free_att_val(&(p->attrValue.attrValue),
/*free-4 */
- p->attrValue.attrValueType);
+ (SaImmValueTypeT)
p->attrValue.attrValueType);
while (p->attrValue.attrMoreValues) {
IMMSV_EDU_ATTR_VAL_LIST *al =
p->attrValue.attrMoreValues;
p->attrValue.attrMoreValues = al->next;
al->next = NULL;
- immsv_evt_free_att_val(&(al->n),
p->attrValue.attrValueType); /*free-6 */
+ immsv_evt_free_att_val(&(al->n),
(SaImmValueTypeT) p->attrValue.attrValueType); /*free-6 */
free(al); /*free-5 */
}
}
@@ -3831,7 +3831,7 @@ static SaAisErrorT admin_op_invoke_commo
for (i = 0; params[i]; ++i) {
const SaImmAdminOperationParamsT_2 *param = params[i];
/*alloc-2 */
- IMMSV_ADMIN_OPERATION_PARAM *p =
malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
+ IMMSV_ADMIN_OPERATION_PARAM *p = (IMMSV_ADMIN_OPERATION_PARAM
*) malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
memset(p, 0, sizeof(IMMSV_ADMIN_OPERATION_PARAM));
TRACE("PARAM:%s \n", param->paramName);
@@ -3856,7 +3856,7 @@ static SaAisErrorT admin_op_invoke_commo
goto mds_send_fail;
}
/*alloc-3 */
- p->paramName.buf = malloc(p->paramName.size);
+ p->paramName.buf = (char *) malloc(p->paramName.size);
strncpy(p->paramName.buf, param->paramName, p->paramName.size);
p->paramType = param->paramType;
@@ -3895,7 +3895,7 @@ static SaAisErrorT admin_op_invoke_commo
rc = out_evt->info.imma.info.errRsp.error;
TRACE("ERROR returned:%u", rc);
osafassert(rc != SA_AIS_OK);
- *operationReturnValue = IMMSV_IMPOSSIBLE_ERROR; //Bogus
result since error is set.
+ *operationReturnValue = (SaAisErrorT)
IMMSV_IMPOSSIBLE_ERROR; //Bogus result since error is set.
} else {
TRACE("Normal return");
osafassert((out_evt->info.imma.type ==
IMMA_EVT_ND2A_ADMOP_RSP) ||
@@ -3957,7 +3957,7 @@ static SaAisErrorT admin_op_invoke_commo
free(p->paramName.buf);
p->paramName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->paramBuffer), p->paramType);
/*free-4 */
+ immsv_evt_free_att_val(&(p->paramBuffer), (SaImmValueTypeT)
p->paramType); /*free-4 */
p->next = NULL;
free(p); /*free-2 */
}
@@ -4373,7 +4373,7 @@ static SaAisErrorT admin_op_invoke_async
for (i = 0; params[i]; ++i) {
param = params[i];
/*alloc-2 */
- IMMSV_ADMIN_OPERATION_PARAM *p =
malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
+ IMMSV_ADMIN_OPERATION_PARAM *p = (IMMSV_ADMIN_OPERATION_PARAM
*) malloc(sizeof(IMMSV_ADMIN_OPERATION_PARAM));
memset(p, 0, sizeof(IMMSV_ADMIN_OPERATION_PARAM));
TRACE("PARAM:%s ", param->paramName);
@@ -4399,7 +4399,7 @@ static SaAisErrorT admin_op_invoke_async
}
/*alloc-3 */
- p->paramName.buf = malloc(p->paramName.size);
+ p->paramName.buf = (char *) malloc(p->paramName.size);
strncpy(p->paramName.buf, param->paramName, p->paramName.size);
p->paramType = param->paramType;
@@ -4477,7 +4477,7 @@ static SaAisErrorT admin_op_invoke_async
free(p->paramName.buf);
p->paramName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->paramBuffer), p->paramType);
/*free-4 */
+ immsv_evt_free_att_val(&(p->paramBuffer), (SaImmValueTypeT)
p->paramType); /*free-4 */
p->next = NULL;
free(p); /*free-2 */
p=NULL;
@@ -4748,7 +4748,7 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
TRACE("Zero length class name, not allowed.");
goto mds_send_fail;
}
- evt.info.immnd.info.classDescr.className.buf =
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-1 */
+ evt.info.immnd.info.classDescr.className.buf = (char *)
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-1 */
strncpy(evt.info.immnd.info.classDescr.className.buf, className,
(size_t)evt.info.immnd.info.classDescr.className.size);
@@ -4794,7 +4794,7 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
}
IMMSV_ATTR_DEF_LIST *p = /*alloc-2 */
- malloc(sizeof(IMMSV_ATTR_DEF_LIST));
+ (IMMSV_ATTR_DEF_LIST *)
malloc(sizeof(IMMSV_ATTR_DEF_LIST));
memset(p, 0, sizeof(IMMSV_ATTR_DEF_LIST));
p->d.attrName.size = strlen(attr->attrName) + 1;
@@ -4806,11 +4806,11 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
p=NULL;
goto mds_send_fail;
}
- p->d.attrName.buf = malloc(p->d.attrName.size); /* alloc-3 */
+ p->d.attrName.buf = (char *) malloc(p->d.attrName.size);
/* alloc-3 */
strncpy(p->d.attrName.buf, attr->attrName, p->d.attrName.size);
p->d.attrValueType = attr->attrValueType;
- if (!imma_proc_is_valid_type(p->d.attrValueType)) {
+ if (!imma_proc_is_valid_type((SaImmValueTypeT)
p->d.attrValueType)) {
rc = SA_AIS_ERR_INVALID_PARAM;
TRACE("Unknown type not allowed for attr:%s class%s",
p->d.attrName.buf,
evt.info.immnd.info.classDescr.className.buf);
@@ -4825,7 +4825,7 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
if (attr->attrDefaultValue) {
p->d.attrDefaultValue = /*alloc-4.1 */
- malloc(sizeof(IMMSV_EDU_ATTR_VAL));
+ (IMMSV_EDU_ATTR_VAL *)
malloc(sizeof(IMMSV_EDU_ATTR_VAL));
memset(p->d.attrDefaultValue, 0,
sizeof(IMMSV_EDU_ATTR_VAL));
/*alloc-4.2 */
imma_copyAttrValue(p->d.attrDefaultValue,
attr->attrValueType, attr->attrDefaultValue);
@@ -4839,11 +4839,11 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
if (!attrClNameExist) {
/*TRACE("Creating class name attribute def"); */
sysattr = /*alloc-2 */
- malloc(sizeof(IMMSV_ATTR_DEF_LIST));
+ (IMMSV_ATTR_DEF_LIST *)
malloc(sizeof(IMMSV_ATTR_DEF_LIST));
memset(sysattr, 0, sizeof(IMMSV_ATTR_DEF_LIST));
sysattr->d.attrName.size = strlen(sysaClName) + 1;
- sysattr->d.attrName.buf = malloc(sysattr->d.attrName.size);
/*alloc-3 */
+ sysattr->d.attrName.buf = (char *)
malloc(sysattr->d.attrName.size); /*alloc-3 */
strncpy(sysattr->d.attrName.buf, sysaClName,
sysattr->d.attrName.size);
sysattr->d.attrValueType = SA_IMM_ATTR_SASTRINGT;
if (classCategory == SA_IMM_CLASS_CONFIG) {
@@ -4854,7 +4854,7 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
SA_IMM_ATTR_PERSISTENT) : (SA_IMM_ATTR_RUNTIME |
SA_IMM_ATTR_CACHED);
}
sysattr->d.attrNtfId = 0; /*alloc-4.1 */
- sysattr->d.attrDefaultValue =
malloc(sizeof(IMMSV_EDU_ATTR_VAL));
+ sysattr->d.attrDefaultValue = (IMMSV_EDU_ATTR_VAL *)
malloc(sizeof(IMMSV_EDU_ATTR_VAL));
memset(sysattr->d.attrDefaultValue, 0,
sizeof(IMMSV_EDU_ATTR_VAL));
/*alloc-4.2 */
imma_copyAttrValue(sysattr->d.attrDefaultValue,
SA_IMM_ATTR_SASTRINGT, (SaImmAttrValueT)&className);
@@ -4866,11 +4866,11 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
if (!attrAdmNameExist) {
/*TRACE("Creating admin-owner name attribute def"); */
sysattr = /*alloc-2 */
- malloc(sizeof(IMMSV_ATTR_DEF_LIST));
+ (IMMSV_ATTR_DEF_LIST *)
malloc(sizeof(IMMSV_ATTR_DEF_LIST));
memset(sysattr, 0, sizeof(IMMSV_ATTR_DEF_LIST));
sysattr->d.attrName.size = strlen(sysaAdmName) + 1;
- sysattr->d.attrName.buf = malloc(sysattr->d.attrName.size);
/*alloc-3 */
+ sysattr->d.attrName.buf = (char *)
malloc(sysattr->d.attrName.size); /*alloc-3 */
strncpy(sysattr->d.attrName.buf, sysaAdmName,
sysattr->d.attrName.size);
sysattr->d.attrValueType = SA_IMM_ATTR_SASTRINGT;
/* Should this attribute really be a config attribute ?
@@ -4892,11 +4892,11 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa
if (!attrImplNameExist) {
/*TRACE("Creating implementer name attribute def"); */
sysattr = /*alloc-2 */
- malloc(sizeof(IMMSV_ATTR_DEF_LIST));
+ (IMMSV_ATTR_DEF_LIST *)
malloc(sizeof(IMMSV_ATTR_DEF_LIST));
memset(sysattr, 0, sizeof(IMMSV_ATTR_DEF_LIST));
sysattr->d.attrName.size = strlen(sysaImplName) + 1;
- sysattr->d.attrName.buf = malloc(sysattr->d.attrName.size);
/*alloc-3 */
+ sysattr->d.attrName.buf = (char *)
malloc(sysattr->d.attrName.size); /*alloc-3 */
strncpy(sysattr->d.attrName.buf, sysaImplName,
sysattr->d.attrName.size);
sysattr->d.attrValueType = SA_IMM_ATTR_SASTRINGT;
/* Should this attribute really be a config attribute ?
@@ -5056,7 +5056,7 @@ SaAisErrorT saImmOmClassDescriptionGet_2
evt.info.immnd.type = IMMND_EVT_A2ND_CLASS_DESCR_GET;
evt.info.immnd.info.classDescr.className.size = strlen(className) + 1;
- evt.info.immnd.info.classDescr.className.buf =
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-0 */
+ evt.info.immnd.info.classDescr.className.buf = (char *)
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-0 */
strncpy(evt.info.immnd.info.classDescr.className.buf,
className,
(size_t)evt.info.immnd.info.classDescr.className.size);
@@ -5105,7 +5105,7 @@ SaAisErrorT saImmOmClassDescriptionGet_2
SaImmAttrDefinitionT_2 **attr = NULL;
size_t attrDataSize = 0;
- *classCategory =
out_evt->info.imma.info.classDescr.classCategory;
+ *classCategory = (SaImmClassCategoryT)
out_evt->info.imma.info.classDescr.classCategory;
IMMSV_ATTR_DEF_LIST *p =
out_evt->info.imma.info.classDescr.attrDefinitions;
while (p) {
@@ -5114,18 +5114,18 @@ SaAisErrorT saImmOmClassDescriptionGet_2
}
attrDataSize = sizeof(SaImmAttrDefinitionT_2 *) *
(noOfAttributes + 1);
- attr = malloc(attrDataSize); /*alloc-1 */
+ attr = (SaImmAttrDefinitionT_2**) malloc(attrDataSize);
/*alloc-1 */
TRACE("Alloc attrdefs array:%p", attr);
memset(attr, 0, attrDataSize);
p = out_evt->info.imma.info.classDescr.attrDefinitions;
for (; i < noOfAttributes; i++) {
IMMSV_ATTR_DEF_LIST *prev = p;
IMMSV_ATTR_DEFINITION *q = &(p->d);
- attr[i] =
malloc(sizeof(SaImmAttrDefinitionT_2)); /*alloc-2 */
- attr[i]->attrName = malloc(q->attrName.size +
1); /*alloc-3 */
+ attr[i] = (SaImmAttrDefinitionT_2 *)
malloc(sizeof(SaImmAttrDefinitionT_2)); /*alloc-2 */
+ attr[i]->attrName = (char *)
malloc(q->attrName.size + 1); /*alloc-3 */
strncpy(attr[i]->attrName, (const char
*)q->attrName.buf, q->attrName.size + 1);
attr[i]->attrName[q->attrName.size] = 0;
- attr[i]->attrValueType = q->attrValueType;
+ attr[i]->attrValueType = (SaImmValueTypeT)
q->attrValueType;
attr[i]->attrFlags = q->attrFlags;
/* attr[i]->attrNtfId = q->attrNtfId; */
@@ -5212,7 +5212,7 @@ SaAisErrorT saImmOmClassDescriptionGet_2
case SA_IMM_ATTR_SASTRINGT:
strp = (SaStringT
*)copyv;
*strp = /*alloc-5 */
-
malloc(q->attrDefaultValue->val.x.size);
+ (char *)
malloc(q->attrDefaultValue->val.x.size);
memcpy(*strp,
q->attrDefaultValue->val.x.buf,
q->attrDefaultValue->val.x.size);
break;
@@ -5237,7 +5237,7 @@ SaAisErrorT saImmOmClassDescriptionGet_2
attr[i]->attrDefaultValue = copyv;
/*Delete source attr-value */
-
immsv_evt_free_att_val(q->attrDefaultValue, q->attrValueType);
+
immsv_evt_free_att_val(q->attrDefaultValue, (SaImmValueTypeT) q->attrValueType);
free(q->attrDefaultValue);
q->attrDefaultValue = NULL;
@@ -5453,7 +5453,7 @@ SaAisErrorT saImmOmClassDelete(SaImmHand
evt.info.immnd.type = IMMND_EVT_A2ND_CLASS_DELETE;
evt.info.immnd.info.classDescr.className.size = strlen(className) + 1;
- evt.info.immnd.info.classDescr.className.buf =
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-1 */
+ evt.info.immnd.info.classDescr.className.buf = (char *)
malloc(evt.info.immnd.info.classDescr.className.size); /*alloc-1 */
strncpy(evt.info.immnd.info.classDescr.className.buf, className,
(size_t)evt.info.immnd.info.classDescr.className.size);
@@ -5923,7 +5923,7 @@ static SaAisErrorT accessor_get_common(S
IMMSV_ATTR_NAME_LIST *p = (IMMSV_ATTR_NAME_LIST *)
malloc(sizeof(IMMSV_ATTR_NAME_LIST)); /*
alloc-2 */
p->name.size = strlen(*namev) + 1;
- p->name.buf = malloc(p->name.size); /* alloc-3 */
+ p->name.buf = (char *) malloc(p->name.size); /*
alloc-3 */
strncpy(p->name.buf, *namev, p->name.size);
p->name.buf[p->name.size - 1] = 0;
@@ -6006,27 +6006,27 @@ static SaAisErrorT accessor_get_common(S
}
p = attrValueList;
- attr = calloc(noOfAttributes + 1,
sizeof(SaImmAttrValuesT_2 *)); /* alloc-1 */
+ attr = (SaImmAttrValuesT_2 **) calloc(noOfAttributes +
1, sizeof(SaImmAttrValuesT_2 *)); /* alloc-1 */
for(i=0; i<noOfAttributes; i++, p = p->next) {
IMMSV_ATTR_VALUES *q = &(p->n);
- attr[i] = calloc(1,
sizeof(SaImmAttrValuesT_2)); /* alloc-2 */
- attr[i]->attrName = malloc(q->attrName.size +
1); /* alloc-3 */
+ attr[i] = (SaImmAttrValuesT_2 *) calloc(1,
sizeof(SaImmAttrValuesT_2)); /* alloc-2 */
+ attr[i]->attrName = (char *)
malloc(q->attrName.size + 1); /* alloc-3 */
strncpy(attr[i]->attrName, (const char
*)q->attrName.buf, q->attrName.size + 1);
attr[i]->attrName[q->attrName.size] = 0;
/*redundant. */
attr[i]->attrValuesNumber = q->attrValuesNumber;
attr[i]->attrValueType =
(SaImmValueTypeT)q->attrValueType;
if (q->attrValuesNumber) {
- attr[i]->attrValues = calloc(1,
q->attrValuesNumber * sizeof(SaImmAttrValueT)); /*alloc-4 */
+ attr[i]->attrValues = (SaImmAttrValueT
*) calloc(1, q->attrValuesNumber * sizeof(SaImmAttrValueT)); /*alloc-4 */
/*alloc-5 */
- attr[i]->attrValues[0] =
imma_copyAttrValue3(q->attrValueType, &(q->attrValue));
+ attr[i]->attrValues[0] =
imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(q->attrValue));
if (q->attrValuesNumber > 1) {
int ix;
IMMSV_EDU_ATTR_VAL_LIST *r =
q->attrMoreValues;
for (ix = 1; ix <
q->attrValuesNumber; ++ix) {
osafassert(r);
- attr[i]->attrValues[ix]
= imma_copyAttrValue3(q->attrValueType, &(r->n)); /*alloc-5 */
+ attr[i]->attrValues[ix]
= imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(r->n));
/*alloc-5 */
r = r->next;
}
}
@@ -6155,10 +6155,10 @@ static unsigned int get_obj_size(const I
obj_size += (avl->n.attrName.size + 4 + 1); /* string + size +
next-marker */
if(avl->n.attrValuesNumber) {
- obj_size += get_att_val_size(&(avl->n.attrValue),
avl->n.attrValueType);
+ obj_size += get_att_val_size(&(avl->n.attrValue),
(SaImmValueTypeT) avl->n.attrValueType);
if (avl->n.attrValuesNumber > 1) {
obj_size +=
get_attr_list_size(avl->n.attrMoreValues,
- avl->n.attrValueType);
+ (SaImmValueTypeT) avl->n.attrValueType);
}
}
avl=avl->next;
@@ -6631,13 +6631,13 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
evt.info.immnd.info.obj_sync.className.size = strlen(className) + 1;
/*alloc-1 */
- evt.info.immnd.info.obj_sync.className.buf =
malloc(evt.info.immnd.info.obj_sync.className.size);
+ evt.info.immnd.info.obj_sync.className.buf = (char *)
malloc(evt.info.immnd.info.obj_sync.className.size);
strncpy(evt.info.immnd.info.obj_sync.className.buf, className,
evt.info.immnd.info.obj_sync.className.size);
evt.info.immnd.info.obj_sync.objectName.size =
osaf_extended_name_length(objectName) + 1;
/*alloc-2 */
- evt.info.immnd.info.obj_sync.objectName.buf =
malloc(evt.info.immnd.info.obj_sync.objectName.size);
+ evt.info.immnd.info.obj_sync.objectName.buf = (char *)
malloc(evt.info.immnd.info.obj_sync.objectName.size);
memcpy(evt.info.immnd.info.obj_sync.objectName.buf,
osaf_extended_name_borrow(objectName),
evt.info.immnd.info.obj_sync.objectName.size - 1);
@@ -6656,7 +6656,7 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
}
/*alloc-3 */
- IMMSV_ATTR_VALUES_LIST *p = calloc(1,
sizeof(IMMSV_ATTR_VALUES_LIST));
+ IMMSV_ATTR_VALUES_LIST *p = (IMMSV_ATTR_VALUES_LIST *)
calloc(1, sizeof(IMMSV_ATTR_VALUES_LIST));
p->n.attrName.size = strlen(attr->attrName) + 1;
if (p->n.attrName.size >= IMMSV_MAX_ATTR_NAME_LENGTH) {
@@ -6668,7 +6668,7 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
}
/*alloc-4 */
- p->n.attrName.buf = malloc(p->n.attrName.size);
+ p->n.attrName.buf = (char *) malloc(p->n.attrName.size);
strncpy(p->n.attrName.buf, attr->attrName, p->n.attrName.size);
p->n.attrValuesNumber = attr->attrValuesNumber;
@@ -6683,7 +6683,7 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
unsigned int i;
for (i = 1; i <= numAdded; ++i) {
/*alloc-6 */
- IMMSV_EDU_ATTR_VAL_LIST *al = calloc(1,
sizeof(IMMSV_EDU_ATTR_VAL_LIST));
+ IMMSV_EDU_ATTR_VAL_LIST *al =
(IMMSV_EDU_ATTR_VAL_LIST *) calloc(1, sizeof(IMMSV_EDU_ATTR_VAL_LIST));
/*alloc-7 */
imma_copyAttrValue(&(al->n),
attr->attrValueType, avarr[i]);
@@ -6713,7 +6713,7 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
{
/* Case C only. */
/* There is more space. Push EVT onto batch & get ready
for more objects */
- IMMSV_OM_OBJECT_SYNC* tmp = calloc(1,
sizeof(IMMSV_OM_OBJECT_SYNC));
+ IMMSV_OM_OBJECT_SYNC* tmp = (IMMSV_OM_OBJECT_SYNC*)
calloc(1, sizeof(IMMSV_OM_OBJECT_SYNC));
tmp->next = batch;
(*batchp) = tmp;
@@ -6803,13 +6803,13 @@ SaAisErrorT immsv_sync(SaImmHandleT immH
p->n.attrName.buf = NULL;
}
- immsv_evt_free_att_val(&(p->n.attrValue),
p->n.attrValueType); /*free-5 */
+ immsv_evt_free_att_val(&(p->n.attrValue),
(SaImmValueTypeT) p->n.attrValueType); /*free-5 */
while (p->n.attrMoreValues) {
IMMSV_EDU_ATTR_VAL_LIST *al =
p->n.attrMoreValues;
p->n.attrMoreValues = al->next;
al->next = NULL;
- immsv_evt_free_att_val(&(al->n),
p->n.attrValueType); /*free-7 */
+ immsv_evt_free_att_val(&(al->n),
(SaImmValueTypeT) p->n.attrValueType); /*free-7 */
free(al); /*free-6 */
}
@@ -7239,7 +7239,7 @@ static SaAisErrorT search_init_common(Sa
if(searchParam->searchOneAttr.attrName) {
req->searchParam.choice.oneAttrParam.attrName.size =
strlen(searchParam->searchOneAttr.attrName) + 1;
req->searchParam.choice.oneAttrParam.attrName.buf =
/*alloc-2 */
-
malloc(req->searchParam.choice.oneAttrParam.attrName.size);
+ (char *)
malloc(req->searchParam.choice.oneAttrParam.attrName.size);
strncpy(req->searchParam.choice.oneAttrParam.attrName.buf,
(char
*)searchParam->searchOneAttr.attrName,
(size_t)req->searchParam.choice.oneAttrParam.attrName.size);
@@ -7269,7 +7269,7 @@ static SaAisErrorT search_init_common(Sa
IMMSV_ATTR_NAME_LIST *p = (IMMSV_ATTR_NAME_LIST *)
malloc(sizeof(IMMSV_ATTR_NAME_LIST));
/*alloc-4 */
p->name.size = strlen(*namev) + 1;
- p->name.buf = malloc(p->name.size); /*alloc-5 */
+ p->name.buf = (char *) malloc(p->name.size);
/*alloc-5 */
strncpy(p->name.buf, *namev, p->name.size);
p->name.buf[p->name.size - 1] = 0;
@@ -7700,12 +7700,12 @@ searchresult:
}
attrDataSize = sizeof(SaImmAttrValuesT_2 *) * (noOfAttributes +
1);
- attr = calloc(1, attrDataSize); /*alloc-1 */
+ attr = (SaImmAttrValuesT_2 **) calloc(1, attrDataSize);
/*alloc-1 */
p = res_body->attrValuesList;
for (; i < noOfAttributes; i++, p = p->next) {
IMMSV_ATTR_VALUES *q = &(p->n);
- attr[i] = calloc(1, sizeof(SaImmAttrValuesT_2));
/*alloc-2 */
- attr[i]->attrName = malloc(q->attrName.size + 1);
/*alloc-3 */
+ attr[i] = (SaImmAttrValuesT_2 *) calloc(1,
sizeof(SaImmAttrValuesT_2)); /*alloc-2 */
+ attr[i]->attrName = (char *) malloc(q->attrName.size +
1); /*alloc-3 */
strncpy(attr[i]->attrName, (const char
*)q->attrName.buf, q->attrName.size + 1);
attr[i]->attrName[q->attrName.size] = 0;
/*redundant. */
attr[i]->attrValuesNumber = q->attrValuesNumber;
@@ -7717,16 +7717,16 @@ searchresult:
SaStringT* strp;
Allocate the array of pointers, even if only
one value
*/
- attr[i]->attrValues = calloc(1,
q->attrValuesNumber * sizeof(SaImmAttrValueT)); /*alloc-4 */
+ attr[i]->attrValues = (SaImmAttrValueT *)
calloc(1, q->attrValuesNumber * sizeof(SaImmAttrValueT)); /*alloc-4 */
/*alloc-5 */
- attr[i]->attrValues[0] =
imma_copyAttrValue3(q->attrValueType, &(q->attrValue));
+ attr[i]->attrValues[0] =
imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(q->attrValue));
if (q->attrValuesNumber > 1) {
int ix;
IMMSV_EDU_ATTR_VAL_LIST *r =
q->attrMoreValues;
for (ix = 1; ix < q->attrValuesNumber;
++ix) {
osafassert(r);
- attr[i]->attrValues[ix] =
imma_copyAttrValue3(q->attrValueType, &(r->n));/*alloc-5 */
+ attr[i]->attrValues[ix] =
imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(r->n));/*alloc-5 */
r = r->next;
}
}
@@ -8162,7 +8162,7 @@ static SaAisErrorT admin_owner_set_commo
int i;
for (i = 0; objectNames[i]; ++i) {
- IMMSV_OBJ_NAME_LIST *ol = calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
+ IMMSV_OBJ_NAME_LIST *ol = (IMMSV_OBJ_NAME_LIST *) calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
ol->name.size = strlen(objectNames[i]) + 1;
ol->name.buf = (char *)objectNames[i];
ol->next = admo_set_evt.info.immnd.info.admReq.objectNames;
/*null initially */
@@ -8403,7 +8403,7 @@ static SaAisErrorT admin_owner_release_c
int i;
for (i = 0; objectNames[i]; ++i) {
- IMMSV_OBJ_NAME_LIST *ol = calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
+ IMMSV_OBJ_NAME_LIST *ol = (IMMSV_OBJ_NAME_LIST *) calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
ol->name.size = strlen(objectNames[i]) + 1;
ol->name.buf = (char *)objectNames[i];
ol->next = admo_set_evt.info.immnd.info.admReq.objectNames;
/*null initially */
@@ -8614,7 +8614,7 @@ static SaAisErrorT admin_owner_clear_com
int i;
for (i = 0; objectNames[i]; ++i) {
- IMMSV_OBJ_NAME_LIST *ol = calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
+ IMMSV_OBJ_NAME_LIST *ol = (IMMSV_OBJ_NAME_LIST *) calloc(1,
sizeof(IMMSV_OBJ_NAME_LIST)); /*a */
ol->name.size = strlen(objectNames[i]) + 1;
ol->name.buf = (char *)objectNames[i];
ol->next = admo_set_evt.info.immnd.info.admReq.objectNames;
/*null initially */
@@ -9153,7 +9153,7 @@ static SaBoolT imma_re_initialize_admin_
evt.info.immnd.info.adminitReq.client_hdl = immHandle;
osaf_extended_name_alloc(adm_found_node->mAdminOwnerName,
&evt.info.immnd.info.adminitReq.i.adminOwnerName);
- evt.info.immnd.info.adminitReq.i.releaseOwnershipOnFinalize = false;
+ evt.info.immnd.info.adminitReq.i.releaseOwnershipOnFinalize = SA_FALSE;
temp_hdl = adm_found_node->admin_owner_hdl;
timeout = cl_node->syncr_timeout;
@@ -9697,7 +9697,7 @@ SaAisErrorT immsv_om_augment_ccb_get_adm
{
SaAisErrorT rc = SA_AIS_OK;
- const SaImmAttrNameT admoNameAttr = SA_IMM_ATTR_ADMIN_OWNER_NAME;
+ const SaImmAttrNameT admoNameAttr = (char *)
SA_IMM_ATTR_ADMIN_OWNER_NAME;
SaImmAttrNameT attributeNames[2] = {admoNameAttr, NULL};
SaImmAttrValuesT_2 **attributes = NULL;
SaImmAttrValuesT_2 *attrVal = NULL;
diff --git a/osaf/libs/agents/saf/imma/imma_proc.cc
b/osaf/libs/agents/saf/imma/imma_proc.cc
--- a/osaf/libs/agents/saf/imma/imma_proc.cc
+++ b/osaf/libs/agents/saf/imma/imma_proc.cc
@@ -56,7 +56,7 @@ static void imma_proc_free_callback(IMMA
Notes : None
******************************************************************************/
-uint32_t imma_version_validate(SaVersionT *version)
+SaAisErrorT imma_version_validate(SaVersionT *version)
{
SaAisErrorT retCode = SA_AIS_OK;
@@ -253,7 +253,7 @@ static void imma_proc_admin_op_async_rsp
imma_proc_decrement_pending_reply(cl_node, false);
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
callback->type = IMMA_CALLBACK_OM_ADMIN_OP_RSP;
@@ -306,16 +306,16 @@ SaImmAdminOperationParamsT_2 **imma_proc
IMMSV_ADMIN_OPERATION_PARAM *prev = p;
out_params[i] = (SaImmAdminOperationParamsT_2 *)
malloc(sizeof(SaImmAdminOperationParamsT_2));
/*alloc-2 */
- out_params[i]->paramName = malloc(p->paramName.size + 1);
/*alloc-3 */
+ out_params[i]->paramName = (char *) malloc(p->paramName.size +
1); /*alloc-3 */
strncpy(out_params[i]->paramName, p->paramName.buf,
p->paramName.size + 1);
out_params[i]->paramName[p->paramName.size] = 0;
/*string too long=>truncate */
free(p->paramName.buf);
p->paramName.buf = NULL;
p->paramName.size = 0;
out_params[i]->paramType = (SaImmValueTypeT)p->paramType;
- out_params[i]->paramBuffer = imma_copyAttrValue3(p->paramType,
/*alloc-4 */
+ out_params[i]->paramBuffer =
imma_copyAttrValue3((SaImmValueTypeT) p->paramType, /*alloc-4 */
&(p->paramBuffer));
- immsv_evt_free_att_val(&(p->paramBuffer), p->paramType);
+ immsv_evt_free_att_val(&(p->paramBuffer), (SaImmValueTypeT)
p->paramType);
p = p->next;
prev->next = NULL;
free(prev);
@@ -336,7 +336,7 @@ static void imma_proc_admop(IMMA_CB *cb,
{
IMMA_CALLBACK_INFO *callback;
IMMA_CLIENT_NODE *cl_node = NULL;
- SaBoolT isPbeAdmOp=(evt->type == IMMA_EVT_ND2A_IMM_PBE_ADMOP);
+ bool isPbeAdmOp = (evt->type == IMMA_EVT_ND2A_IMM_PBE_ADMOP);
/*TODO: correct this, ugly use of continuationId */
SaImmOiHandleT implHandle = evt->info.admOpReq.continuationId;
@@ -366,7 +366,7 @@ static void imma_proc_admop(IMMA_CB *cb,
}
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
if(isPbeAdmOp) {
@@ -552,7 +552,7 @@ void imma_proc_terminate_oi_ccbs(IMMA_CB
err = SA_AIS_ERR_FAILED_OPERATION;
}
- IMMA_CALLBACK_INFO *callback = calloc(1,
sizeof(IMMA_CALLBACK_INFO));
+ IMMA_CALLBACK_INFO *callback = (IMMA_CALLBACK_INFO *) calloc(1,
sizeof(IMMA_CALLBACK_INFO));
osafassert(callback);
if (err == SA_AIS_OK) {
callback->type = IMMA_CALLBACK_OI_CCB_APPLY;
@@ -604,7 +604,7 @@ void imma_proc_stale_dispatch(IMMA_CB *c
struct imma_oi_ccb_record *oiCcb = cl_node->activeOiCcbs;
/* Send the stale handle triggering ipc-message */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1,
sizeof(IMMA_CALLBACK_INFO));
osafassert(callback);
callback->type = IMMA_CALLBACK_STALE_HANDLE;
callback->lcl_imm_hdl = 0LL;
@@ -639,7 +639,7 @@ void imma_proc_stale_dispatch(IMMA_CB *c
/* Non critical & stale CCB must have been aborted by
server side.
Generate abort upcall immediately, i.e. no need to
wait for resurrect.
*/
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1,
sizeof(IMMA_CALLBACK_INFO));
osafassert(callback);
callback->type = IMMA_CALLBACK_OI_CCB_ABORT;
callback->lcl_imm_hdl = cl_node->handle;
@@ -768,7 +768,7 @@ static void imma_proc_rt_attr_update(IMM
}
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
callback->type = IMMA_CALLBACK_OI_RT_ATTR_UPDATE;
@@ -811,7 +811,7 @@ static void imma_proc_ccb_completed(IMMA
{
IMMA_CALLBACK_INFO *callback;
IMMA_CLIENT_NODE *cl_node = NULL;
- SaBoolT isPrtObj=(evt->info.ccbCompl.ccbId == 0);
+ bool isPrtObj = (evt->info.ccbCompl.ccbId == 0);
SaImmOiHandleT implHandle = evt->info.ccbCompl.immHandle;
@@ -854,7 +854,7 @@ static void imma_proc_ccb_completed(IMMA
}
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
if(isPrtObj) {
@@ -903,7 +903,7 @@ static void imma_proc_ccb_apply(IMMA_CB
return;
}
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
callback->type = IMMA_CALLBACK_OI_CCB_APPLY;
callback->lcl_imm_hdl = implHandle;
@@ -946,7 +946,7 @@ static void imma_proc_ccb_abort(IMMA_CB
return;
}
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
callback->type = IMMA_CALLBACK_OI_CCB_ABORT;
callback->lcl_imm_hdl = implHandle;
@@ -979,8 +979,8 @@ static void imma_proc_obj_delete(IMMA_CB
{
IMMA_CALLBACK_INFO *callback;
IMMA_CLIENT_NODE *cl_node = NULL;
- SaBoolT isPrtObj=((evt->info.objDelete.ccbId == 0) &&
(evt->info.objDelete.adminOwnerId != 0));
- SaBoolT isSpApplRto=((evt->info.objDelete.ccbId == 0) &&
(evt->info.objDelete.adminOwnerId == 0));
+ bool isPrtObj = ((evt->info.objDelete.ccbId == 0) &&
(evt->info.objDelete.adminOwnerId != 0));
+ bool isSpApplRto = ((evt->info.objDelete.ccbId == 0) &&
(evt->info.objDelete.adminOwnerId == 0));
if(isSpApplRto) {TRACE_3("imma_proc_obj_delete CCBID==0 admoId=0
SPECIAL applier RTO delete");}
SaImmOiHandleT implHandle = evt->info.objDelete.immHandle;
@@ -1007,7 +1007,7 @@ static void imma_proc_obj_delete(IMMA_CB
}
}
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
if(isPrtObj) {
callback->type = IMMA_CALLBACK_PBE_PRT_OBJ_DELETE;
@@ -1113,7 +1113,7 @@ static void imma_proc_obj_create(IMMA_CB
}
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
if(isPrtObj) {
@@ -1174,8 +1174,8 @@ static void imma_proc_obj_modify(IMMA_CB
{
IMMA_CALLBACK_INFO *callback;
IMMA_CLIENT_NODE *cl_node = NULL;
- SaBoolT isPrtAttrs=((evt->info.objModify.ccbId == 0) &&
(evt->info.objModify.adminOwnerId != 0));
- SaBoolT isSpApplRtu = ((evt->info.objModify.ccbId == 0) &&
(evt->info.objModify.adminOwnerId == 0));
+ bool isPrtAttrs = ((evt->info.objModify.ccbId == 0) &&
(evt->info.objModify.adminOwnerId != 0));
+ bool isSpApplRtu = ((evt->info.objModify.ccbId == 0) &&
(evt->info.objModify.adminOwnerId == 0));
/* Can be a PRTO or a config obj with PRTAttrs. */
TRACE_ENTER();
if(isSpApplRtu) {TRACE_3("imma_proc_obj_modify CCBID==0 admoId=0
SPECIAL applier RTA modify");}
@@ -1209,7 +1209,7 @@ static void imma_proc_obj_modify(IMMA_CB
/* Allocate the Callback info */
- callback = calloc(1, sizeof(IMMA_CALLBACK_INFO));
+ callback = (IMMA_CALLBACK_INFO *) calloc(1, sizeof(IMMA_CALLBACK_INFO));
if (callback) {
/* Fill the Call Back Info */
if(isPrtAttrs) {
@@ -1273,7 +1273,7 @@ void imma_proc_free_pointers(IMMA_CB *cb
p->paramName.buf = NULL;
p->paramName.size = 0;
}
- immsv_evt_free_att_val(&(p->paramBuffer),
p->paramType);/*free-4 */
+ immsv_evt_free_att_val(&(p->paramBuffer),
(SaImmValueTypeT) p->paramType);/*free-4 */
p->next = NULL;
free(p); /*free-2 */
}
@@ -1289,7 +1289,7 @@ void imma_proc_free_pointers(IMMA_CB *cb
p->paramName.buf = NULL;
p->paramName.size = 0;
}
- immsv_evt_free_att_val(&(p->paramBuffer),
p->paramType);/*free-4 */
+ immsv_evt_free_att_val(&(p->paramBuffer),
(SaImmValueTypeT) p->paramType);/*free-4 */
p->next = NULL;
free(p); /*free-2 */
}
@@ -1631,11 +1631,11 @@ uint32_t imma_proc_resurrect_client(IMMA
Arguments : cb - ptr to the IMMA control block
immHandle - IMM OM service handle
- Return Values : NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
+ Return Values : SA_AIS_OK/SA_AIS_ERR_<ERROR>
Notes : None
******************************************************************************/
-uint32_t imma_hdl_callbk_dispatch_one(IMMA_CB *cb, SaImmHandleT immHandle)
+SaAisErrorT imma_hdl_callbk_dispatch_one(IMMA_CB *cb, SaImmHandleT immHandle)
{
IMMA_CALLBACK_INFO *callback = NULL;
IMMA_CLIENT_NODE *cl_node = NULL;
@@ -1697,11 +1697,11 @@ uint32_t imma_hdl_callbk_dispatch_one(IM
Arguments : cb - ptr to the IMMA control block
immHandle - IMM OM service handle
- Return Values : NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
+ Return Values : SA_AIS_OK/SA_AIS_ERR_<ERROR>
Notes : None
******************************************************************************/
-uint32_t imma_hdl_callbk_dispatch_all(IMMA_CB *cb, SaImmHandleT immHandle)
+SaAisErrorT imma_hdl_callbk_dispatch_all(IMMA_CB *cb, SaImmHandleT immHandle)
{
IMMA_CALLBACK_INFO *callback = NULL;
IMMA_CLIENT_NODE *cl_node = NULL;
@@ -1775,11 +1775,11 @@ uint32_t imma_hdl_callbk_dispatch_all(IM
Arguments : cb - ptr to the IMMA control block
immHandle - immsv handle
- Return Values : NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
+ Return Values : SA_AIS_OK/SA_AIS_ERR_<ERROR>
Notes : None
******************************************************************************/
-uint32_t imma_hdl_callbk_dispatch_block(IMMA_CB *cb, SaImmHandleT immHandle)
+SaAisErrorT imma_hdl_callbk_dispatch_block(IMMA_CB *cb, SaImmHandleT immHandle)
{
IMMA_CALLBACK_INFO *callback = NULL;
SYSF_MBX *callbk_mbx = NULL;
@@ -2020,7 +2020,7 @@ static bool imma_process_callback_info(I
callback->params);
}
} else {
- SaAisErrorT error = IMMSV_IMPOSSIBLE_ERROR;
+ SaAisErrorT error = (SaAisErrorT)
IMMSV_IMPOSSIBLE_ERROR;
if(!isExtendedNameValid) {
if (osaf_is_extended_names_enabled()) {
TRACE_3("Object name is too
long: %s", osaf_extended_name_borrow(&callback->name));
@@ -2335,21 +2335,21 @@ static bool imma_process_callback_info(I
if(localEr == SA_AIS_OK) {
attrDataSize =
sizeof(SaImmAttrValuesT_2 *) * (noOfAttributes + 1);
- attr = calloc(1, attrDataSize);
/*alloc-1 */
+ attr = (SaImmAttrValuesT_2 **)
calloc(1, attrDataSize); /*alloc-1 */
for (; i < noOfAttributes && p;
i++, p = p->next) {
IMMSV_ATTR_VALUES *q =
&(p->n);
- attr[i] = calloc(1,
sizeof(SaImmAttrValuesT_2)); /*alloc-2 */
- attr[i]->attrName =
malloc(q->attrName.size + 1); /*alloc-3 */
+ attr[i] =
(SaImmAttrValuesT_2 *) calloc(1, sizeof(SaImmAttrValuesT_2)); /*alloc-2 */
+ attr[i]->attrName =
(char *) malloc(q->attrName.size + 1); /*alloc-3 */
strncpy(attr[i]->attrName, (const char *)q->attrName.buf, q->attrName.size + 1);
attr[i]->attrName[q->attrName.size] = 0; /*redundant. */
attr[i]->attrValuesNumber = q->attrValuesNumber;
attr[i]->attrValueType
= (SaImmValueTypeT)q->attrValueType;
if
(q->attrValuesNumber) {
attr[i]->attrValues =
-
calloc(q->attrValuesNumber, sizeof(SaImmAttrValueT)); /*alloc-4 */
+
(SaImmAttrValueT *) calloc(q->attrValuesNumber, sizeof(SaImmAttrValueT));
/*alloc-4 */
/*alloc-5 */
attr[i]->attrValues[0] =
-
imma_copyAttrValue3(q->attrValueType, &(q->attrValue));
+
imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(q->attrValue));
if
(q->attrValuesNumber > 1) {
int ix;
@@ -2357,7 +2357,7 @@ static bool imma_process_callback_info(I
for (ix
= 1; ix < q->attrValuesNumber; ++ix) {
osafassert(r);
attr[i]->attrValues[ix] = /*alloc-5 */
-
imma_copyAttrValue3(q->attrValueType, &(r->n));
+
imma_copyAttrValue3((SaImmValueTypeT) q->attrValueType, &(r->n));
r = r->next;
}//for
}//if
@@ -2753,12 +2753,12 @@ static bool imma_process_callback_info(I
}
/*alloc-1 */
- attr = calloc(noOfAttrMods + 1,
sizeof(SaImmAttrModificationT_2 *));
+ attr = (SaImmAttrModificationT_2 **)
calloc(noOfAttrMods + 1, sizeof(SaImmAttrModificationT_2 *));
p = callback->attrMods;
for (; i < noOfAttrMods; i++, p =
p->next) {
- attr[i] = calloc(1,
sizeof(SaImmAttrModificationT_2)); /*alloc-2 */
- attr[i]->modType =
p->attrModType;
+ attr[i] =
(SaImmAttrModificationT_2 *) calloc(1, sizeof(SaImmAttrModificationT_2));
/*alloc-2 */
+ attr[i]->modType =
(SaImmAttrModificationTypeT) p->attrModType;
attr[i]->modAttr.attrName =
p->attrValue.attrName.buf; /* steal/alloc-3 */
p->attrValue.attrName.buf =
NULL;
@@ -2768,10 +2768,10 @@ static bool imma_process_callback_info(I
p->attrValue.attrValueType;
if
(p->attrValue.attrValuesNumber) {
attr[i]->modAttr.attrValues =
-
calloc(p->attrValue.attrValuesNumber, sizeof(SaImmAttrValueT)); /*alloc-4 */
+
(SaImmAttrValueT *) calloc(p->attrValue.attrValuesNumber,
sizeof(SaImmAttrValueT)); /*alloc-4 */
/*alloc-5 */
attr[i]->modAttr.attrValues[0] =
-
imma_copyAttrValue3(p->attrValue.attrValueType, &(p->attrValue.attrValue));
+
imma_copyAttrValue3((SaImmValueTypeT) p->attrValue.attrValueType,
&(p->attrValue.attrValue));
if
(p->attrValue.attrValuesNumber > 1) {
int ix;
@@ -2779,7 +2779,7 @@ static bool imma_process_callback_info(I
for (ix = 1; ix
< p->attrValue.attrValuesNumber; ++ix) {
osafassert(r);
attr[i]->modAttr.attrValues[ix] =
-
imma_copyAttrValue3(p->attrValue.attrValueType, &(r->n));/*alloc-5 */
+
imma_copyAttrValue3((SaImmValueTypeT) p->attrValue.attrValueType,
&(r->n));/*alloc-5 */
r =
r->next;
}//for all
extra values
@@ -3009,7 +3009,7 @@ static bool imma_process_callback_info(I
p = p->next;
}
osafassert(noOfAttrNames);
/*alloc-1 */
- attributeNames = calloc(noOfAttrNames +
1, sizeof(SaImmAttrNameT));
+ attributeNames = (SaImmAttrNameT *)
calloc(noOfAttrNames + 1, sizeof(SaImmAttrNameT));
p = callback->attrNames;
for (; i < noOfAttrNames; i++, p =
p->next) {
attributeNames[i] = p->name.buf;
@@ -3246,9 +3246,9 @@ SaAisErrorT imma_evt_fake_evs(IMMA_CB *c
}
/* Encode non-flat since we broadcast to unknown receivers. */
- rc = immsv_evt_enc(i_evt, &uba);
-
- if (rc != NCSCC_RC_SUCCESS) {
+ proc_rc = immsv_evt_enc(i_evt, &uba);
+
+ if (proc_rc != NCSCC_RC_SUCCESS) {
TRACE_2("ERR_LIBRARY: Failed to pre-pack");
rc = SA_AIS_ERR_LIBRARY;
goto fail;
@@ -3257,7 +3257,7 @@ SaAisErrorT imma_evt_fake_evs(IMMA_CB *c
size = uba.ttl;
/*NOTE: should check against "payload max-size" */
- tmpData = malloc(size);
+ tmpData = (char *) malloc(size);
data = m_MMGR_DATA_AT_START(uba.start, size, tmpData);
memset(&fevs_evt, 0, sizeof(IMMSV_EVT));
diff --git a/osaf/libs/agents/saf/imma/imma_proc.h
b/osaf/libs/agents/saf/imma/imma_proc.h
--- a/osaf/libs/agents/saf/imma/imma_proc.h
+++ b/osaf/libs/agents/saf/imma/imma_proc.h
@@ -72,7 +72,7 @@ typedef struct imma_callback_info {
} IMMA_CALLBACK_INFO;
void imma_process_evt(IMMA_CB *cb, IMMSV_EVT *evt);
-uint32_t imma_version_validate(SaVersionT *version);
+SaAisErrorT imma_version_validate(SaVersionT *version);
uint32_t imma_callback_ipc_init(IMMA_CLIENT_NODE *client_info);
void imma_callback_ipc_destroy(IMMA_CLIENT_NODE *client_info);
@@ -98,9 +98,9 @@ void imma_proc_free_pointers(IMMA_CB *cb
/* callback prototypes */
IMMA_CALLBACK_INFO *imma_callback_ipc_rcv(IMMA_CLIENT_NODE *clnd);
-uint32_t imma_hdl_callbk_dispatch_one(IMMA_CB *cb, SaImmHandleT immHandle);
-uint32_t imma_hdl_callbk_dispatch_all(IMMA_CB *cb, SaImmHandleT immHandle);
-uint32_t imma_hdl_callbk_dispatch_block(IMMA_CB *cb, SaImmHandleT immHandle);
+SaAisErrorT imma_hdl_callbk_dispatch_one(IMMA_CB *cb, SaImmHandleT immHandle);
+SaAisErrorT imma_hdl_callbk_dispatch_all(IMMA_CB *cb, SaImmHandleT immHandle);
+SaAisErrorT imma_hdl_callbk_dispatch_block(IMMA_CB *cb, SaImmHandleT
immHandle);
/* Admin operation continuation functions */
int imma_popAsyncAdmOpContinuation(IMMA_CB *cb,
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
