[ofa-general] [PATCH] [TRIVIAL] opensm/osm_state_mgr.c: fixing some data types and log messages

[Yevgeny Kliteynik]

Hi Sasha,

Fixing some data types and corresponding log messages,
thus solving compiler warnings.

[ sorry for the dup, my previous message is being held
  hostage by the openib anti-spam filter, probably
  because of syntax errors in the subject :) ]

Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
---
 opensm/opensm/osm_state_mgr.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c
index f15a4af..6ca276b 100644
--- a/opensm/opensm/osm_state_mgr.c
+++ b/opensm/opensm/osm_state_mgr.c
@@ -863,7 +863,8 @@ static void __osm_state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
 	osm_port_t *p_port;
 	osm_port_t *p_next_port;
 	cl_ptr_vector_t *p_port_lid_tbl;
-	size_t max_lid, ref_size, curr_size, lid;
+	size_t ref_size, curr_size;
+	uint16_t max_lid, lid;
 	osm_port_t *p_port_ref, *p_port_stored;
 	cl_ptr_vector_t ref_port_lid_tbl;
 	uint16_t min_lid_ho;
@@ -921,7 +922,7 @@ static void __osm_state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
 			 * with the new lid we wanted to give it in our
 			 * port_lid_tbl. */
 			OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3322: "
-				"lid %u is wrongly assigned to port 0x%016"
+				"lid 0x%04x is wrongly assigned to port 0x%016"
 				PRIx64 " (\'%s\' port %u) in port_lid_tbl\n",
 				lid,
 				cl_ntoh64(osm_port_get_guid(p_port_stored)),
@@ -934,7 +935,7 @@ static void __osm_state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
 			 * original lid. */
 			OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3323: "
 				"port 0x%016" PRIx64 " (\'%s\' port %u)"
-				" exists in new port_lid_tbl under lid %u,"
+				" exists in new port_lid_tbl under lid 0x%04x,"
 				" but missing in subnet port_lid_tbl db\n",
 				cl_ntoh64(osm_port_get_guid(p_port_ref)),
 				p_port_ref->p_node->print_desc,
@@ -945,7 +946,7 @@ static void __osm_state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
 			 * it didn't reach it, and p_port_ref also didn't get
 			 * the lid update. */
 			OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3324: "
-				"lid %u has port 0x%016" PRIx64
+				"lid 0x%04x has port 0x%016" PRIx64
 				" (\'%s\' port %u) in new port_lid_tbl db, "
 				"and port 0x%016" PRIx64 " (\'%s\' port %u)"
 				" in subnet port_lid_tbl db\n", lid,
-- 
1.5.1.4