From a4245b8d635f5aa724a612d25732867003aebc3c Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Sat, 27 Aug 2011 00:15:34 +0000
Subject: [PATCH] Remove some warnings related to the resilience patch.

This commit was SVN r25097.
---
 orte/mca/errmgr/hnp/errmgr_hnp.c         | 18 ++++++++----------
 orte/mca/plm/base/plm_base_rsh_support.c |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/orte/mca/errmgr/hnp/errmgr_hnp.c b/orte/mca/errmgr/hnp/errmgr_hnp.c
index 69035c0d6b..4f36147a6a 100644
--- a/orte/mca/errmgr/hnp/errmgr_hnp.c
+++ b/orte/mca/errmgr/hnp/errmgr_hnp.c
@@ -1908,6 +1908,7 @@ static orte_odls_child_t* proc_is_local(orte_process_name_t *proc)
     return NULL;
 }
 
+#if ORTE_RESIL_ORTE
 static void cbfunc(int status,
                    orte_process_name_t *peer,
                    opal_buffer_t *buffer,
@@ -1915,15 +1916,13 @@ static void cbfunc(int status,
                    void* cbdata) {
     OBJ_RELEASE(buffer);
 }
+#endif
 
 int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) {
     orte_job_t *jdat;
-    orte_proc_t *pdat;
-    opal_buffer_t *buffer;
-    int i, rc, num_failed;
+    orte_proc_t *pdat, *proc_item;
+    int i;
     opal_pointer_array_t *dead_names;
-    orte_process_name_t *name_item;
-    orte_proc_t *proc_item;
 
     OPAL_OUTPUT_VERBOSE((2, orte_errmgr_base.output,
                          "%s RECORDING DEAD PROCESS %s",
@@ -1966,9 +1965,8 @@ int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) {
              * Send a message to the other daemons so they know that a daemon has
              * died.
              */
-            buffer = OBJ_NEW(opal_buffer_t);
-
-            num_failed = opal_pointer_array_get_size(dead_names);
+            int rc, num_failed = opal_pointer_array_get_size(dead_names);
+            opal_buffer_t* buffer = OBJ_NEW(opal_buffer_t);
 
             if (ORTE_SUCCESS != (rc = opal_dss.pack(buffer, &num_failed, 1, ORTE_VPID))) {
                 ORTE_ERROR_LOG(rc);
@@ -1980,8 +1978,8 @@ int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) {
                  * ORTEDs and they can inform the appropriate applications.
                  */
                 for (i = 0; i < num_failed; i++) {
-                    if (NULL != (name_item = (orte_process_name_t *) opal_pointer_array_get_item(dead_names, i))) {
-                        if (ORTE_SUCCESS != (rc = opal_dss.pack(buffer, name_item, 1, ORTE_NAME))) {
+                    if (NULL != (proc_item = (orte_process_name_t *) opal_pointer_array_get_item(dead_names, i))) {
+                        if (ORTE_SUCCESS != (rc = opal_dss.pack(buffer, proc_item, 1, ORTE_NAME))) {
                             ORTE_ERROR_LOG(rc);
                             OBJ_RELEASE(buffer);
                         }
diff --git a/orte/mca/plm/base/plm_base_rsh_support.c b/orte/mca/plm/base/plm_base_rsh_support.c
index b3101a4066..1ab8c9924f 100644
--- a/orte/mca/plm/base/plm_base_rsh_support.c
+++ b/orte/mca/plm/base/plm_base_rsh_support.c
@@ -1529,8 +1529,8 @@ int orte_plm_base_append_bootproxy_args(orte_app_context_t *app, char ***argv,
     int i;
 #if ORTE_ENABLE_EPOCH
     orte_epoch_t epoch;
-#endif
     orte_process_name_t proc;
+#endif
     
     /* if a prefix is set, pass it to the bootproxy in a special way */
     if (NULL != app->prefix_dir) {