[OPENSM] Windows variants of printf/snprintf do not support '%zu', condense to '%u'.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 10 Dec 2009 00:15:41 +0000 (00:15 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 10 Dec 2009 00:15:41 +0000 (00:15 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2629 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

ulp/opensm/user/libvendor/osm_vendor_ibumad_sa.c
ulp/opensm/user/libvendor/osm_vendor_mlx_sa.c
ulp/opensm/user/opensm/osm_mcast_mgr.c
ulp/opensm/user/opensm/osm_state_mgr.c
ulp/opensm/user/osmtest/osmtest.c

index 3a00865..4cd7de7 100644 (file)
@@ -139,7 +139,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
                                    ((p_madw->mad_size - IB_SA_MAD_HDR_SIZE) /\r
                                     ib_get_attr_size(p_sa_mad->attr_offset));\r
                                OSM_LOG(p_bind->p_log, OSM_LOG_DEBUG,\r
-                                       "Count = %u = %zu / %u (%zu)\n",\r
+                                       "Count = %u = %u / %u (%u)\n",\r
                                        query_res.result_cnt,\r
                                        p_madw->mad_size - IB_SA_MAD_HDR_SIZE,\r
                                        ib_get_attr_size(p_sa_mad->attr_offset),\r
index 40c95bf..eea0d0e 100644 (file)
@@ -152,7 +152,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
                                         ib_get_attr_size(p_sa_mad->attr_offset));\r
                                osm_log(p_bind->p_log, OSM_LOG_DEBUG,\r
                                        "__osmv_sa_mad_rcv_cb: "\r
-                                       "Count = %u = %zu / %u (%zu)\n",\r
+                                       "Count = %u = %u / %u (%u)\n",\r
                                        query_res.result_cnt,\r
                                        p_madw->mad_size - IB_SA_MAD_HDR_SIZE,\r
                                        ib_get_attr_size(p_sa_mad->attr_offset),\r
index 095604d..4ae0f70 100644 (file)
@@ -602,7 +602,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, osm_mgrp_t * p_mgrp,
                        continue;       /* No routes down this port. */\r
 \r
                OSM_LOG(sm->p_log, OSM_LOG_DEBUG,\r
-                       "Routing %zu destinations via switch port %u\n",\r
+                       "Routing %u destinations via switch port %u\n",\r
                        count, i);\r
 \r
                /*\r
index f87250b..37fe327 100644 (file)
@@ -965,7 +965,7 @@ static void state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
                         * with the new lid we wanted to give it in our\r
                         * port_lid_tbl. */\r
                        OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3322: "\r
-                               "lid %zu is wrongly assigned to port 0x%016"\r
+                               "lid %u is wrongly assigned to port 0x%016"\r
                                PRIx64 " (\'%s\' port %u) in port_lid_tbl\n",\r
                                lid,\r
                                cl_ntoh64(osm_port_get_guid(p_port_stored)),\r
@@ -978,7 +978,7 @@ static void state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
                         * original lid. */\r
                        OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3323: "\r
                                "port 0x%016" PRIx64 " (\'%s\' port %u)"\r
-                               " exists in new port_lid_tbl under lid %zu,"\r
+                               " exists in new port_lid_tbl under lid %u,"\r
                                " but missing in subnet port_lid_tbl db\n",\r
                                cl_ntoh64(osm_port_get_guid(p_port_ref)),\r
                                p_port_ref->p_node->print_desc,\r
@@ -989,7 +989,7 @@ static void state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
                         * it didn't reach it, and p_port_ref also didn't get\r
                         * the lid update. */\r
                        OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3324: "\r
-                               "lid %zu has port 0x%016" PRIx64\r
+                               "lid %u has port 0x%016" PRIx64\r
                                " (\'%s\' port %u) in new port_lid_tbl db, "\r
                                "and port 0x%016" PRIx64 " (\'%s\' port %u)"\r
                                " in subnet port_lid_tbl db\n", lid,\r
index 5c7dcd7..0429c78 100644 (file)
@@ -1977,7 +1977,7 @@ osmtest_write_all_link_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
        num_recs = context.result.result_cnt;\r
 \r
        OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE,\r
-               "Received %zu records\n", num_recs);\r
+               "Received %u records\n", num_recs);\r
 \r
        result = fprintf(fh, "#\n" "# Link Records\n" "#\n");\r
        if (result < 0) {\r
@@ -2108,7 +2108,7 @@ osmtest_write_all_node_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
         */\r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n", num_recs);\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n", num_recs);\r
 \r
        result = fprintf(fh, "#\n" "# Node Records\n" "#\n");\r
        if (result < 0) {\r
@@ -2173,7 +2173,7 @@ osmtest_write_all_port_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
         */\r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n", num_recs);\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n", num_recs);\r
 \r
        result = fprintf(fh, "#\n" "# PortInfo Records\n" "#\n");\r
        if (result < 0) {\r
@@ -2239,7 +2239,7 @@ osmtest_write_all_path_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
         */\r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n", num_recs);\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n", num_recs);\r
 \r
        result = fprintf(fh, "#\n" "# Path Records\n" "#\n");\r
        if (result < 0) {\r
@@ -4063,7 +4063,7 @@ osmtest_validate_all_node_recs(IN osmtest_t * const p_osmt)
 \r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n",\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n",\r
                num_recs);\r
 \r
        /*\r
@@ -4137,7 +4137,7 @@ osmtest_validate_all_guidinfo_recs(IN osmtest_t * const p_osmt)
 \r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n",\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n",\r
                num_recs);\r
 \r
        /* No validation as yet */\r
@@ -4186,7 +4186,7 @@ osmtest_validate_all_path_recs(IN osmtest_t * const p_osmt)
 \r
        num_recs = context.result.result_cnt;\r
 \r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %zu records\n",\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "Received %u records\n",\r
                num_recs);\r
 \r
        /*\r
@@ -4945,7 +4945,7 @@ osmtest_validate_single_path_rec_lid_pair(IN osmtest_t * const p_osmt,
        num_recs = context.result.result_cnt;\r
        if (num_recs != 1) {\r
                OSM_LOG(&p_osmt->log, OSM_LOG_ERROR, "ERR 0103: "\r
-                       "Too many records. Expected 1, received %zu\n",\r
+                       "Too many records. Expected 1, received %u\n",\r
                        num_recs);\r
 \r
                status = IB_ERROR;\r
@@ -5183,7 +5183,7 @@ osmtest_validate_single_path_rec_guid_pair(IN osmtest_t * const p_osmt,
        }\r
 \r
        num_recs = context.result.result_cnt;\r
-       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "%zu records\n", num_recs);\r
+       OSM_LOG(&p_osmt->log, OSM_LOG_VERBOSE, "%u records\n", num_recs);\r
 \r
        for (i = 0; i < num_recs; i++) {\r
                p_rec =\r