osaf/libs/agents/saf/mqa/mqa_api.c | 20 ++++++++++----------
osaf/libs/agents/saf/mqa/mqa_mds.c | 6 +++---
osaf/libs/common/mqsv/include/mqa_def.h | 6 +++---
osaf/libs/common/mqsv/include/mqnd_mds.h | 2 +-
osaf/services/saf/mqsv/mqd/mqd_tmr.c | 4 ++--
osaf/services/saf/mqsv/mqnd/mqnd_mds.c | 2 +-
osaf/services/saf/mqsv/mqnd/mqnd_tmr.c | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/osaf/libs/agents/saf/mqa/mqa_api.c
b/osaf/libs/agents/saf/mqa/mqa_api.c
--- a/osaf/libs/agents/saf/mqa/mqa_api.c
+++ b/osaf/libs/agents/saf/mqa/mqa_api.c
@@ -779,7 +779,7 @@ saMsgQueueOpen(SaMsgHandleT msgHandle,
/* send the event */
mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl,
&(mqa_cb->mqnd_mds_dest),
- &qopen_evt, &out_evt, (uint32_t)timeout);
+ &qopen_evt, &out_evt, timeout);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
@@ -1164,7 +1164,7 @@ SaAisErrorT saMsgQueueClose(SaMsgQueueHa
/* send the event */
mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl,
&(mqa_cb->mqnd_mds_dest), &qclose_evt,
- &out_evt, (uint32_t)mqa_timeout);
+ &out_evt, mqa_timeout);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
@@ -1322,7 +1322,7 @@ SaAisErrorT saMsgQueueStatusGet(SaMsgHan
mqa_timeout = MQSV_WAIT_TIME;
- mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl, &mqnd_mds_dest,
&qstatus_evt, &out_evt, (uint32_t)mqa_timeout);
+ mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl, &mqnd_mds_dest,
&qstatus_evt, &out_evt, mqa_timeout);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
@@ -1453,7 +1453,7 @@ SaAisErrorT saMsgQueueRetentionTimeSet(S
/* send the event */
mds_rc =
mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl,
&(mqa_cb->mqnd_mds_dest), &qret_time_evt, &out_evt,
- (uint32_t)mqa_timeout);
+ mqa_timeout);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
@@ -1604,7 +1604,7 @@ SaAisErrorT saMsgQueueUnlink(SaMsgHandle
mqa_timeout = MQSV_WAIT_TIME;
- mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl, &mqnd_mds_dest,
&qunlink_evt, &out_evt, (uint32_t)mqa_timeout);
+ mds_rc = mqa_mds_msg_sync_send(mqa_cb->mqa_mds_hdl, &mqnd_mds_dest,
&qunlink_evt, &out_evt, mqa_timeout);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
@@ -1678,7 +1678,7 @@ SaAisErrorT mqa_send_to_destination(MQA_
mqa_timeout = m_MQSV_CONVERT_SATIME_TEN_MILLI_SEC(timeout);
mds_rc = mqa_mds_msg_sync_send_direct(mqa_cb->mqa_mds_hdl,
mqnd_mds_dest, qsend_evt,
- &out_evt, (uint32_t)mqa_timeout,
length);
+ &out_evt, mqa_timeout, length);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
@@ -3111,17 +3111,17 @@ SaAisErrorT mqa_send_receive(MQA_CB *mqa
MQSV_DSEND_EVT *qsend_evt, MQSV_DSEND_EVT
**qreply_evt, SaTimeT timeout, uint32_t length)
{
- int64_t mqa_timeout;
+ SaTimeT mqa_timeout;
SaAisErrorT rc;
uint32_t mds_rc;
- TRACE_ENTER2(" SaTime %u ", (uint32_t)timeout);
+ TRACE_ENTER2(" SaTime %lld", timeout);
/* convert the timeout to 10 ms value and add it to the sync send
timeout */
mqa_timeout = m_MQSV_CONVERT_SATIME_TEN_MILLI_SEC(timeout);
mds_rc = mqa_mds_msg_sync_send_direct(mqa_cb->mqa_mds_hdl,
mqnd_mds_dest, qsend_evt,
- qreply_evt,
(uint32_t)mqa_timeout, length);
+ qreply_evt, mqa_timeout, length);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
rc = SA_AIS_OK;
@@ -3599,7 +3599,7 @@ SaAisErrorT mqa_reply_to_destination(MQA
mqa_timeout = m_MQSV_CONVERT_SATIME_TEN_MILLI_SEC(timeout);
mds_rc = mqa_mds_msg_sync_reply_direct(mqa_cb->mqa_mds_hdl,
mqnd_mds_dest, qsend_evt,
- (uint32_t)mqa_timeout, context,
length);
+ mqa_timeout, context, length);
switch (mds_rc) {
case NCSCC_RC_SUCCESS:
break;
diff --git a/osaf/libs/agents/saf/mqa/mqa_mds.c
b/osaf/libs/agents/saf/mqa/mqa_mds.c
--- a/osaf/libs/agents/saf/mqa/mqa_mds.c
+++ b/osaf/libs/agents/saf/mqa/mqa_mds.c
@@ -612,7 +612,7 @@ static uint32_t mqa_mds_svc_evt(MQA_CB *
Notes : None.
******************************************************************************/
-uint32_t mqa_mds_msg_sync_send(uint32_t mqa_mds_hdl, MDS_DEST *destination,
MQSV_EVT *i_evt, MQSV_EVT **o_evt, uint32_t timeout)
+uint32_t mqa_mds_msg_sync_send(uint32_t mqa_mds_hdl, MDS_DEST *destination,
MQSV_EVT *i_evt, MQSV_EVT **o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
@@ -692,7 +692,7 @@ uint32_t mqa_mds_msg_sync_send(uint32_t
******************************************************************************/
uint32_t mqa_mds_msg_sync_send_direct(uint32_t mqa_mds_hdl,
MDS_DEST *destination,
- MQSV_DSEND_EVT *i_evt, MQSV_DSEND_EVT
**o_evt, uint32_t timeout, uint32_t length)
+ MQSV_DSEND_EVT *i_evt, MQSV_DSEND_EVT
**o_evt, SaTimeT timeout, uint32_t length)
{
NCSMDS_INFO mds_info;
uint32_t rc;
@@ -893,7 +893,7 @@ uint32_t mqa_mds_msg_sync_send_direct(ui
******************************************************************************/
uint32_t mqa_mds_msg_sync_reply_direct(uint32_t mqa_mds_hdl,
MDS_DEST *destination,
- MQSV_DSEND_EVT *i_evt, uint32_t timeout,
MDS_SYNC_SND_CTXT *context, uint32_t length)
+ MQSV_DSEND_EVT *i_evt, SaTimeT timeout,
MDS_SYNC_SND_CTXT *context, uint32_t length)
{
NCSMDS_INFO mds_info;
uint32_t rc;
diff --git a/osaf/libs/common/mqsv/include/mqa_def.h
b/osaf/libs/common/mqsv/include/mqa_def.h
--- a/osaf/libs/common/mqsv/include/mqa_def.h
+++ b/osaf/libs/common/mqsv/include/mqa_def.h
@@ -91,18 +91,18 @@ uint32_t mqa_hdl_callbk_dispatch_block(M
uint32_t mqa_asapi_msghandler(ASAPi_MSG_INFO *asapi_msg);
uint32_t mqa_mds_msg_sync_send(uint32_t mqa_mds_hdl,
- MDS_DEST *destination, MQSV_EVT *i_evt,
MQSV_EVT **o_evt, uint32_t timeout);
+ MDS_DEST *destination, MQSV_EVT *i_evt,
MQSV_EVT **o_evt, SaTimeT timeout);
uint32_t mqa_mds_msg_async_send(uint32_t mqa_mds_hdl, MDS_DEST *destination,
MQSV_EVT *i_evt, uint32_t to_svc);
uint32_t mqa_mds_msg_sync_send_direct(uint32_t mqa_mds_hdl,
MDS_DEST *destination,
- MQSV_DSEND_EVT *i_evt,
MQSV_DSEND_EVT **o_evt, uint32_t timeout, uint32_t length);
+ MQSV_DSEND_EVT *i_evt,
MQSV_DSEND_EVT **o_evt, SaTimeT timeout, uint32_t length);
uint32_t mqa_mds_msg_sync_reply_direct(uint32_t mqa_mds_hdl,
MDS_DEST *destination,
MQSV_DSEND_EVT *i_evt,
- uint32_t timeout,
MDS_SYNC_SND_CTXT *context, uint32_t length);
+ SaTimeT timeout, MDS_SYNC_SND_CTXT
*context, uint32_t length);
uint32_t mqa_mds_msg_async_send_direct(uint32_t mqa_mds_hdl,
MDS_DEST *destination,
diff --git a/osaf/libs/common/mqsv/include/mqnd_mds.h
b/osaf/libs/common/mqsv/include/mqnd_mds.h
--- a/osaf/libs/common/mqsv/include/mqnd_mds.h
+++ b/osaf/libs/common/mqsv/include/mqnd_mds.h
@@ -27,7 +27,7 @@ uint32_t mqnd_mds_send_rsp(MQND_CB *cb,
uint32_t mqnd_mds_send_rsp_direct(MQND_CB *cb, MQSV_DSEND_INFO *s_info,
MQSV_DSEND_EVT *evt);
uint32_t mqnd_mds_msg_sync_send(MQND_CB *cb, uint32_t to_svc,
- MDS_DEST to_dest, MQSV_EVT *i_evt,
MQSV_EVT **o_evt, uint32_t timeout);
+ MDS_DEST to_dest, MQSV_EVT *i_evt,
MQSV_EVT **o_evt, SaTimeT timeout);
uint32_t mqnd_mds_send(MQND_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
MQSV_EVT *evt);
diff --git a/osaf/services/saf/mqsv/mqd/mqd_tmr.c
b/osaf/services/saf/mqsv/mqd/mqd_tmr.c
--- a/osaf/services/saf/mqsv/mqd/mqd_tmr.c
+++ b/osaf/services/saf/mqsv/mqd/mqd_tmr.c
@@ -82,13 +82,13 @@ void mqd_timer_expiry(NCSCONTEXT uarg)
*****************************************************************************/
uint32_t mqd_tmr_start(MQD_TMR *tmr, SaTimeT duration)
{
- TRACE_1("The timer started with the duration as %u",
(uint32_t)duration);
+ TRACE_1("The timer started with the duration as %lld", duration);
if (tmr->tmr_id == TMR_T_NULL) {
m_NCS_TMR_CREATE(tmr->tmr_id, duration, mqd_timer_expiry, (void
*)tmr);
}
if (tmr->is_active == false) {
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
mqd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, mqd_timer_expiry, (void
*)tmr);
tmr->is_active = true;
}
diff --git a/osaf/services/saf/mqsv/mqnd/mqnd_mds.c
b/osaf/services/saf/mqsv/mqnd/mqnd_mds.c
--- a/osaf/services/saf/mqsv/mqnd/mqnd_mds.c
+++ b/osaf/services/saf/mqsv/mqnd/mqnd_mds.c
@@ -853,7 +853,7 @@ uint32_t mqnd_mds_send_rsp_direct(MQND_C
Notes : None.
******************************************************************************/
uint32_t mqnd_mds_msg_sync_send(MQND_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
- MQSV_EVT *i_evt, MQSV_EVT **o_evt, uint32_t
timeout)
+ MQSV_EVT *i_evt, MQSV_EVT **o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
diff --git a/osaf/services/saf/mqsv/mqnd/mqnd_tmr.c
b/osaf/services/saf/mqsv/mqnd/mqnd_tmr.c
--- a/osaf/services/saf/mqsv/mqnd/mqnd_tmr.c
+++ b/osaf/services/saf/mqsv/mqnd/mqnd_tmr.c
@@ -97,7 +97,7 @@ uint32_t mqnd_tmr_start(MQND_TMR *tmr, S
}
if (tmr->is_active == false) {
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
mqnd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, mqnd_timer_expiry, (void
*)tmr);
tmr->is_active = true;
}
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
