Skip to content

Commit 3e78f84

Browse files
author
Ralph Castain
committed
Silence Coverity warnings
Signed-off-by: Ralph Castain <[email protected]>
1 parent 0f54799 commit 3e78f84

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

opal/mca/pmix/pmix2x/pmix2x_client.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ int pmix2x_get(const opal_process_name_t *proc, const char *key,
456456
size_t sz = 0, n;
457457
opal_value_t *ival;
458458
pmix_value_t *pval = NULL;
459+
int ret;
459460

460461
opal_output_verbose(1, opal_pmix_base_framework.framework_output,
461462
"%s pmix2x:client get on proc %s key %s",
@@ -517,8 +518,11 @@ int pmix2x_get(const opal_process_name_t *proc, const char *key,
517518
rc = PMIx_Get(&p, key, pinfo, sz, &pval);
518519
if (PMIX_SUCCESS == rc) {
519520
ival = OBJ_NEW(opal_value_t);
520-
pmix2x_value_unload(ival, pval);
521-
*val = ival;
521+
if (OPAL_SUCCESS != (ret = pmix2x_value_unload(ival, pval))) {
522+
rc = pmix2x_convert_opalrc(ret);
523+
} else {
524+
*val = ival;
525+
}
522526
PMIX_VALUE_FREE(pval, 1);
523527
}
524528
PMIX_INFO_FREE(pinfo, sz);
@@ -728,6 +732,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
728732
size_t cnt, n, sz;
729733
opal_value_t *iptr;
730734
opal_pmix2x_jobid_trkr_t *jptr, *job;
735+
int ret;
731736

732737
opal_output_verbose(1, opal_pmix_base_framework.framework_output,
733738
"pmix2x:client lookup");
@@ -792,7 +797,9 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
792797
opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super);
793798
}
794799
d->proc.vpid = pmix2x_convert_rank(pdata[n].proc.rank);
795-
pmix2x_value_unload(&d->value, &pdata[n].value);
800+
if (OPAL_SUCCESS != (ret = pmix2x_value_unload(&d->value, &pdata[n].value))) {
801+
OPAL_ERROR_LOG(ret);
802+
}
796803
}
797804
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
798805
}
@@ -1069,7 +1076,7 @@ static void spcbfunc(pmix_status_t status,
10691076
{
10701077
pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata;
10711078
opal_pmix2x_jobid_trkr_t *job;
1072-
opal_jobid_t jobid;
1079+
opal_jobid_t jobid = OPAL_JOBID_INVALID;
10731080
int rc;
10741081

10751082
OPAL_ACQUIRE_OBJECT(op);

opal/mca/pmix/pmix2x/pmix2x_server_north.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ static pmix_status_t server_query(pmix_proc_t *proct,
980980

981981
/* convert the queries */
982982
for (n=0; n < nqueries; n++) {
983-
q = OBJ_NEW(opal_pmix_query_t);
983+
q = OBJ_NEW(opal_pmix_query_t);
984984
/* we "borrow" the info field of the caddy as we and the
985985
* server function both agree on what will be there */
986986
opal_list_append(&opalcaddy->info, &q->super);
@@ -1027,7 +1027,9 @@ static void toolcbfunc(int status,
10271027
job = OBJ_NEW(opal_pmix2x_jobid_trkr_t);
10281028
(void)strncpy(job->nspace, p.nspace, PMIX_MAX_NSLEN);
10291029
job->jobid = proc.jobid;
1030+
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
10301031
opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super);
1032+
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
10311033
}
10321034

10331035
/* pass it down */

0 commit comments

Comments
 (0)