Skip to content

Commit ce7a183

Browse files
author
Ralph Castain
committed
Fix uninitialized variables
Signed-off-by: Ralph Castain <[email protected]> (cherry picked from commit 8263eff)
1 parent a35cd6e commit ce7a183

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

opal/mca/pmix/pmix2x/pmix2x.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,8 +1256,10 @@ static void pmix2x_query(opal_list_t *queries,
12561256
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
12571257
if (0 >= opal_pmix_base.initialized) {
12581258
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
1259-
rc = OPAL_ERR_NOT_INITIALIZED;
1260-
goto CLEANUP;
1259+
if (NULL != cbfunc) {
1260+
cbfunc(OPAL_ERR_NOT_INITIALIZED, NULL, cbdata, NULL, NULL);
1261+
}
1262+
return;
12611263
}
12621264
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
12631265

@@ -1323,8 +1325,10 @@ static void pmix2x_log(opal_list_t *info,
13231325
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
13241326
if (0 >= opal_pmix_base.initialized) {
13251327
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
1326-
rc = OPAL_ERR_NOT_INITIALIZED;
1327-
goto CLEANUP;
1328+
if (NULL != cbfunc) {
1329+
cbfunc(OPAL_ERR_NOT_INITIALIZED, cbdata);
1330+
}
1331+
return;
13281332
}
13291333
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
13301334

opal/mca/pmix/pmix2x/pmix2x_client.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ int pmix2x_fence(opal_list_t *procs, int collect_data)
312312
pmix_status_t rc;
313313
opal_namelist_t *ptr;
314314
char *nsptr;
315-
size_t cnt, n;
315+
size_t cnt = 0, n;
316316
pmix_proc_t *parray = NULL;
317317
pmix_info_t info, *iptr;
318318

@@ -725,7 +725,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
725725
pmix_pdata_t *pdata;
726726
pmix_info_t *pinfo = NULL;
727727
pmix_status_t rc;
728-
size_t cnt, n, sz;
728+
size_t cnt, n, sz = 0;
729729
opal_value_t *iptr;
730730
opal_pmix2x_jobid_trkr_t *jptr, *job;
731731

@@ -993,7 +993,7 @@ int pmix2x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
993993
pmix_status_t rc;
994994
pmix_info_t *info = NULL;
995995
pmix_app_t *papps;
996-
size_t ninfo, napps, n, m;
996+
size_t ninfo = 0, napps, n, m;
997997
opal_value_t *ival;
998998
opal_pmix_app_t *app;
999999
char nspace[PMIX_MAX_NSLEN+1];

0 commit comments

Comments
 (0)