pr feedback for f77/f90 variants

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/fortran/mpif-h/request_get_status_all_f.c

@@ -110,11 +110,12 @@ void ompi_request_get_status_all_f(MPI_Fint *count, MPI_Fint *array_of_requests,
 
     if (MPI_SUCCESS == c_ierr) {
         OMPI_SINGLE_INT_2_LOGICAL(flag);
-        for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) {
-            array_of_requests[i] = c_req[i]->req_f_to_c_index;
-            if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) &&
-                !OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
-                PMPI_Status_c2f( &c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
+        if (1 == OMPI_LOGICAL_2_INT(*flag)){
+            for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) {
+                if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) &&
+                    !OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
+                    PMPI_Status_c2f( &c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
+                }
             }
         }
     }

ompi/mpi/fortran/mpif-h/request_get_status_any_f.c

@@ -113,16 +113,12 @@ void ompi_request_get_status_any_f(MPI_Fint *count, MPI_Fint *array_of_requests,
 
         OMPI_SINGLE_INT_2_LOGICAL(flag);
 
-        /* Increment index by one for fortran conventions */
-
-        OMPI_SINGLE_INT_2_FINT(indx);
-        if (MPI_UNDEFINED != *(OMPI_SINGLE_NAME_CONVERT(indx))) {
-            array_of_requests[OMPI_INT_2_FINT(*indx)] =
-                c_req[OMPI_INT_2_FINT(*indx)]->req_f_to_c_index;
-            ++(*indx);
-        }
-        if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) {
-            PMPI_Status_c2f(&c_status, status);
+        if (1 == OMPI_LOGICAL_2_INT(*flag)){
+            OMPI_SINGLE_INT_2_FINT(indx);
+            ++(*indx); /* Increment indexes by one for fortran conventions */
+            if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) {
+                PMPI_Status_c2f(&c_status, status);
+            }
         }
     }
     free(c_req);

ompi/mpi/fortran/mpif-h/request_get_status_some_f.c

@@ -117,21 +117,18 @@ void ompi_request_get_status_some_f(MPI_Fint *incount, MPI_Fint *array_of_reques
 
     if (MPI_SUCCESS == c_ierr) {
         OMPI_SINGLE_INT_2_FINT(*outcount);
-        OMPI_ARRAY_INT_2_FINT(array_of_indices, *outcount);
-
-        /* Increment indexes by one for fortran conventions */
 
         if (MPI_UNDEFINED != OMPI_FINT_2_INT(*outcount)) {
+            OMPI_ARRAY_INT_2_FINT(array_of_indices, *outcount);
             for (i = 0; i < OMPI_FINT_2_INT(*outcount); ++i) {
-                array_of_requests[OMPI_INT_2_FINT(array_of_indices[i])] =
-                    c_req[OMPI_INT_2_FINT(array_of_indices[i])]->req_f_to_c_index;
-                ++array_of_indices[i];
+                ++array_of_indices[i]; /* Increment indexes by one for fortran conventions */
             }
-        }
-        if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses)) {
-            for (i = 0; i < OMPI_FINT_2_INT(*incount); ++i) {
-                if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
-                    PMPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
+            if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses)) {
+                for (i = 0; i < OMPI_FINT_2_INT(*outcount); ++i) {
+                    if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
+                        PMPI_Status_c2f(&c_status[i], 
+                                       &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
+                    }
                 }
             }
         }