From fc3b777ef5e66a2d2c03f0793f3774f831ebfb58 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 18 Jul 2013 17:19:13 +0000 Subject: [PATCH] Cleanup a variable that isn't used if pmi2 support is available Refs trac:3683 This commit was SVN r28841. The following Trac tickets were found above: Ticket 3683 --> https://svn.open-mpi.org/trac/ompi/ticket/3683 --- orte/mca/ess/pmi/ess_pmi_module.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/orte/mca/ess/pmi/ess_pmi_module.c b/orte/mca/ess/pmi/ess_pmi_module.c index d3edfea348..8e0febdfb5 100644 --- a/orte/mca/ess/pmi/ess_pmi_module.c +++ b/orte/mca/ess/pmi/ess_pmi_module.c @@ -79,7 +79,6 @@ orte_ess_base_module_t orte_ess_pmi_module = { }; static bool app_init_complete=false; -static int pmi_maxlen=0; /**** MODULE FUNCTIONS ****/ @@ -160,16 +159,20 @@ static int rte_init(void) goto error; } #else - /* get our PMI id length */ - if (PMI_SUCCESS != (ret = PMI_Get_id_length_max(&pmi_maxlen))) { - error = "PMI_Get_id_length_max"; - goto error; - } - pmi_id = (char*)malloc(pmi_maxlen); - if (PMI_SUCCESS != (ret = PMI_Get_kvs_domain_id(pmi_id, pmi_maxlen))) { - free(pmi_id); - error = "PMI_Get_kvs_domain_id"; - goto error; + { + int pmi_maxlen; + + /* get our PMI id length */ + if (PMI_SUCCESS != (ret = PMI_Get_id_length_max(&pmi_maxlen))) { + error = "PMI_Get_id_length_max"; + goto error; + } + pmi_id = (char*)malloc(pmi_maxlen); + if (PMI_SUCCESS != (ret = PMI_Get_kvs_domain_id(pmi_id, pmi_maxlen))) { + free(pmi_id); + error = "PMI_Get_kvs_domain_id"; + goto error; + } } #endif /* PMI is very nice to us - the domain id is an integer followed