osaf/libs/agents/saf/ntfa/ntfa.h | 2 +-
osaf/libs/agents/saf/ntfa/ntfa_api.c | 12 ++++++------
osaf/libs/agents/saf/ntfa/ntfa_mds.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/osaf/libs/agents/saf/ntfa/ntfa.h b/osaf/libs/agents/saf/ntfa/ntfa.h
--- a/osaf/libs/agents/saf/ntfa/ntfa.h
+++ b/osaf/libs/agents/saf/ntfa/ntfa.h
@@ -161,7 +161,7 @@ extern ntfa_subscriber_list_t *subscribe
/* ntfa_mds.c */
extern uint32_t ntfa_mds_init(ntfa_cb_t *cb);
extern void ntfa_mds_finalize(ntfa_cb_t *cb);
-extern uint32_t ntfa_mds_msg_sync_send(ntfa_cb_t *cb, ntfsv_msg_t *i_msg,
ntfsv_msg_t **o_msg, uint32_t timeout);
+extern uint32_t ntfa_mds_msg_sync_send(ntfa_cb_t *cb, ntfsv_msg_t *i_msg,
ntfsv_msg_t **o_msg, SaTimeT timeout);
extern uint32_t ntfa_mds_msg_async_send(ntfa_cb_t *cb, ntfsv_msg_t *i_msg,
uint32_t prio);
extern void ntfsv_ntfa_evt_free(struct ntfsv_msg *);
diff --git a/osaf/libs/agents/saf/ntfa/ntfa_api.c
b/osaf/libs/agents/saf/ntfa/ntfa_api.c
--- a/osaf/libs/agents/saf/ntfa/ntfa_api.c
+++ b/osaf/libs/agents/saf/ntfa/ntfa_api.c
@@ -1768,7 +1768,7 @@ SaAisErrorT saNtfNotificationSend(SaNtfN
ntfa_notification_hdl_rec_t *notification_hdl_rec;
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_send_not_req_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
uint32_t mds_rc;
SaNtfNotificationHeaderT *ntfHeader;
@@ -2071,7 +2071,7 @@ SaAisErrorT saNtfNotificationSubscribe(c
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_subscribe_req_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
bool recovery_failed = false;
TRACE_ENTER();
@@ -3269,7 +3269,7 @@ SaAisErrorT saNtfNotificationUnsubscribe
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_msg_t *async_cbk_msg = NULL, *process = NULL, *cbk_msg = NULL;
ntfsv_unsubscribe_req_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
/* Check NTF server availability */
if (getServerState() == NTFA_NTFSV_NO_ACTIVE) {
@@ -3394,7 +3394,7 @@ SaAisErrorT saNtfNotificationReadInitial
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_reader_init_req_2_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
bool recovery_failed = false;
TRACE_ENTER();
@@ -3545,7 +3545,7 @@ SaAisErrorT saNtfNotificationReadFinaliz
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_reader_finalize_req_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
TRACE_ENTER();
/* Check NTF server availability */
@@ -3657,7 +3657,7 @@ SaAisErrorT saNtfNotificationReadNext(Sa
ntfsv_msg_t msg, *o_msg = NULL;
ntfsv_read_next_req_t *send_param;
- uint32_t timeout = NTFS_WAIT_TIME;
+ SaTimeT timeout = NTFS_WAIT_TIME;
ntfsv_send_not_req_t *read_not = NULL;
ntfa_notification_hdl_rec_t *notification_hdl_rec = NULL;
SaNtfNotificationHeaderT *read_not_header = NULL;
diff --git a/osaf/libs/agents/saf/ntfa/ntfa_mds.c
b/osaf/libs/agents/saf/ntfa/ntfa_mds.c
--- a/osaf/libs/agents/saf/ntfa/ntfa_mds.c
+++ b/osaf/libs/agents/saf/ntfa/ntfa_mds.c
@@ -1158,7 +1158,7 @@ void ntfa_mds_finalize(ntfa_cb_t *cb)
Notes : None.
******************************************************************************/
-uint32_t ntfa_mds_msg_sync_send(ntfa_cb_t *cb, ntfsv_msg_t *i_msg, ntfsv_msg_t
**o_msg, uint32_t timeout)
+uint32_t ntfa_mds_msg_sync_send(ntfa_cb_t *cb, ntfsv_msg_t *i_msg, ntfsv_msg_t
**o_msg, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc = 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
