From 8263efff65ef7922220aa0eaa4a260e4977bdae2 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 23 Jun 2017 11:12:26 -0700 Subject: [PATCH] Fix uninitialized variables Signed-off-by: Ralph Castain --- opal/mca/pmix/pmix2x/pmix2x.c | 12 ++++++++---- opal/mca/pmix/pmix2x/pmix2x_client.c | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/opal/mca/pmix/pmix2x/pmix2x.c b/opal/mca/pmix/pmix2x/pmix2x.c index d30cd1547a..2362219488 100644 --- a/opal/mca/pmix/pmix2x/pmix2x.c +++ b/opal/mca/pmix/pmix2x/pmix2x.c @@ -1256,8 +1256,10 @@ static void pmix2x_query(opal_list_t *queries, OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock); if (0 >= opal_pmix_base.initialized) { OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); - rc = OPAL_ERR_NOT_INITIALIZED; - goto CLEANUP; + if (NULL != cbfunc) { + cbfunc(OPAL_ERR_NOT_INITIALIZED, NULL, cbdata, NULL, NULL); + } + return; } OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); @@ -1323,8 +1325,10 @@ static void pmix2x_log(opal_list_t *info, OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock); if (0 >= opal_pmix_base.initialized) { OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); - rc = OPAL_ERR_NOT_INITIALIZED; - goto CLEANUP; + if (NULL != cbfunc) { + cbfunc(OPAL_ERR_NOT_INITIALIZED, cbdata); + } + return; } OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); diff --git a/opal/mca/pmix/pmix2x/pmix2x_client.c b/opal/mca/pmix/pmix2x/pmix2x_client.c index 944b44f525..0061a9874c 100644 --- a/opal/mca/pmix/pmix2x/pmix2x_client.c +++ b/opal/mca/pmix/pmix2x/pmix2x_client.c @@ -312,7 +312,7 @@ int pmix2x_fence(opal_list_t *procs, int collect_data) pmix_status_t rc; opal_namelist_t *ptr; char *nsptr; - size_t cnt, n; + size_t cnt = 0, n; pmix_proc_t *parray = NULL; pmix_info_t info, *iptr; @@ -729,7 +729,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info) pmix_pdata_t *pdata; pmix_info_t *pinfo = NULL; pmix_status_t rc; - size_t cnt, n, sz; + size_t cnt, n, sz = 0; opal_value_t *iptr; opal_pmix2x_jobid_trkr_t *jptr, *job; int ret; @@ -1000,7 +1000,7 @@ int pmix2x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid) pmix_status_t rc; pmix_info_t *info = NULL; pmix_app_t *papps; - size_t ninfo, napps, n, m; + size_t ninfo = 0, napps, n, m; opal_value_t *ival; opal_pmix_app_t *app; char nspace[PMIX_MAX_NSLEN+1];