Fix some misc gcc warnings.

Signed-off-by: Austen Lauria <awlauria@us.ibm.com>

Author: awlauria

ompi/datatype/ompi_datatype_module.c

@@ -544,6 +544,9 @@ int32_t ompi_datatype_init( void )
 #define MOOG(name, index)                                               \
     do {                                                                \
         int rc;                                                         \
+         /* Silence 'unused' compiler warning in optimized builds,      \
+            where assert() is removed. */                               \
+        (void) rc;                                                      \
         ompi_mpi_##name.dt.d_f_to_c_index = index;                      \
         rc = opal_pointer_array_set_item(&ompi_datatype_f_to_c_table,   \
                                          index, &ompi_mpi_##name);      \

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -916,7 +916,6 @@ static int ompi_osc_rdma_query_alternate_btls (ompi_communicator_t *comm, ompi_o
     mca_btl_base_selected_module_t *item;
     char **btls_to_use = opal_argv_split (ompi_osc_rdma_btl_alternate_names, ',');
     int btls_found = 0;
-    void *tmp;
 
     btls_to_use = opal_argv_split (ompi_osc_rdma_btl_alternate_names, ',');
     if (NULL == btls_to_use) {

ompi/mca/osc/rdma/osc_rdma_peer.c

@@ -79,7 +79,6 @@ int ompi_osc_rdma_new_peer (struct ompi_osc_rdma_module_t *module, int peer_id,
     struct mca_btl_base_endpoint_t *endpoint;
     ompi_osc_rdma_peer_t *peer;
     uint8_t module_btl_index = UINT8_MAX;
-    mca_btl_base_module_t *btl = NULL;
 
     *peer_out = NULL;
 
@@ -90,10 +89,6 @@ int ompi_osc_rdma_new_peer (struct ompi_osc_rdma_module_t *module, int peer_id,
         return ret;
     }
 
-    if (endpoint) {
-        btl = ompi_osc_rdma_selected_btl (module, module_btl_index);
-    }
-
     if (MPI_WIN_FLAVOR_DYNAMIC == module->flavor) {
         peer = (ompi_osc_rdma_peer_t *) OBJ_NEW(ompi_osc_rdma_peer_dynamic_t);
     } else if (module->same_size && module->same_disp_unit) {
@@ -127,7 +122,6 @@ static int ompi_osc_rdma_peer_setup (ompi_osc_rdma_module_t *module, ompi_osc_rd
     ompi_osc_rdma_peer_extended_t *ex_peer = (ompi_osc_rdma_peer_extended_t *) peer;
     uint64_t peer_data_size;
     uint64_t peer_data_offset, array_pointer;
-    mca_btl_base_module_t *array_btl;
     struct mca_btl_base_endpoint_t *array_endpoint;
     ompi_osc_rdma_region_t *array_peer_data, *node_peer_data;
     ompi_osc_rdma_rank_data_t rank_data;

opal/mca/btl/base/btl_base_am_rdma.c

@@ -421,8 +421,6 @@ static void mca_btl_base_am_descriptor_complete(mca_btl_base_module_t *btl,
                                                 struct mca_btl_base_endpoint_t *endpoint,
                                                 mca_btl_base_descriptor_t *descriptor, int status)
 {
-    mca_btl_base_rdma_context_t *context = (mca_btl_base_rdma_context_t *) descriptor->des_context;
-
     (void) mca_btl_base_am_rdma_advance(btl, endpoint,
                                         (mca_btl_base_rdma_context_t *) descriptor->des_context,
                                         /*send_descriptor=*/false);
@@ -454,39 +452,37 @@ mca_btl_base_rdma_start(mca_btl_base_module_t *btl, struct mca_btl_base_endpoint
     context->local_handle = local_handle;
     context->total_size = size;
 
-    size_t send_size = 0;
-    size_t recv_size = 0;
     bool use_rdma = false;
 
     if (MCA_BTL_BASE_AM_PUT == type) {
         if (sizeof(*hdr) + size <= btl->btl_eager_limit) {
             /* just go ahead and send the data */
-            send_size = size;
+            packet_size += size;
         } else if (!mca_btl_base_rdma_use_rdma_get(btl)) {
-            send_size = size_t_min(size, btl->btl_max_send_size - sizeof(*hdr));
+            packet_size += size;
+        } else if (!mca_btl_base_rdma_use_rdma_get (btl)) {
+            packet_size += size_t_min (size, btl->btl_max_send_size - sizeof (*hdr));
         } else {
             use_rdma = true;
         }
     } else if (MCA_BTL_BASE_AM_GET == type) {
         if (sizeof(mca_btl_base_rdma_response_hdr_t) + size <= btl->btl_eager_limit) {
-            recv_size = size;
+            packet_size += size;
         } else if (!mca_btl_base_rdma_use_rdma_put(btl)) {
-            recv_size = size_t_min(size, btl->btl_max_send_size
+            packet_size += size_t_min(size, btl->btl_max_send_size
                                              - sizeof(mca_btl_base_rdma_response_hdr_t));
         } else {
             use_rdma = true;
         }
     } else {
         /* fetching atomic. always recv result via active message */
-        recv_size = size;
+        packet_size += size;
     }
 
     if (use_rdma && btl->btl_register_mem) {
         packet_size += 2 * btl->btl_registration_handle_size;
     }
 
-    packet_size += send_size;
-
     BTL_VERBOSE(("Initiating RDMA operation. context=%p, size=%" PRIsize_t
                  ", packet_size=%" PRIsize_t,
                  context, size, packet_size));
@@ -727,9 +723,8 @@ static int mca_btl_base_am_rdma_target_put(mca_btl_base_module_t *btl,
 
 static void mca_btl_base_rdma_retry_operation(mca_btl_base_rdma_operation_t *operation)
 {
-    mca_btl_base_module_t *btl = operation->btl;
     void *target_address = (void *) (intptr_t) operation->hdr.target_address;
-    int ret;
+    int ret = OPAL_SUCCESS;
 
     if (!operation->descriptor && !operation->is_completed) {
         switch (operation->hdr.type) {
@@ -797,6 +792,8 @@ static int mca_btl_base_am_rdma_progress(void)
             }
         }
     }));
+
+    return 0;
 }
 
 static int mca_btl_base_am_atomic_64(int64_t *operand, opal_atomic_int64_t *addr,
@@ -958,7 +955,6 @@ static void mca_btl_base_am_process_atomic(mca_btl_base_module_t *btl,
 
     const mca_btl_base_rdma_hdr_t *hdr = (mca_btl_base_rdma_hdr_t *) desc->des_segments[0]
                                              .seg_addr.pval;
-    void *target_address = (void *) (intptr_t) hdr->target_address;
     uint64_t atomic_response = hdr->data.atomic.operand[0];
 
     if (4 != hdr->data.atomic.size && 8 != hdr->data.atomic.size) {
@@ -969,7 +965,7 @@ static void mca_btl_base_am_process_atomic(mca_btl_base_module_t *btl,
     BTL_VERBOSE(("got active-message atomic request. hdr->context=0x%" PRIx64
                  ", target_address=%p, "
                  "segment 0 size=%" PRIu64,
-                 hdr->context, target_address, desc->des_segments[0].seg_len));
+                 hdr->context, (void *)(intptr_t)hdr->target_address, desc->des_segments[0].seg_len));
 
     switch (hdr->type) {
     case MCA_BTL_BASE_AM_ATOMIC: