From 88ee7c27150e891ee7a1e91d64dfcca5ccf0c37b Mon Sep 17 00:00:00 2001 From: Vishal Sahay Date: Thu, 16 Sep 2004 19:54:13 +0000 Subject: [PATCH] Fix the warnings This commit was SVN r2730. --- src/mpi/f77/iprobe_f.c | 4 ++-- src/mpi/f77/scatter_f.c | 2 +- src/mpi/f77/status_set_elements_f.c | 2 +- src/mpi/f77/strings.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mpi/f77/iprobe_f.c b/src/mpi/f77/iprobe_f.c index 9b2d54b1f2..c616715935 100644 --- a/src/mpi/f77/iprobe_f.c +++ b/src/mpi/f77/iprobe_f.c @@ -60,6 +60,8 @@ void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, #endif OMPI_SINGLE_NAME_DECL(flag); + c_comm = MPI_Comm_f2c (*comm); + /* Only check for the bad value if we're checking MPI parameters */ if (MPI_PARAM_CHECK) { @@ -88,8 +90,6 @@ void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, #endif } - c_comm = MPI_Comm_f2c (*comm); - *ierr = OMPI_INT_2_FINT(MPI_Iprobe(OMPI_FINT_2_INT(*source), OMPI_FINT_2_INT(*tag), c_comm, OMPI_SINGLE_NAME_CONVERT(flag), diff --git a/src/mpi/f77/scatter_f.c b/src/mpi/f77/scatter_f.c index 54eb1114c9..dcf4775948 100644 --- a/src/mpi/f77/scatter_f.c +++ b/src/mpi/f77/scatter_f.c @@ -52,7 +52,7 @@ void mpi_scatter_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr) { MPI_Datatype c_sendtype, c_recvtype; - MPI_Comm c_comm; + MPI_Comm c_comm = MPI_Comm_f2c(*comm); c_sendtype = MPI_Type_f2c(*sendtype); c_recvtype = MPI_Type_f2c(*recvtype); diff --git a/src/mpi/f77/status_set_elements_f.c b/src/mpi/f77/status_set_elements_f.c index 8c2cafffc2..60a3d524f7 100644 --- a/src/mpi/f77/status_set_elements_f.c +++ b/src/mpi/f77/status_set_elements_f.c @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS, void mpi_status_set_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) { - MPI_Datatype c_type; + MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Status c_status; MPI_Status_f2c( status, &c_status ); diff --git a/src/mpi/f77/strings.c b/src/mpi/f77/strings.c index 6e1d699cad..72adccf97c 100644 --- a/src/mpi/f77/strings.c +++ b/src/mpi/f77/strings.c @@ -117,7 +117,7 @@ int ompi_fortran_multiple_argvs_f2c(int count, char *array, int len, { char ***argv_array; int i; - char *current_array; + char *current_array = array; int ret; argv_array = (char ***) malloc (count * sizeof(char **));