[IBAL, Complib] Update to make PreFAST happy.

git-svn-id: svn://openib.tc.cornell.edu/gen1@337 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/al_mad.c b/trunk/core/al/al_mad.c
index a76b7eb277952ffae69108be200be039c699d6c7..4038e9ceae5c78a2e9083fcc272feb3ef9d0df4b 100644 (file)
--- a/trunk/core/al/al_mad.c
+++ b/trunk/core/al/al_mad.c
@@ -1881,7 +1881,7 @@ ib_delay_mad(
        if( h_send->retry_time == MAX_TIME )\r
                h_send->delay = delay_ms;\r
        else\r
-               h_send->retry_time += ((uint64_t)delay_ms * 1000ULL);\r
+               h_send->retry_time += ((uint64_t)delay_ms * 1000Ui64);\r
 \r
        cl_spinlock_release( &h_mad_svc->obj.lock );\r
        AL_EXIT( AL_DBG_MAD_SVC );\r
@@ -2938,7 +2938,7 @@ __set_retry_time(
        IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        h_send->retry_time =\r
-               (uint64_t)(h_send->p_send_mad->timeout_ms + h_send->delay) * 1000ULL +\r
+               (uint64_t)(h_send->p_send_mad->timeout_ms + h_send->delay) * 1000Ui64 +\r
                cl_get_time_stamp();\r
        h_send->delay = 0;\r
 }\r

diff --git a/trunk/core/al/kernel/al_proxy.c b/trunk/core/al/kernel/al_proxy.c
index 7a9c9c8e128094f8d371124dcb4a8fd74f329ca8..a4b7905d78eb5bf64a86bc3434fb64543052eaa8 100644 (file)
--- a/trunk/core/al/kernel/al_proxy.c
+++ b/trunk/core/al/kernel/al_proxy.c
@@ -635,7 +635,7 @@ proxy_bind_file(
        p_ioctl = cl_ioctl_in_buf( h_ioctl );\r
 \r
        status = ObReferenceObjectByHandle( p_ioctl->h_file,\r
-               READ_CONTROL, *IoFileObjectType, UserMode,\r
+               READ_CONTROL, *IoFileObjectType, h_ioctl->RequestorMode,\r
                &p_file_obj, NULL );\r
        if( !NT_SUCCESS(status) )\r
        {\r
@@ -994,7 +994,7 @@ proxy_reg_pnp(
        if( pnp_get_flag( p_ioctl->pnp_class ) & IB_PNP_FLAG_REG_SYNC )\r
        {\r
                nt_status = ObReferenceObjectByHandle( p_ioctl->sync_event,\r
-                       STANDARD_RIGHTS_ALL, *ExEventObjectType, UserMode,\r
+                       STANDARD_RIGHTS_ALL, *ExEventObjectType, h_ioctl->RequestorMode,\r
                        (PVOID*)&p_sync_event, NULL );\r
                if( !NT_SUCCESS( nt_status ) )\r
                {\r

diff --git a/trunk/core/complib/user/cl_timer.c b/trunk/core/complib/user/cl_timer.c
index 311b96e185cecdb38490dd85f5caf219fbc56513..649a7951c1045499e622d64243e9d94a96a279c0 100644 (file)
--- a/trunk/core/complib/user/cl_timer.c
+++ b/trunk/core/complib/user/cl_timer.c
@@ -148,7 +148,7 @@ cl_timer_stop(
 }\r
 \r
 \r
-#define SEC_TO_MICRO           1000000ULL      // s to µs conversion\r
+#define SEC_TO_MICRO           CL_CONST64(1000000)     // s to µs conversion\r
 \r
 uint64_t\r
 cl_get_time_stamp( void )\r

diff --git a/trunk/inc/kernel/complib/cl_timer_osd.h b/trunk/inc/kernel/complib/cl_timer_osd.h
index 2a7285b6074520881ea73e63ac44f79249f83580..bd3af5e853e45e9407c910172338b98965e60ab4 100644 (file)
--- a/trunk/inc/kernel/complib/cl_timer_osd.h
+++ b/trunk/inc/kernel/complib/cl_timer_osd.h
@@ -58,9 +58,9 @@ extern "C"
 #endif\r
 \r
 /* 100ns to s conversion */\r
-#define HUNDREDNS_TO_SEC       10000000ULL\r
+#define HUNDREDNS_TO_SEC       CL_CONST64(10000000)\r
 /* s to µs conversion */\r
-#define SEC_TO_MICRO           1000000ULL\r
+#define SEC_TO_MICRO           CL_CONST64(1000000)\r
 \r
 CL_INLINE uint64_t CL_API\r
 cl_get_time_stamp( void )\r