Remove all useless assignment (now they are done inside the macro). Protect one

call to the _UNPACK macro, in the case where the length of the received data
is zero. This might happens on the PUT protocol.

This commit was SVN r10431.

ompi/mca/pml/ob1/pml_ob1_recvreq.c

@@ -474,7 +474,6 @@ void mca_pml_ob1_recv_request_progress(
 
             bytes_received -= sizeof(mca_pml_ob1_match_hdr_t);
             recvreq->req_recv.req_bytes_packed = bytes_received;
-            recvreq->req_bytes_delivered = bytes_received;
             MCA_PML_OB1_RECV_REQUEST_MATCHED(recvreq,&hdr->hdr_match);
             MCA_PML_OB1_RECV_REQUEST_UNPACK(
                 recvreq,
@@ -490,24 +489,29 @@ void mca_pml_ob1_recv_request_progress(
 
             bytes_received -= sizeof(mca_pml_ob1_rendezvous_hdr_t);
             recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length;
-            recvreq->req_bytes_delivered = hdr->hdr_rndv.hdr_msg_length;
             recvreq->req_send = hdr->hdr_rndv.hdr_src_req;
             MCA_PML_OB1_RECV_REQUEST_MATCHED(recvreq,&hdr->hdr_match);
             mca_pml_ob1_recv_request_ack(recvreq, &hdr->hdr_rndv, bytes_received);
-            MCA_PML_OB1_RECV_REQUEST_UNPACK(
+            /**
-                recvreq,
+             * The PUT protocol do not attach any data to the original request.
-                segments,
+             * Therefore, we might want to avoid unpacking if there is nothing to
-                num_segments,
+             * unpack.
-                sizeof(mca_pml_ob1_rendezvous_hdr_t),
+             */
-                data_offset,
+            if( 0 < bytes_received ) {
-                bytes_received,
+                MCA_PML_OB1_RECV_REQUEST_UNPACK(
-                bytes_delivered);
+                    recvreq,
+                    segments,
+                    num_segments,
+                    sizeof(mca_pml_ob1_rendezvous_hdr_t),
+                    data_offset,
+                    bytes_received,
+                    bytes_delivered);
+            }
             break;
 
         case MCA_PML_OB1_HDR_TYPE_RGET:
 
             recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length;
-            recvreq->req_bytes_delivered = hdr->hdr_rndv.hdr_msg_length;
             MCA_PML_OB1_RECV_REQUEST_MATCHED(recvreq,&hdr->hdr_match);
             mca_pml_ob1_recv_request_rget(recvreq, btl, &hdr->hdr_rget);
             return;