diff --git a/src/mca/ns/replica/src/ns_replica_component.c b/src/mca/ns/replica/src/ns_replica_component.c index 1687aeddf1..100b6f87d4 100644 --- a/src/mca/ns/replica/src/ns_replica_component.c +++ b/src/mca/ns/replica/src/ns_replica_component.c @@ -197,25 +197,25 @@ void mca_ns_replica_recv(int status, ompi_process_name_t* sender, } if (MCA_NS_CREATE_CELLID_CMD == command) { /* got a command to create a cellid */ - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { goto RETURN_ERROR; } cell = ompi_name_server.create_cellid(); - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&cell, 1, MCA_NS_OOB_PACK_CELLID)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&cell, 1, MCA_NS_OOB_PACK_CELLID)) { goto RETURN_ERROR; } - if (0 > mca_oob_send_packed(sender, answer, *tag, 0)) { + if (0 > mca_oob_send_packed(sender, *answer, *tag, 0)) { /* RHC -- not sure what to do if the return send fails */ } } else if (MCA_NS_CREATE_JOBID_CMD == command) { /* got command to create jobid */ - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { goto RETURN_ERROR; } job = ompi_name_server.create_jobid(); - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&job, 1, MCA_NS_OOB_PACK_JOBID)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&job, 1, MCA_NS_OOB_PACK_JOBID)) { goto RETURN_ERROR; } - if (0 > mca_oob_send_packed(sender, answer, *tag, 0)) { + if (0 > mca_oob_send_packed(sender, *answer, *tag, 0)) { /* RHC -- not sure what to do if the return send fails */ } } else if (MCA_NS_RESERVE_RANGE_CMD == command) { /* got command to reserve vpid range */ @@ -228,14 +228,14 @@ void mca_ns_replica_recv(int status, ompi_process_name_t* sender, } vpid = ompi_name_server.reserve_range(job, range); - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD)) { goto RETURN_ERROR; } - if (OMPI_SUCCESS != ompi_pack(answer, (void*)&vpid, 1, MCA_NS_OOB_PACK_VPID)) { + if (OMPI_SUCCESS != ompi_pack(*answer, (void*)&vpid, 1, MCA_NS_OOB_PACK_VPID)) { goto RETURN_ERROR; } - if (0 > mca_oob_send_packed(sender, answer, *tag, 0)) { + if (0 > mca_oob_send_packed(sender, *answer, *tag, 0)) { /* RHC -- not sure what to do if the return send fails */ } } else { /* got an unrecognized command */ @@ -243,8 +243,8 @@ void mca_ns_replica_recv(int status, ompi_process_name_t* sender, ompi_buffer_free(*buffer); ompi_buffer_init(error_answer, 0); command = MCA_NS_ERROR; - ompi_pack(error_answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD); - mca_oob_send_packed(sender, error_answer, *tag, 0); + ompi_pack(*error_answer, (void*)&command, 1, MCA_NS_OOB_PACK_CMD); + mca_oob_send_packed(sender, *error_answer, *tag, 0); } ompi_buffer_free(*buffer);