From 61d331d5b59a17099593a3630f6ba283b0a2be06 Mon Sep 17 00:00:00 2001
From: Nathan Hjelm <hjelmn@lanl.gov>
Date: Mon, 22 Jul 2013 17:52:39 +0000
Subject: [PATCH] MCA/base: fix some warnings and an error in the MCA variable
 system

This commit was SVN r28909.
---
 opal/mca/base/mca_base_var.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/opal/mca/base/mca_base_var.c b/opal/mca/base/mca_base_var.c
index f31a2f233d..7d1ef7cf2b 100644
--- a/opal/mca/base/mca_base_var.c
+++ b/opal/mca/base/mca_base_var.c
@@ -107,6 +107,7 @@ const char *var_source_names[] = {
     "command line",
     "environment",
     "file",
+    "set",
     "override"
 };
 
@@ -568,7 +569,7 @@ static int int_from_string(const char *src, mca_base_var_enum_t *enumerator, uin
 static int var_set_from_string (mca_base_var_t *var, char *src)
 {
     mca_base_var_storage_t *dst = var->mbv_storage;
-    uint64_t int_value;
+    uint64_t int_value = 0;
     int ret;
 
     switch (var->mbv_type) {
@@ -1645,7 +1646,7 @@ static char *source_name(mca_base_var_t *var)
 {
     char *ret;
 
-    if (MCA_BASE_VAR_SOURCE_FILE == var->mbv_source) {
+    if (MCA_BASE_VAR_SOURCE_FILE == var->mbv_source || MCA_BASE_VAR_SOURCE_OVERRIDE == var->mbv_source) {
         int rc = asprintf(&ret, "file (%s)", var->mbv_source_file);
         /* some compilers will warn if the return code of asprintf is not checked (even if it is cast to void) */
         if (0 > rc) {
@@ -1758,7 +1759,7 @@ int mca_base_var_dump(int index, char ***out, mca_base_var_dump_type_t output_ty
     const char *framework, *component, *full_name;
     int i, line_count, line = 0, enum_count = 0;
     char *value_string, *source_string, *tmp;
-    int synonym_count, ret, *synonyms;
+    int synonym_count, ret, *synonyms = NULL;
     mca_base_var_t *var, *original;
     mca_base_var_group_t *group;