Some minor uninitialized variable cleanups

This commit was SVN r32629.

opal/mca/pmix/native/usock_sendrecv.c

@@ -414,20 +414,20 @@ void pmix_usock_recv_handler(int sd, short flags, void *cbdata)
                 /* post it for delivery */
                 PMIX_ACTIVATE_POST_MSG(mca_pmix_native_component.recv_msg);
                 mca_pmix_native_component.recv_msg = NULL;
+            } else if (OPAL_ERR_RESOURCE_BUSY == rc ||
+                       OPAL_ERR_WOULD_BLOCK == rc) {
+                /* exit this event and let the event lib progress */
+                return;
+            } else {
+                // report the error
+                opal_output(0, "%s usock_peer_recv_handler: unable to recv message",
+                            OPAL_NAME_PRINT(OPAL_PROC_MY_NAME));
+                /* turn off the recv event */
+                opal_event_del(&mca_pmix_native_component.recv_event);
+                mca_pmix_native_component.recv_ev_active = false;
+                CLOSE_THE_SOCKET(mca_pmix_native_component.sd);
+                return;
             }
-        } else if (OPAL_ERR_RESOURCE_BUSY == rc ||
-                   OPAL_ERR_WOULD_BLOCK == rc) {
-            /* exit this event and let the event lib progress */
-            return;
-        } else {
-            // report the error
-            opal_output(0, "%s usock_peer_recv_handler: unable to recv message",
-                        OPAL_NAME_PRINT(OPAL_PROC_MY_NAME));
-            /* turn off the recv event */
-            opal_event_del(&mca_pmix_native_component.recv_event);
-            mca_pmix_native_component.recv_ev_active = false;
-            CLOSE_THE_SOCKET(mca_pmix_native_component.sd);
-            return;
         }
         break;
     default: 

orte/mca/ras/slurm/ras_slurm_module.c

@@ -809,7 +809,13 @@ static void recv_data(int fd, short args, void *cbdata)
             ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_ALLOC_FAILED);
             return;
         }
-        if (idx < 0 || NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, idx))) {
+        if (idx < 0) {
+            orte_show_help("help-ras-slurm.txt", "slurm-dyn-alloc-failed", true, jtrk->cmd);
+            ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_ALLOC_FAILED);
+            opal_argv_free(alloc);
+            return;
+        }
+        if (NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, idx))) {
             orte_show_help("help-ras-slurm.txt", "slurm-dyn-alloc-failed", true, jtrk->cmd);
             ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_ALLOC_FAILED);
             opal_argv_free(alloc);

orte/orted/pmix/pmix_server_sendrecv.c

@@ -1304,22 +1304,22 @@ void pmix_server_recv_handler(int sd, short flags, void *cbdata)
                                     peer->recv_msg->hdr.tag);
                 /* process the message */
                 process_message(peer);
+            } else if (ORTE_ERR_RESOURCE_BUSY == rc ||
+                       ORTE_ERR_WOULD_BLOCK == rc) {
+                /* exit this event and let the event lib progress */
+                return;
+            } else {
+                // report the error
+                opal_output(0, "%s-%s pmix_server_peer_recv_handler: unable to recv message",
+                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
+                            ORTE_NAME_PRINT(&(peer->name)));
+                /* turn off the recv event */
+                opal_event_del(&peer->recv_event);
+                peer->recv_ev_active = false;
+                peer->state = PMIX_SERVER_CLOSED;
+                CLOSE_THE_SOCKET(peer->sd);
+                return;
             }
-        } else if (ORTE_ERR_RESOURCE_BUSY == rc ||
-                   ORTE_ERR_WOULD_BLOCK == rc) {
-            /* exit this event and let the event lib progress */
-            return;
-        } else {
-            // report the error
-            opal_output(0, "%s-%s pmix_server_peer_recv_handler: unable to recv message",
-                        ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
-                        ORTE_NAME_PRINT(&(peer->name)));
-            /* turn off the recv event */
-            opal_event_del(&peer->recv_event);
-            peer->recv_ev_active = false;
-            peer->state = PMIX_SERVER_CLOSED;
-            CLOSE_THE_SOCKET(peer->sd);
-            return;
         }
         break;
     default: