osaf/libs/agents/saf/lga/lga.h | 2 +-
osaf/libs/agents/saf/lga/lga_api.c | 4 ++--
osaf/libs/agents/saf/lga/lga_mds.c | 2 +-
osaf/libs/agents/saf/lga/lga_state.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/osaf/libs/agents/saf/lga/lga.h b/osaf/libs/agents/saf/lga/lga.h
--- a/osaf/libs/agents/saf/lga/lga.h
+++ b/osaf/libs/agents/saf/lga/lga.h
@@ -126,7 +126,7 @@ extern lga_cb_t lga_cb;
/* lga_mds.c */
extern uint32_t lga_mds_init(lga_cb_t *cb);
extern void lga_mds_finalize(lga_cb_t *cb);
-extern uint32_t lga_mds_msg_sync_send(lga_cb_t *cb, lgsv_msg_t *i_msg,
lgsv_msg_t **o_msg, uint32_t timeout,uint32_t prio);
+extern uint32_t lga_mds_msg_sync_send(lga_cb_t *cb, lgsv_msg_t *i_msg,
lgsv_msg_t **o_msg, SaTimeT timeout,uint32_t prio);
extern uint32_t lga_mds_msg_async_send(lga_cb_t *cb, lgsv_msg_t *i_msg,
uint32_t prio);
extern void lgsv_lga_evt_free(struct lgsv_msg *);
diff --git a/osaf/libs/agents/saf/lga/lga_api.c
b/osaf/libs/agents/saf/lga/lga_api.c
--- a/osaf/libs/agents/saf/lga/lga_api.c
+++ b/osaf/libs/agents/saf/lga/lga_api.c
@@ -743,7 +743,7 @@ SaAisErrorT saLogStreamOpen_2(SaLogHandl
SaAisErrorT ais_rc;
int rc = 0;
uint32_t ncs_rc;
- uint32_t timeout;
+ SaTimeT timeout;
uint32_t log_stream_id;
uint32_t log_header_type = 0;
bool is_locked = false;
@@ -868,7 +868,7 @@ SaAisErrorT saLogStreamOpen_2(SaLogHandl
}
/* Normalize the timeOut value */
- timeout = (uint32_t)(timeOut / LGSV_NANOSEC_TO_LEAPTM);
+ timeout = (timeOut / LGSV_NANOSEC_TO_LEAPTM);
if (timeout < NCS_SAF_MIN_ACCEPT_TIME) {
TRACE("Timeout");
diff --git a/osaf/libs/agents/saf/lga/lga_mds.c
b/osaf/libs/agents/saf/lga/lga_mds.c
--- a/osaf/libs/agents/saf/lga/lga_mds.c
+++ b/osaf/libs/agents/saf/lga/lga_mds.c
@@ -1208,7 +1208,7 @@ void lga_mds_finalize(lga_cb_t *cb)
Notes : None.
******************************************************************************/
-uint32_t lga_mds_msg_sync_send(lga_cb_t *cb, lgsv_msg_t *i_msg, lgsv_msg_t
**o_msg, uint32_t timeout, uint32_t prio)
+uint32_t lga_mds_msg_sync_send(lga_cb_t *cb, lgsv_msg_t *i_msg, lgsv_msg_t
**o_msg, SaTimeT timeout, uint32_t prio)
{
NCSMDS_INFO mds_info;
uint32_t rc = NCSCC_RC_SUCCESS;
diff --git a/osaf/libs/agents/saf/lga/lga_state.c
b/osaf/libs/agents/saf/lga/lga_state.c
--- a/osaf/libs/agents/saf/lga/lga_state.c
+++ b/osaf/libs/agents/saf/lga/lga_state.c
@@ -312,7 +312,7 @@ static void *recovery2_thread(void *dumm
{
int rc = 0;
struct timespec seed_ts;
- int timeout_ms;
+ int64_t timeout_ms;
TRACE_ENTER();
@@ -322,7 +322,7 @@ static void *recovery2_thread(void *dumm
osaf_clock_gettime(CLOCK_MONOTONIC, &seed_ts);
srandom((unsigned int) seed_ts.tv_nsec);
/* Interval 400 - 500 sec */
- timeout_ms = (int) (random() % 100 + 400) * 1000;
+ timeout_ms = (int64_t) (random() % 100 + 400) * 1000;
/* Wait for timeout or a signal to terminate
*/
------------------------------------------------------------------------------
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
