From 1941f6b3b12ba9d79ea7bbcf96c76cf6e3d7b276 Mon Sep 17 00:00:00 2001
From: Josh Hursey <jjhursey@open-mpi.org>
Date: Wed, 4 Apr 2012 20:40:16 +0000
Subject: [PATCH] Cleanup some compiler warnings when doing an
 optimized/non-debug build.

This commit was SVN r26236.
---
 ompi/class/ompi_free_list.c | 2 +-
 opal/runtime/opal_params.c  | 2 ++
 orte/util/nidmap.c          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ompi/class/ompi_free_list.c b/ompi/class/ompi_free_list.c
index 67ad7d4880..909e1a5556 100644
--- a/ompi/class/ompi_free_list.c
+++ b/ompi/class/ompi_free_list.c
@@ -170,7 +170,7 @@ int ompi_free_list_init_ex_new(
 
 int ompi_free_list_grow(ompi_free_list_t* flist, size_t num_elements)
 {
-    unsigned char *ptr, *mpool_alloc_ptr = NULL, *payload_ptr;
+    unsigned char *ptr, *mpool_alloc_ptr = NULL, *payload_ptr = NULL;
     ompi_free_list_memory_t *alloc_ptr;
     size_t i, alloc_size, head_size, elem_size = 0;
     mca_mpool_base_registration_t *reg = NULL;
diff --git a/opal/runtime/opal_params.c b/opal/runtime/opal_params.c
index b4622dd460..5811c6c280 100644
--- a/opal/runtime/opal_params.c
+++ b/opal/runtime/opal_params.c
@@ -41,7 +41,9 @@
 int opal_register_params(void)
 {
     int ret;
+#if OPAL_ENABLE_DEBUG
     int value;
+#endif /* OPAL_ENABLE_DEBUG */
 
     /*
      * This string is going to be used in opal/util/stacktrace.c
diff --git a/orte/util/nidmap.c b/orte/util/nidmap.c
index 6874c722d8..cbffb95346 100644
--- a/orte/util/nidmap.c
+++ b/orte/util/nidmap.c
@@ -647,7 +647,7 @@ int orte_util_decode_pidmap(opal_byte_object_t *bo)
     orte_jobid_t jobid;
     orte_vpid_t i, num_procs;
     orte_pmap_t *pmap;
-    int32_t *nodes=NULL, my_node;
+    int32_t *nodes=NULL, my_node = 0;
     orte_local_rank_t *local_rank=NULL;
     orte_node_rank_t *node_rank=NULL;
 #if OPAL_HAVE_HWLOC