toint fixes

thanks to dalcinl !

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

Author: hppritcha

ompi/mpi/c/comm_toint_ompi.c

@@ -42,7 +42,7 @@ int MPI_Comm_toint(MPI_Comm comm)
 
     if ( MPI_PARAM_CHECK ) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-       if (ompi_comm_invalid(comm)) {
+        if ((comm != MPI_COMM_NULL) && ompi_comm_invalid(comm)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_COMM, FUNC_NAME);
        }
     }

ompi/mpi/c/file_toint_abi.c

@@ -43,10 +43,12 @@ int MPI_File_toint(MPI_File_ABI_INTERNAL file)
 {
     int o_index;
     ompi_file_t *file_ptr;
+    MPI_File file_tmp;
 
     if ( MPI_PARAM_CHECK ) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == file) {
+        file_tmp = ompi_convert_abi_file_intern_file(file);
+        if ((file_tmp != MPI_FILE_NULL) && ompi_file_invalid(file_tmp)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_FILE, FUNC_NAME);
         }
     }

ompi/mpi/c/file_toint_ompi.c

@@ -42,7 +42,7 @@ int MPI_File_toint(MPI_File file)
 
     if ( MPI_PARAM_CHECK ) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-       if (NULL == file) {
+        if ((file != MPI_FILE_NULL) && ompi_file_invalid(file)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_FILE, FUNC_NAME);
        }
     }

ompi/mpi/c/win_toint_ompi.c

@@ -42,8 +42,8 @@ int MPI_Win_toint(MPI_Win win)
 
     if ( MPI_PARAM_CHECK ) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (ompi_win_invalid(win) && MPI_WIN_NULL != win) {
-            return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_WIN, FUNC_NAME);
+        if ((MPI_WIN_NULL != win) && ompi_win_invalid(win)) {
+          return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_WIN, FUNC_NAME);
         }
     }