From 92290b94e0584271d6459a6ab5923a04125e23be Mon Sep 17 00:00:00 2001 From: Thananon Patinyasakdikul Date: Wed, 6 Apr 2016 14:26:04 -0400 Subject: [PATCH] Fixed Coverity reports 1358014-1358018 (DEADCODE and CHECK_RETURN) --- ompi/mca/pml/ob1/pml_ob1_recvreq.c | 2 +- opal/mca/btl/tcp/btl_tcp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c index 9d1d402e16..a912bc37be 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c @@ -106,7 +106,7 @@ static int mca_pml_ob1_recv_request_cancel(struct ompi_request_t* ompi_request, /* The rest should be protected behind the match logic lock */ OB1_MATCHING_LOCK(&ob1_comm->matching_lock); if( true == request->req_match_received ) { /* way to late to cancel this one */ - OPAL_THREAD_UNLOCK(&ob1_comm->matching_lock); + OB1_MATCHING_LOCK(&ob1_comm->matching_lock); assert( OMPI_ANY_TAG != ompi_request->req_status.MPI_TAG ); /* not matched isn't it */ return OMPI_SUCCESS; } diff --git a/opal/mca/btl/tcp/btl_tcp.h b/opal/mca/btl/tcp/btl_tcp.h index f2c8917b58..7e9d726135 100644 --- a/opal/mca/btl/tcp/btl_tcp.h +++ b/opal/mca/btl/tcp/btl_tcp.h @@ -96,7 +96,7 @@ extern int mca_btl_tcp_progress_thread_trigger; do { \ if(0 < mca_btl_tcp_progress_thread_trigger) { \ opal_event_t* _event = (opal_event_t*)(event); \ - opal_fd_write( mca_btl_tcp_pipe_to_progress[1], sizeof(opal_event_t*), \ + (void) opal_fd_write( mca_btl_tcp_pipe_to_progress[1], sizeof(opal_event_t*), \ &_event); \ } \ else { \