cosmetic fixes in openib btl:

* replace tabs with ws
* remove unnecessary casting
* use proper escape codes for printf() like functions

This commit was SVN r24445.

ompi/mca/btl/openib/btl_openib.c

@@ -35,6 +35,7 @@
 #include "opal/util/output.h"
 #include "opal/util/arch.h"
 #include "opal/util/opal_sos.h"
+#include "opal/include/opal_stdint.h"
 
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
@@ -1201,7 +1202,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
     mca_btl_openib_component_t *openib_component;
     mca_btl_openib_com_frag_t *frag;
     mca_btl_openib_reg_t *openib_reg;
-    size_t max_msg_sz;
+    uint32_t max_msg_sz;
     int rc;
     void *buffer;
 
@@ -1214,20 +1215,20 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
     }
 
     /* max_msg_sz is the maximum message size of the HCA (hw limitation)
-       set the minimum between local max_msg_sz and the remote*/
-	max_msg_sz = MIN(openib_btl->ib_port_attr.max_msg_sz,
+       set the minimum between local max_msg_sz and the remote */
+    max_msg_sz = MIN(openib_btl->ib_port_attr.max_msg_sz,
                      endpoint->endpoint_btl->ib_port_attr.max_msg_sz);
 
     /* check if user has explicitly limited the max message size */
     if (openib_component->max_hw_msg_size > 0 &&
-            max_msg_sz > (uint32_t)openib_component->max_hw_msg_size) {
+            max_msg_sz > openib_component->max_hw_msg_size) {
         max_msg_sz = openib_component->max_hw_msg_size;
     }
 
-    /* limit the message so to max_msg_sz*/
-    if (*size > max_msg_sz) {
-        *size = max_msg_sz;
-        BTL_VERBOSE(("message size limited to %u", (uint32_t)*size));
+    /* limit the message so to max_msg_sz */
+    if (*size > (size_t)max_msg_sz) {
+        *size = (size_t)max_msg_sz;
+        BTL_VERBOSE(("message size limited to %" PRIsize_t "\n", *size));
     }
 
     opal_convertor_get_current_pointer(convertor, &buffer);

ompi/mca/btl/openib/btl_openib.h

@@ -198,7 +198,7 @@ struct mca_btl_openib_component_t {
 
     size_t eager_limit;      /**< Eager send limit of first fragment, in Bytes */
     size_t max_send_size;    /**< Maximum send size, in Bytes */
-    int32_t max_hw_msg_size; /**< Maximum message size for RDMA protocols in Bytes */
+    uint32_t max_hw_msg_size;/**< Maximum message size for RDMA protocols in Bytes */
     uint32_t reg_mru_len;    /**< Length of the registration cache most recently used list */
     uint32_t use_srq;        /**< Use the Shared Receive Queue (SRQ mode) */
 

ompi/mca/btl/openib/btl_openib_component.c

@@ -2494,7 +2494,7 @@ btl_openib_component_init(int *num_btl_modules,
             if (value & MCA_BTL_FLAGS_GET) {
                 /* Until GET flow is fixed - we do not support GET
                    in openib btl. */
-				BTL_ERROR(("openib btl does not support GET flag"));
+                BTL_ERROR(("openib btl does not support GET flag"));
             }
         }
     }
@@ -2770,9 +2770,9 @@ btl_openib_component_init(int *num_btl_modules,
         }
 
         if (mca_btl_openib_component.max_hw_msg_size > 0 &&
-            (uint32_t)mca_btl_openib_component.max_hw_msg_size > openib_btl->ib_port_attr.max_msg_sz) {
-			BTL_ERROR(("max_hw_msg_size (%d) is larger than hw max message size (%d)",
-                        mca_btl_openib_component.max_hw_msg_size, openib_btl->ib_port_attr.max_msg_sz));
+            mca_btl_openib_component.max_hw_msg_size > openib_btl->ib_port_attr.max_msg_sz) {
+            BTL_ERROR(("max_hw_msg_size (%" PRIu32 ") is larger than hw max message size (%" PRIu32 ")",
+                mca_btl_openib_component.max_hw_msg_size, openib_btl->ib_port_attr.max_msg_sz));
         }
 
         mca_btl_openib_component.openib_btls[i] = openib_btl;

ompi/mca/btl/openib/btl_openib_mca.c

@@ -516,8 +516,8 @@ int btl_openib_register_mca_params(void)
 
     CHECK(reg_int("max_hw_msg_size", NULL,
                   "Maximum size (in bytes) of a single fragment of a long message when using the RDMA protocols (must be > 0 and <= hw capabilities).",
-                  -1, &ival, REGINT_NEG_ONE_OK|REGINT_GE_ZERO));
-    mca_btl_openib_component.max_hw_msg_size = (int32_t)ival;
+                  0, &ival, REGINT_NEG_ONE_OK|REGINT_GE_ZERO));
+    mca_btl_openib_component.max_hw_msg_size = (uint32_t)ival;
 
     /* Info only */
     mca_base_param_reg_int(&mca_btl_openib_component.super.btl_version,