Fix compile errors and warnings from changeset 29052.

This commit was SVN r29054.

ompi/mca/btl/openib/btl_openib.c

@@ -491,7 +491,7 @@ static int mca_btl_openib_tune_endpoint(mca_btl_openib_module_t* openib_btl,
                        (openib_btl->device->ib_dev_attr).vendor_part_id,
                        mca_btl_openib_transport_name_strings[mca_btl_openib_get_transport_type(openib_btl)],
                        (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
-                       "unknown" : NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname,
+                       "unknown" : endpoint->endpoint_proc->proc_ompi->proc_hostname,
                        endpoint->rem_info.rem_vendor_id,
                        endpoint->rem_info.rem_vendor_part_id,
                        mca_btl_openib_transport_name_strings[endpoint->rem_info.rem_transport_type]);
@@ -554,7 +554,7 @@ static int mca_btl_openib_tune_endpoint(mca_btl_openib_module_t* openib_btl,
                                (openib_btl->device->ib_dev_attr).vendor_part_id,
                                mca_btl_openib_component.receive_queues,
                                (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
-                               "unknown", endpoint->endpoint_proc->proc_ompi->proc_hostname,
+                               "unknown": endpoint->endpoint_proc->proc_ompi->proc_hostname,
                                endpoint->rem_info.rem_vendor_id,
                                endpoint->rem_info.rem_vendor_part_id,
                                recv_qps);
@@ -577,7 +577,7 @@ static int mca_btl_openib_tune_endpoint(mca_btl_openib_module_t* openib_btl,
                                (openib_btl->device->ib_dev_attr).vendor_part_id,
                                mca_btl_openib_component.receive_queues,
                                (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
-                               "unknown", endpoint->endpoint_proc->proc_ompi->proc_hostname,
+                               "unknown": endpoint->endpoint_proc->proc_ompi->proc_hostname,
                                endpoint->rem_info.rem_vendor_id,
                                endpoint->rem_info.rem_vendor_part_id,
                                values.receive_queues);

ompi/mca/btl/openib/btl_openib_component.c

@@ -3532,10 +3532,12 @@ error:
 
     if (IBV_WC_RNR_RETRY_EXC_ERR == wc->status ||
         IBV_WC_RETRY_EXC_ERR == wc->status) {
-        const char *peer_hostname =
+        const char *peer_hostname;
-            (NULL != endpoint->endpoint_proc->proc_ompi) ?
+        if (endpoint->endpoint_proc->proc_ompi && endpoint->endpoint_proc->proc_ompi->proc_hostname) {
-            endpoint->endpoint_proc->proc_ompi) :
+            peer_hostname = endpoint->endpoint_proc->proc_ompi->proc_hostname;
-            "<unknown -- please run with mpi_keep_peer_hostnames=1>";
+        } else {
+            peer_hostname = "<unknown -- please run with mpi_keep_peer_hostnames=1>";
+        }
         const char *device_name =
             ibv_get_device_name(endpoint->qps[qp].qp->lcl_qp->context->device);
 
@@ -3545,15 +3547,12 @@ error:
                            "pp rnr retry exceeded" :
                            "srq rnr retry exceeded", true,
                            ompi_process_info.nodename, device_name,
-                           (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
+                           peer_hostname);
-                           "unknown" : endpoint->endpoint_proc->proc_ompi->proc_hostname);
         } else if (IBV_WC_RETRY_EXC_ERR == wc->status) {
             opal_show_help("help-mpi-btl-openib.txt",
                            "pp retry exceeded", true,
                            ompi_process_info.nodename,
-                           device_name,
+                           device_name, peer_hostname);
-                           (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
-                           "unknown" : endpoint->endpoint_proc->proc_ompi->proc_hostname);
         }
     }
 

ompi/mca/btl/openib/btl_openib_endpoint.c

@@ -616,7 +616,8 @@ void mca_btl_openib_endpoint_cpc_complete(mca_btl_openib_endpoint_t *endpoint)
         }
 
         OPAL_OUTPUT((-1, "cpc_complete to %s -- done",
-                     ompi_proc_get_hostname(endpoint->endpoint_proc->proc_ompi)));
+                     (NULL == endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
+                     "unknown" : endpoint->endpoint_proc->proc_ompi->proc_hostname));
         return;
     }
 

ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c

@@ -1499,7 +1499,7 @@ static void *show_help_rdmacm_event_error(void *c)
                        device,
                        rdma_event_str(event->event),
                        (NULL == context->endpoint->endpoint_proc->proc_ompi->proc_hostname) ?
-                       "unknown" : context->endpoint->endpoint_proc->proc_ompi->proc_hostname));
+                       "unknown" : context->endpoint->endpoint_proc->proc_ompi->proc_hostname);
     }
 
     return NULL;