osaf/libs/agents/saf/gla/gla_api.c | 6 +++---
osaf/libs/agents/saf/gla/gla_mds.c | 2 +-
osaf/libs/agents/saf/gla/gla_tmr.c | 6 +++---
osaf/libs/common/glsv/include/gla_mds.h | 2 +-
osaf/services/saf/glsv/gld/gld_tmr.c | 4 ++--
osaf/services/saf/glsv/glnd/glnd_res.c | 2 +-
osaf/services/saf/glsv/glnd/glnd_tmr.c | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/osaf/libs/agents/saf/gla/gla_api.c
b/osaf/libs/agents/saf/gla/gla_api.c
--- a/osaf/libs/agents/saf/gla/gla_api.c
+++ b/osaf/libs/agents/saf/gla/gla_api.c
@@ -590,7 +590,7 @@ SaAisErrorT saLckResourceOpen(SaLckHandl
}
/* send the event */
- if ((ret = gla_mds_msg_sync_send(gla_cb, &res_open_evt, &out_evt,
(uint32_t)gla_timeout)) != NCSCC_RC_SUCCESS) {
+ if ((ret = gla_mds_msg_sync_send(gla_cb, &res_open_evt, &out_evt,
gla_timeout)) != NCSCC_RC_SUCCESS) {
if (ret == NCSCC_RC_REQ_TIMOUT)
rc = SA_AIS_ERR_TIMEOUT;
else
@@ -1026,7 +1026,7 @@ SaAisErrorT saLckResourceLock(SaLckResou
gla_timeout = gla_timeout + LCK_TIMEOUT_LATENCY;
/* send the event */
- if ((ret = gla_mds_msg_sync_send(gla_cb, &res_lock_evt, &out_evt,
(uint32_t)gla_timeout)) != NCSCC_RC_SUCCESS) {
+ if ((ret = gla_mds_msg_sync_send(gla_cb, &res_lock_evt, &out_evt,
gla_timeout)) != NCSCC_RC_SUCCESS) {
if (ret == NCSCC_RC_REQ_TIMOUT) {
/* delete the lock node */
gla_lock_tree_delete_node(gla_cb, lock_id_node);
@@ -1338,7 +1338,7 @@ SaAisErrorT saLckResourceUnlock(SaLckLoc
gla_timeout = gla_timeout + LCK_TIMEOUT_LATENCY;
/* send the event */
- if ((ret = gla_mds_msg_sync_send(gla_cb, &res_unlock_evt, &out_evt,
(uint32_t)gla_timeout)) != NCSCC_RC_SUCCESS) {
+ if ((ret = gla_mds_msg_sync_send(gla_cb, &res_unlock_evt, &out_evt,
gla_timeout)) != NCSCC_RC_SUCCESS) {
if (ret == NCSCC_RC_REQ_TIMOUT)
rc = SA_AIS_ERR_TIMEOUT;
else
diff --git a/osaf/libs/agents/saf/gla/gla_mds.c
b/osaf/libs/agents/saf/gla/gla_mds.c
--- a/osaf/libs/agents/saf/gla/gla_mds.c
+++ b/osaf/libs/agents/saf/gla/gla_mds.c
@@ -708,7 +708,7 @@ static uint32_t gla_mds_svc_evt(GLA_CB *
Notes : None.
******************************************************************************/
-uint32_t gla_mds_msg_sync_send(GLA_CB *cb, GLSV_GLND_EVT *i_evt, GLSV_GLA_EVT
**o_evt, uint32_t timeout)
+uint32_t gla_mds_msg_sync_send(GLA_CB *cb, GLSV_GLND_EVT *i_evt, GLSV_GLA_EVT
**o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
diff --git a/osaf/libs/agents/saf/gla/gla_tmr.c
b/osaf/libs/agents/saf/gla/gla_tmr.c
--- a/osaf/libs/agents/saf/gla/gla_tmr.c
+++ b/osaf/libs/agents/saf/gla/gla_tmr.c
@@ -47,10 +47,10 @@
*****************************************************************************/
uint32_t gla_start_tmr(GLA_TMR *tmr)
{
- uint32_t period =
(uint32_t)(m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(GLSV_GLA_TMR_DEFAULT_TIMEOUT));
+ SaTimeT period =
(m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(GLSV_GLA_TMR_DEFAULT_TIMEOUT));
if (tmr->tmr_id == TMR_T_NULL) {
- m_NCS_TMR_CREATE(tmr->tmr_id, (uint32_t)period, gla_tmr_exp,
(void *)tmr);
+ m_NCS_TMR_CREATE(tmr->tmr_id, period, gla_tmr_exp, (void *)tmr);
}
if (tmr->is_active == true) {
@@ -58,7 +58,7 @@ uint32_t gla_start_tmr(GLA_TMR *tmr)
tmr->is_active = false;
}
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)period, gla_tmr_exp, (void
*)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, period, gla_tmr_exp, (void *)tmr);
if (TMR_T_NULL == tmr->tmr_id) {
return NCSCC_RC_FAILURE;
diff --git a/osaf/libs/common/glsv/include/gla_mds.h
b/osaf/libs/common/glsv/include/gla_mds.h
--- a/osaf/libs/common/glsv/include/gla_mds.h
+++ b/osaf/libs/common/glsv/include/gla_mds.h
@@ -36,7 +36,7 @@ uint32_t gla_mds_register(struct gla_cb_
void gla_mds_unregister(struct gla_cb_tag *cb);
-uint32_t gla_mds_msg_sync_send(struct gla_cb_tag *cb, GLSV_GLND_EVT *i_evt,
GLSV_GLA_EVT **o_evt, uint32_t timeout);
+uint32_t gla_mds_msg_sync_send(struct gla_cb_tag *cb, GLSV_GLND_EVT *i_evt,
GLSV_GLA_EVT **o_evt, SaTimeT timeout);
uint32_t gla_mds_msg_async_send(struct gla_cb_tag *cb, GLSV_GLND_EVT *i_evt);
diff --git a/osaf/services/saf/glsv/gld/gld_tmr.c
b/osaf/services/saf/glsv/gld/gld_tmr.c
--- a/osaf/services/saf/glsv/gld/gld_tmr.c
+++ b/osaf/services/saf/glsv/gld/gld_tmr.c
@@ -54,7 +54,7 @@
*****************************************************************************/
uint32_t gld_start_tmr(GLSV_GLD_CB *cb, GLD_TMR *tmr, GLD_TMR_TYPE type,
SaTimeT period, uint32_t uarg)
{
- uint32_t my_period =
(uint32_t)(m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(period));
+ SaTimeT my_period = (m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(period));
if (tmr == NULL)
return NCSCC_RC_FAILURE;
@@ -85,7 +85,7 @@ uint32_t gld_start_tmr(GLSV_GLD_CB *cb,
return NCSCC_RC_FAILURE;
}
- TRACE("Started GLD Timer for %d @ %d ticks", type, my_period);
+ TRACE("Started GLD Timer for %d @ %lld ticks", type, my_period);
return NCSCC_RC_SUCCESS;
}
diff --git a/osaf/services/saf/glsv/glnd/glnd_res.c
b/osaf/services/saf/glsv/glnd/glnd_res.c
--- a/osaf/services/saf/glsv/glnd/glnd_res.c
+++ b/osaf/services/saf/glsv/glnd/glnd_res.c
@@ -1476,7 +1476,7 @@ void glnd_resource_convert_nonmaster_to_
{
GLND_RES_LOCK_LIST_INFO *lck_list_nm_info;
GLND_RES_LOCK_LIST_INFO *lck_list_m_info;
- uint32_t remaining_time = 0;
+ int64_t remaining_time = 0;
SaTimeT time;
TRACE_ENTER();
diff --git a/osaf/services/saf/glsv/glnd/glnd_tmr.c
b/osaf/services/saf/glsv/glnd/glnd_tmr.c
--- a/osaf/services/saf/glsv/glnd/glnd_tmr.c
+++ b/osaf/services/saf/glsv/glnd/glnd_tmr.c
@@ -54,7 +54,7 @@
*****************************************************************************/
uint32_t glnd_start_tmr(GLND_CB *cb, GLND_TMR *tmr, GLND_TMR_TYPE type,
SaTimeT period, uint32_t uarg)
{
- uint32_t my_period =
(uint32_t)(m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(period));
+ SaTimeT my_period = (m_GLSV_CONVERT_SATIME_TEN_MILLI_SEC(period));
if (GLND_TMR_MAX <= type) {
LOG_ER("GLND timer start failure: type %d ", type);
@@ -81,7 +81,7 @@ uint32_t glnd_start_tmr(GLND_CB *cb, GLN
return NCSCC_RC_FAILURE;
}
- TRACE("Started GLND Timer for %d @ %d ticks", type, my_period);
+ TRACE("Started GLND Timer for %d @ %lld ticks", type, my_period);
return NCSCC_RC_SUCCESS;
}
------------------------------------------------------------------------------
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
