1
1

grpcomm_rcd: fix minor compiler warning (rc used before set)

Also check for OBJ_NEW returning NULL.
Этот коммит содержится в:
Jeff Squyres 2015-02-23 09:03:07 -08:00
родитель c7d8563d8d
Коммит 600858609e

Просмотреть файл

@ -2,7 +2,7 @@
/* /*
* Copyright (c) 2007 The Trustees of Indiana University. * Copyright (c) 2007 The Trustees of Indiana University.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
* rights reserved. * rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
@ -318,21 +318,25 @@ static int rcd_finalize_coll(orte_grpcomm_coll_t *coll, int ret) {
"%s grpcomm:coll:recdub declared collective complete", "%s grpcomm:coll:recdub declared collective complete",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
reply = OBJ_NEW(opal_buffer_t);
/* pack the number of procs involved in the collective /* pack the number of procs involved in the collective
* so the recipients can unpack any collected data */ * so the recipients can unpack any collected data */
if (1 == coll->sig->sz) { if (1 == coll->sig->sz) {
/* get the job object for this entry */ /* get the job object for this entry */
if (NULL == (jdata = orte_get_job_data_object(coll->sig->signature[0].jobid))) { if (NULL == (jdata = orte_get_job_data_object(coll->sig->signature[0].jobid))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(ORTE_ERROR);
OBJ_RELEASE(reply); return ORTE_ERROR;
return rc;
} }
nprocs = jdata->num_procs; nprocs = jdata->num_procs;
} else { } else {
nprocs = coll->sig->sz; nprocs = coll->sig->sz;
} }
reply = OBJ_NEW(opal_buffer_t);
if (NULL == reply) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
if (OPAL_SUCCESS != (rc = opal_dss.pack(reply, &nprocs, 1, OPAL_UINT64))) { if (OPAL_SUCCESS != (rc = opal_dss.pack(reply, &nprocs, 1, OPAL_UINT64))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
OBJ_RELEASE(reply); OBJ_RELEASE(reply);