[svn-r310] Fixed a type of H5F_LOW_MPIO. Chose _MPIO over _MPI since that

is more consistent with other names like STDIO.

3 files changed, 9 insertions, 9 deletions

diff --git a/src/H5F.c b/src/H5F.c
index ab536b0..71827aa 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -149,7 +149,7 @@ H5F_init_interface(void)
     /* Nothing to initialize */
 #elif (H5F_LOW_DFLT == H5F_LOW_CORE)
     H5F_access_dflt.u.core.increment = 10*1024;
-#elif (H5F_LOW_DFLT == H5F_LOW_MPI)
+#elif (H5F_LOW_DFLT == H5F_LOW_MPIO)
     H5F_access_dflt.u.mpio.access_mode = 0;
     H5F_access_dflt.u.mpio.comm = MPI_COMM_NULL;
     H5F_access_dflt.u.mpio.info = MPI_INFO_NULL;
@@ -1327,7 +1327,7 @@ H5F_close(H5F_t *f)
      */
     if (f->nopen > 0) {
 #ifndef NDEBUG
-	fprintf(stderr, "HDF5-DIAG: H5F_close: %d object header%s still "
+	fprintf(stderr, "HDF5-DIAG: H5F_close: %u object header%s still "
 		"open (file close will complete when %s closed)\n",
 		f->nopen,
 		1 == f->nopen ? " is" : "s are",
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index d4a869b..db209d2 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -52,7 +52,7 @@ typedef enum H5F_driver_t {
     H5F_LOW_ERROR	= -1,	/*error return value			*/
     H5F_LOW_STDIO	= 0,	/*use functions declared in stdio.h	*/
     H5F_LOW_SEC2	= 1, 	/*use functions declared in unistd.h	*/
-    H5F_LOW_MPI		= 2,	/*use indep or collective MPI-IO	*/
+    H5F_LOW_MPIO	= 2,	/*use indep or collective MPI-IO	*/
     H5F_LOW_CORE	= 3,	/*use malloc() and free()		*/
     H5F_LOW_SPLIT	= 4,	/*separate meta data from raw data	*/
     H5F_LOW_FAMILY	= 5 	/*split addr space over many files	*/
diff --git a/src/H5P.c b/src/H5P.c
index 2bf839b4..8bbf03d 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -301,7 +301,7 @@ H5P_close (H5P_class_t type, void *tmpl)
 	    /* Nothing to do */
 	    break;
 
-	case H5F_LOW_MPI:
+	case H5F_LOW_MPIO:
 #ifdef LATER
 	    /* Need to free the COMM and INFO objects too. */
 #endif
@@ -1682,7 +1682,7 @@ H5Pget_family (hid_t tid, hid_t *memb_tid)
  * Function:	H5Pset_mpi
  *
  * Signature:	herr_t H5Pset_mpi(hid_t tid, MPI_Comm comm, MPI_Info info,
- *		    uintn access_mode) 
+ *		    unsigned access_mode) 
  *
  * Purpose:	Store the access mode for MPIO call and the user supplied
  *		communicator and info in the access template which can then
@@ -1706,7 +1706,7 @@ H5Pget_family (hid_t tid, hid_t *memb_tid)
  *		    this function call returns may have undetermined effect
  *		    to the access template.  Users should call this function
  *		    again to setup the template.
- *		uintn access_mode 
+ *		unsigned access_mode 
  *		    File data access modes: 
  *			H5ACC_INDEPENDENT 
  *			    Allow independent datasets access. 
@@ -1733,7 +1733,7 @@ H5Pget_family (hid_t tid, hid_t *memb_tid)
  */
 #ifdef HAVE_PARALLEL
 herr_t
-H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
+H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, unsigned access_mode)
 {
     H5F_access_t	   *tmpl = NULL;
     MPI_Comm		    lcomm;
@@ -1813,7 +1813,7 @@ H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
  */
 #ifdef HAVE_PARALLEL
 herr_t
-H5Pget_mpi (hid_t tid, MPI_Comm *comm, MPI_Info *info, uintn *access_mode)
+H5Pget_mpi (hid_t tid, MPI_Comm *comm, MPI_Info *info, unsigned *access_mode)
 {
     H5F_access_t	*tmpl = NULL;
 
@@ -1825,7 +1825,7 @@ H5Pget_mpi (hid_t tid, MPI_Comm *comm, MPI_Info *info, uintn *access_mode)
 	HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL,
 		       "not a file access property list");
     }
-    if (H5F_LOW_MPI != tmpl->driver) {
+    if (H5F_LOW_MPIO != tmpl->driver) {
 	HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
 		       "the mpi driver is not set");
     }