Minor cleanups to compile without warnings

This commit was SVN r20848.

ompi/mca/pml/csum/pml_csum.c

@@ -450,7 +450,7 @@ int mca_pml_csum_send_fin( ompi_proc_t* proc,
     hdr->hdr_common.hdr_csum = (do_csum ?
         opal_csum16(hdr, sizeof(mca_pml_csum_fin_hdr_t)) : OPAL_CSUM_ZERO);
     if(do_csum) {
-        OMPI_CSUM_CSUM_DEBUG((0, "%s: Sending \'FIN\' with header csum:0x%04x\n",
+        OPAL_OUTPUT_VERBOSE((0, "%s: Sending \'FIN\' with header csum:0x%04x\n",
                              ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hdr->hdr_common.hdr_csum));
     }
 

ompi/mca/pml/csum/pml_csum.h

@@ -40,12 +40,6 @@
 #include "ompi/proc/proc.h"
 #include "ompi/mca/allocator/base/base.h"
 
-#if OMPI_CSUM_DEBUG
-#define OMPI_CSUM_CSUM_DEBUG(x) opal_output x
-#else
-#define OMPI_CSUM_CSUM_DEBUG(x)
-#endif
-
 BEGIN_C_DECLS
 
 /**

ompi/mca/pml/csum/pml_csum_component.c

@@ -179,7 +179,21 @@ mca_pml_csum_component_init( int* priority,
      */
 #if defined (OMPI_CSUM_DST)
     if (mca_pml_csum.enable_csum) {
-        goto SELECT_ME;
+        *priority = 100;
+
+        if(OMPI_SUCCESS != mca_bml_base_init( enable_progress_threads, 
+                                              enable_mpi_threads)) {
+            *priority = 0;
+            return NULL;
+        }
+
+        /* Set this here (vs in component_open()) because
+           ompi_mpi_leave_pinned* may have been set after MCA params were
+           read (e.g., by the openib btl) */
+        mca_pml_csum.leave_pinned = (1 == ompi_mpi_leave_pinned);
+        mca_pml_csum.leave_pinned_pipeline = (int) ompi_mpi_leave_pinned_pipeline;
+
+        return &mca_pml_csum.super;
     } else {
         *priority = 0;
         orte_show_help("help-pml-csum.txt", "pml:checksum-not-enabled", true);
@@ -189,23 +203,6 @@ mca_pml_csum_component_init( int* priority,
     *priority = 0;
     return NULL;
 #endif
-    
-SELECT_ME:
-    *priority = 100;
-
-    if(OMPI_SUCCESS != mca_bml_base_init( enable_progress_threads, 
-                                          enable_mpi_threads)) {
-        *priority = 0;
-        return NULL;
-    }
-
-    /* Set this here (vs in component_open()) because
-       ompi_mpi_leave_pinned* may have been set after MCA params were
-       read (e.g., by the openib btl) */
-    mca_pml_csum.leave_pinned = (1 == ompi_mpi_leave_pinned);
-    mca_pml_csum.leave_pinned_pipeline = (int) ompi_mpi_leave_pinned_pipeline;
-
-    return &mca_pml_csum.super;
 }
 
 int mca_pml_csum_component_fini(void)