MPI_Unpack: fix return status

ggouaillardet · ggouaillardet · commit 3f6f698ca707 · 2017-03-02T09:25:00.000+09:00
this regression was previously introduced in 221e6e2 (back-ported from commit f2e33c7) Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c
@@ -99,12 +99,10 @@ int MPI_Unpack(const void *inbuf, int insize, int *position,
         rc = opal_convertor_unpack( &local_convertor, &outvec, &iov_count, &size );
         *position += size;
         OBJ_DESTRUCT( &local_convertor );
-
-        /* All done.  Note that the convertor returns 1 upon success, not
-           OMPI_SUCCESS. */
-        rc = (1 == rc) ? OMPI_SUCCESS : OMPI_ERROR;
     }
 
+    /* All done.  Note that the convertor returns 1 upon success, not
+       OMPI_SUCCESS. */
     OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,
                            comm, MPI_ERR_UNKNOWN, FUNC_NAME);
 }

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,10 @@ int MPI_Unpack(const void inbuf, int insize, int position,`
`99`	`99`	`rc = opal_convertor_unpack( &local_convertor, &outvec, &iov_count, &size );`
`100`	`100`	`*position += size;`
`101`	`101`	`OBJ_DESTRUCT( &local_convertor );`
`102`		`-`
`103`		`- /* All done. Note that the convertor returns 1 upon success, not`
`104`		`- OMPI_SUCCESS. */`
`105`		`- rc = (1 == rc) ? OMPI_SUCCESS : OMPI_ERROR;`
`106`	`102`	`}`
`107`	`103`
	`104`	`+ /* All done. Note that the convertor returns 1 upon success, not`
	`105`	`+ OMPI_SUCCESS. */`
`108`	`106`	`OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,`
`109`	`107`	`comm, MPI_ERR_UNKNOWN, FUNC_NAME);`
`110`	`108`	`}`