Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"

This reverts commit b1223dd653e65e076af92b2dfe236f3704da81c8, reversing
changes made to b25f123f5f5e25c1447a6a02861cb7c7265c12f2.

11 files changed, 726 insertions, 1359 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0552244..b163b8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -885,7 +885,10 @@ add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HE
 TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_LIB_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS})
 if (NOT WIN32)
-  target_link_libraries (${HDF5_LIB_TARGET} PUBLIC ${CMAKE_DL_LIBS})
+  target_link_libraries (${HDF5_LIB_TARGET} PUBLIC dl)
+endif ()
+if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+  target_include_directories (${HDF5_LIB_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS})
 endif ()
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC)
@@ -926,7 +929,10 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC ${CMAKE_DL_LIBS})
+    target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC dl)
+  endif ()
+  if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+    target_include_directories (${HDF5_LIBSH_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 8b663b8..b6c0341 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -61,8 +61,8 @@ static herr_t H5D__cache_dataspace_info(const H5D_t *dset);
 static herr_t H5D__init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space);
 static herr_t H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset,
         hid_t dapl_id);
-static herr_t H5D_build_file_prefix(const H5D_t *dset, hid_t dapl_id, const char * prefix_type,
-        char **vds_prefix);
+static herr_t H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id,
+        char **extfile_prefix);
 static herr_t H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id);
 static herr_t H5D__init_storage(const H5D_io_info_t *io_info, hbool_t full_overwrite,
         hsize_t old_dim[]);
@@ -963,25 +963,24 @@ done:
 } /* end H5D__update_oh_info() */
 
 
-
 /*--------------------------------------------------------------------------
- * Function:    H5D_build_file_prefix
+ * Function:    H5D_build_extfile_prefix
  *
- * Purpose:     Determine the file prefix to be used and store
- *              it in file_prefix. Stores an empty string if no prefix
+ * Purpose:     Determine the external file prefix to be used and store
+ *              it in extfile_prefix. Stores an empty string if no prefix
  *              should be used.
  *
  * Return:      SUCCEED/FAIL
  *--------------------------------------------------------------------------
  */
 static herr_t
-H5D_build_file_prefix(const H5D_t *dset, hid_t dapl_id, const char *prefix_type, char **file_prefix /*out*/)
+H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id, char **extfile_prefix /*out*/)
 {
     char            *prefix = NULL;       /* prefix used to look for the file               */
-    char            *filepath = NULL;     /* absolute path of directory the HDF5 file is in */
-    size_t          filepath_len;         /* length of file path                            */
+    char            *extpath = NULL;      /* absolute path of directory the HDF5 file is in */
+    size_t          extpath_len;          /* length of extpath                              */
     size_t          prefix_len;           /* length of prefix                               */
-    size_t          file_prefix_len;      /* length of expanded prefix                      */
+    size_t          extfile_prefix_len;   /* length of expanded prefix                      */
     H5P_genplist_t  *plist = NULL;        /* Property list pointer                          */
     herr_t          ret_value = SUCCEED;  /* Return value                                   */
 
@@ -991,25 +990,20 @@ H5D_build_file_prefix(const H5D_t *dset, hid_t dapl_id, const char *prefix_type,
     HDassert(dset);
     HDassert(dset->oloc.file);
 
-    filepath = H5F_EXTPATH(dset->oloc.file);
-    HDassert(filepath);
+    extpath = H5F_EXTPATH(dset->oloc.file);
+    HDassert(extpath);
 
     /* XXX: Future thread-safety note - getenv is not required
      *      to be reentrant.
      */
-    if (HDstrcmp(prefix_type, H5D_ACS_VDS_PREFIX_NAME) == 0)
-        prefix = HDgetenv("HDF5_VDS_PREFIX");
-    else if (HDstrcmp(prefix_type, H5D_ACS_EFILE_PREFIX_NAME) == 0)
-        prefix = HDgetenv("HDF5_EXTFILE_PREFIX");
-    else
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "prefix name is not sensible")
+    prefix = HDgetenv("HDF5_EXTFILE_PREFIX");
 
     if(prefix == NULL || *prefix == '\0') {
-        /* Set prefix to value of prefix_type property */
+        /* Set prefix to value of H5D_ACS_EFILE_PREFIX_NAME property */
         if(NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-        if(H5P_peek(plist, prefix_type, &prefix) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file prefix")
+        if(H5P_peek(plist, H5D_ACS_EFILE_PREFIX_NAME, &prefix) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file prefix")
     } /* end if */
 
     /* Prefix has to be checked for NULL / empty string again because the
@@ -1019,29 +1013,29 @@ H5D_build_file_prefix(const H5D_t *dset, hid_t dapl_id, const char *prefix_type,
         /* filename is interpreted as relative to the current directory,
          * does not need to be expanded
          */
-        if(NULL == (*file_prefix = (char *)H5MM_strdup("")))
+        if(NULL == (*extfile_prefix = (char *)H5MM_strdup("")))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     } /* end if */
     else {
         if (HDstrncmp(prefix, "${ORIGIN}", HDstrlen("${ORIGIN}")) == 0) {
             /* Replace ${ORIGIN} at beginning of prefix by directory of HDF5 file */
-            filepath_len = HDstrlen(filepath);
+            extpath_len = HDstrlen(extpath);
             prefix_len = HDstrlen(prefix);
-            file_prefix_len = filepath_len + prefix_len - HDstrlen("${ORIGIN}") + 1;
+            extfile_prefix_len = extpath_len + prefix_len - HDstrlen("${ORIGIN}") + 1;
 
-            if(NULL == (*file_prefix = (char *)H5MM_malloc(file_prefix_len)))
+            if(NULL == (*extfile_prefix = (char *)H5MM_malloc(extfile_prefix_len)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate buffer")
-            HDsnprintf(*file_prefix, file_prefix_len, "%s%s", filepath, prefix + HDstrlen("${ORIGIN}"));
+            HDsnprintf(*extfile_prefix, extfile_prefix_len, "%s%s", extpath, prefix + HDstrlen("${ORIGIN}"));
         } /* end if */
         else {
-            if(NULL == (*file_prefix = (char *)H5MM_strdup(prefix)))
+            if(NULL == (*extfile_prefix = (char *)H5MM_strdup(prefix)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         } /* end else */
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_build_file_prefix() */
+} /* H5D_build_extfile_prefix() */
 
 
 /*-------------------------------------------------------------------------
@@ -1223,13 +1217,9 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to set up flush append property")
 
     /* Set the external file prefix */
-    if(H5D_build_file_prefix(new_dset, dapl_id, H5D_ACS_EFILE_PREFIX_NAME, &new_dset->shared->extfile_prefix) < 0)
+    if(H5D_build_extfile_prefix(new_dset, dapl_id, &new_dset->shared->extfile_prefix) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize external file prefix")
 
-    /* Set the vds file prefix */
-    if(H5D_build_file_prefix(new_dset, dapl_id, H5D_ACS_VDS_PREFIX_NAME, &new_dset->shared->vds_prefix) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize vds  prefix")
-
     /* Add the dataset to the list of opened objects in the file */
     if(H5FO_top_incr(new_dset->oloc.file, new_dset->oloc.addr) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't incr object ref. count")
@@ -1275,7 +1265,6 @@ done:
             if(new_dset->shared->dcpl_id != 0 && H5I_dec_ref(new_dset->shared->dcpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement ref count on property list")
             new_dset->shared->extfile_prefix = (char *)H5MM_xfree(new_dset->shared->extfile_prefix);
-            new_dset->shared->vds_prefix = (char *)H5MM_xfree(new_dset->shared->vds_prefix);
             new_dset->shared = H5FL_FREE(H5D_shared_t, new_dset->shared);
         } /* end if */
         new_dset->oloc.file = NULL;
@@ -1362,7 +1351,6 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
     H5D_shared_t    *shared_fo = NULL;
     H5D_t           *dataset = NULL;
     char            *extfile_prefix = NULL;  /* Expanded external file prefix */
-    char            *vds_prefix = NULL;      /* Expanded vds prefix */
     H5D_t           *ret_value = NULL;       /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
@@ -1383,13 +1371,9 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, NULL, "can't copy path")
 
     /* Get the external file prefix */
-    if(H5D_build_file_prefix(dataset, dapl_id, H5D_ACS_EFILE_PREFIX_NAME, &extfile_prefix) < 0)
+    if(H5D_build_extfile_prefix(dataset, dapl_id, &extfile_prefix) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize external file prefix")
 
-    /* Get the vds prefix */
-    if(H5D_build_file_prefix(dataset, dapl_id, H5D_ACS_VDS_PREFIX_NAME, &vds_prefix) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize vds prefix")
-
     /* Check if dataset was already open */
     if(NULL == (shared_fo = (H5D_shared_t *)H5FO_opened(dataset->oloc.file, dataset->oloc.addr))) {
         /* Clear any errors from H5FO_opened() */
@@ -1415,11 +1399,6 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
         /* Prevent string from being freed during done: */
         extfile_prefix = NULL;
 
-        /* Set the vds file prefix */
-        dataset->shared->vds_prefix = vds_prefix;
-        /* Prevent string from being freed during done: */
-        vds_prefix = NULL;
-
     } /* end if */
     else {
         /* Point to shared info */
@@ -1451,14 +1430,12 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
 
 done:
     extfile_prefix = (char *)H5MM_xfree(extfile_prefix);
-    vds_prefix = (char *)H5MM_xfree(vds_prefix);
 
     if(ret_value == NULL) {
         /* Free the location--casting away const*/
         if(dataset) {
             if(shared_fo == NULL && dataset->shared) {   /* Need to free shared fo */
                 dataset->shared->extfile_prefix = (char *)H5MM_xfree(dataset->shared->extfile_prefix);
-                dataset->shared->vds_prefix = (char *)H5MM_xfree(dataset->shared->vds_prefix);
                 dataset->shared = H5FL_FREE(H5D_shared_t, dataset->shared);
             }
 
@@ -1841,9 +1818,6 @@ H5D_close(H5D_t *dataset)
         /* Free the external file prefix */
         dataset->shared->extfile_prefix = (char *)H5MM_xfree(dataset->shared->extfile_prefix);
 
-        /* Free the vds file prefix */
-        dataset->shared->vds_prefix = (char *)H5MM_xfree(dataset->shared->vds_prefix);
-
         /* Release layout, fill-value, efl & pipeline messages */
         if(dataset->shared->dcpl_id != H5P_DATASET_CREATE_DEFAULT)
             free_failed |= (H5O_msg_reset(H5O_PLINE_ID, &dataset->shared->dcpl_cache.pline) < 0) ||
@@ -3386,10 +3360,6 @@ H5D_get_access_plist(H5D_t *dset)
     if(H5P_set(new_plist, H5D_ACS_VDS_PRINTF_GAP_NAME, &(dset->shared->layout.storage.u.virt.printf_gap)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set VDS printf gap")
 
-    /* Set the vds prefix option */
-    if(H5P_set(new_plist, H5D_ACS_VDS_PREFIX_NAME, &(dset->shared->vds_prefix)) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set vds prefix")
-
     /* Set the external file prefix option */
     if(H5P_set(new_plist, H5D_ACS_EFILE_PREFIX_NAME, &(dset->shared->extfile_prefix)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set external file prefix")
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 45f2d3a..542abd0 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -476,7 +476,6 @@ typedef struct H5D_shared_t {
 
     H5D_append_flush_t   append_flush;   /* Append flush property information */
     char                *extfile_prefix; /* expanded external file prefix */
-    char                *vds_prefix;     /* expanded vds prefix */
 } H5D_shared_t;
 
 struct H5D_t {
@@ -599,7 +598,7 @@ H5_DLL herr_t H5D_set_io_info_dxpls(H5D_io_info_t *io_info, hid_t dxpl_id);
 H5_DLL herr_t H5D__format_convert(H5D_t *dataset, hid_t dxpl_id);
 
 /* Internal I/O routines */
-H5_DLL herr_t H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id,
+H5_DLL herr_t H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id, 
     const H5S_t *mem_space, const H5S_t *file_space, hid_t dxpl_id, const void *buf);
 H5_DLL herr_t H5D__read(H5D_t *dataset, hid_t mem_type_id,
     const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist,
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index ed13467..fb994d8 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -47,13 +47,12 @@
 #define H5D_CRT_EXT_FILE_LIST_NAME "efl"                 /* External file list */
 
 /* ========  Dataset access property names ======== */
-#define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME   "rdcc_nslots"    /* Size of raw data chunk cache(slots) */
-#define H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME   "rdcc_nbytes"    /* Size of raw data chunk cache(bytes) */
-#define H5D_ACS_PREEMPT_READ_CHUNKS_NAME    "rdcc_w0"        /* Preemption read chunks first */
-#define H5D_ACS_VDS_VIEW_NAME               "vds_view"       /* VDS view option */
+#define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME   "rdcc_nslots"   /* Size of raw data chunk cache(slots) */
+#define H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME   "rdcc_nbytes"   /* Size of raw data chunk cache(bytes) */
+#define H5D_ACS_PREEMPT_READ_CHUNKS_NAME    "rdcc_w0"       /* Preemption read chunks first */
+#define H5D_ACS_VDS_VIEW_NAME               "vds_view"      /* VDS view option */
 #define H5D_ACS_VDS_PRINTF_GAP_NAME         "vds_printf_gap" /* VDS printf gap size */
-#define H5D_ACS_VDS_PREFIX_NAME             "vds_prefix"     /* VDS file prefix */
-#define H5D_ACS_APPEND_FLUSH_NAME           "append_flush"   /* Append flush actions */
+#define H5D_ACS_APPEND_FLUSH_NAME    "append_flush"         /* Append flush actions */
 #define H5D_ACS_EFILE_PREFIX_NAME           "external file prefix" /* External file prefix */
 
 /* ======== Data transfer properties ======== */
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c
index 4882e9f..3be2353 100644
--- a/src/H5Dvirtual.c
+++ b/src/H5Dvirtual.c
@@ -731,240 +731,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__virtual_delete */
 
-
-/*--------------------------------------------------------------------------
- * Function: H5D__virtual_build_name
- *
- * Purpose:  Prepend PREFIX to FILE_NAME and store in FULL_NAME
- *
- * Return:   Non-negative on success/Negative on failure
- *--------------------------------------------------------------------------*/
-static herr_t
-H5D__virtual_build_name(char *prefix, char *file_name, char **full_name/*out*/)
-{
-    size_t      prefix_len;             /* length of prefix */
-    size_t      fname_len;              /* Length of external link file name */
-    herr_t      ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    prefix_len = HDstrlen(prefix);
-    fname_len = HDstrlen(file_name);
-
-    /* Allocate a buffer to hold the filename + prefix + possibly the delimiter + terminating null byte */
-    if(NULL == (*full_name = (char *)H5MM_malloc(prefix_len + fname_len + 2)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer")
-
-    /* Compose the full file name */
-    HDsnprintf(*full_name, (prefix_len + fname_len + 2), "%s%s%s", prefix,
-        (H5_CHECK_DELIMITER(prefix[prefix_len - 1]) ? "" : H5_DIR_SEPS), file_name);
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D__virtual_build_name() */
-
-
-/*--------------------------------------------------------------------------
- * Function: H5D_getenv_prefix_name --
- *
- * Purpose:  Get the first pathname in the list of pathnames stored in env_prefix,
- *           which is separated by the environment delimiter.
- *           env_prefix is modified to point to the remaining pathnames
- *           in the list.
- *
- * Return:   A pointer to a pathname
---------------------------------------------------------------------------*/
-static char *
-H5D_getenv_prefix_name(char **env_prefix/*in,out*/)
-{
-    char        *retptr=NULL;
-    char        *strret=NULL;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    strret = HDstrchr(*env_prefix, H5_COLON_SEPC);
-    if (strret == NULL) {
-        retptr = *env_prefix;
-        *env_prefix = strret;
-    } else {
-        retptr = *env_prefix;
-        *env_prefix = strret + 1;
-        *strret = '\0';
-    }
-
-    FUNC_LEAVE_NOAPI(retptr)
-} /* end H5D_getenv_prefix_name() */
-
-/*-------------------------------------------------------------------------
- * Function:    H5D__virtual_open_file
- *
- * Purpose:     Attempts to open a source dataset file.
- *
- * Return:      Non-negative on success/Negative on failure
- *-------------------------------------------------------------------------
- */
-static H5F_t *
-H5D__virtual_open_file(H5P_genplist_t *plist, const H5F_t *vdset_file,
-        const char *file_name,
-        hid_t fapl_id, hid_t dxpl_id)
-{
-    H5F_t       *src_file = NULL;       /* Source file */
-    H5F_t       *ret_value = NULL;      /* Actual return value  */
-    char        *full_name = NULL;      /* File name with prefix */
-    char        *my_prefix;             /* Library's copy of the prefix */
-    unsigned    intent;                 /* File access permissions */
-    char        *actual_file_name = NULL; /* Virtual file's actual name */
-    char        *temp_file_name = NULL; /* Temporary pointer to file name */
-    size_t      temp_file_name_len;     /* Length of temporary file name */
-
-    FUNC_ENTER_STATIC
-
-    /* Simplify intent flags for open calls */
-    intent = H5F_INTENT(vdset_file);
-    intent &= (H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ);
-
-    /* Copy the file name to use */
-    if(NULL == (temp_file_name = H5MM_strdup(file_name)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    temp_file_name_len = HDstrlen(temp_file_name);
-
-    /* target file_name is an absolute pathname: see RM for detailed description */
-    if(H5_CHECK_ABSOLUTE(file_name) || H5_CHECK_ABS_PATH(file_name)) {
-        /* Try opening file */
-        if(NULL == (src_file = H5F_open(file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id))) {
-            char *ptr;
-
-            H5E_clear_stack(NULL);
-
-            /* get last component of file_name */
-            H5_GET_LAST_DELIMITER(file_name, ptr)
-            HDassert(ptr);
-
-            /* Increment past delimiter */
-            ptr++;
-
-            /* Copy into the temp. file name */
-            HDstrncpy(temp_file_name, ptr, temp_file_name_len);
-            temp_file_name[temp_file_name_len - 1] = '\0';
-        } /* end if */
-    } /* end if */
-    else if(H5_CHECK_ABS_DRIVE(file_name)) {
-        /* Try opening file */
-        if(NULL == (src_file = H5F_open(file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id))) {
-
-            H5E_clear_stack(NULL);
-
-            /* strip "<drive-letter>:" */
-            HDstrncpy(temp_file_name, &file_name[2], temp_file_name_len);
-            temp_file_name[temp_file_name_len - 1] = '\0';
-        } /* end if */
-    } /* end if */
-
-    /* try searching from paths set in the environment variable */
-    if(src_file == NULL) {
-        char *env_prefix;
-
-        if(NULL != (env_prefix = HDgetenv("HDF5_VDS_PREFIX"))) {
-            char *tmp_env_prefix, *saved_env;
-
-            if(NULL == (saved_env = tmp_env_prefix = H5MM_strdup(env_prefix)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-
-            while((tmp_env_prefix) && (*tmp_env_prefix)) {
-                char *out_prefix_name;
-
-                out_prefix_name = H5D_getenv_prefix_name(&tmp_env_prefix/*in,out*/);
-                if(out_prefix_name && (*out_prefix_name)) {
-                    if(H5D__virtual_build_name(out_prefix_name, temp_file_name, &full_name/*out*/) < 0) {
-                        saved_env = (char *)H5MM_xfree(saved_env);
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't prepend prefix to filename")
-                    } /* end if */
-
-                    src_file = H5F_open(full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id);
-                    full_name = (char *)H5MM_xfree(full_name);
-                    if(src_file != NULL)
-                        break;
-                    H5E_clear_stack(NULL);
-                } /* end if */
-            } /* end while */
-            saved_env = (char *)H5MM_xfree(saved_env);
-        } /* end if */
-    } /* end if */
-
-    /* try searching from property list */
-    if(src_file == NULL) {
-        size_t  size = 0;
-        if((size = H5Pget_virtual_prefix(plist, NULL, 0)) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get vds prefix")
-        /* Allocate a buffer to hold the filename + prefix + possibly the delimiter + terminating null byte */
-        if(NULL == (my_prefix = (char *)H5MM_malloc(size + 1)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate prefix buffer")
-        if(H5Pget_virtual_prefix(plist, my_prefix, size+1) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get vds  prefix")
-        if(my_prefix) {
-            if(H5D__virtual_build_name(my_prefix, temp_file_name, &full_name/*out*/) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't prepend prefix to filename")
-            if(NULL == (src_file = H5F_open(full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
-                H5E_clear_stack(NULL);
-            full_name = (char *)H5MM_xfree(full_name);
-        } /* end if */
-    } /* end if */
-
-    /* try searching from main file's "extpath": see description in H5F_open() & H5_build_extpath() */
-    if(src_file == NULL) {
-        char *vdspath;
-
-        if(NULL != (vdspath = H5F_EXTPATH(vdset_file))) {
-            if(H5D__virtual_build_name(vdspath, temp_file_name, &full_name/*out*/) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't prepend prefix to filename")
-            if(NULL == (src_file = H5F_open(full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
-                H5E_clear_stack(NULL);
-            full_name = (char *)H5MM_xfree(full_name);
-        } /* end if */
-    } /* end if */
-
-    /* try the relative file_name stored in temp_file_name */
-    if(src_file == NULL) {
-        if(NULL == (src_file = H5F_open(temp_file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
-            H5E_clear_stack(NULL);
-    } /* end if */
-
-    /* try the 'resolved' name for the virtual file */
-    if(src_file == NULL) {
-        char *ptr = NULL;
-
-        /* Copy resolved file name */
-        if(NULL == (actual_file_name = H5MM_strdup(H5F_ACTUAL_NAME(vdset_file))))
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, NULL, "can't duplicate resolved file name string")
-
-        /* get last component of file_name */
-        H5_GET_LAST_DELIMITER(actual_file_name, ptr)
-        if(!ptr)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENFILE, NULL, "unable to open vds file, vds file name = '%s', temp_file_name = '%s'", file_name, temp_file_name)
-
-        /* Truncate filename portion from actual file name path */
-        *ptr = '\0';
-
-        /* Build new file name for the external file */
-        if(H5D__virtual_build_name(actual_file_name, temp_file_name, &full_name/*out*/) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't prepend prefix to filename")
-
-        /* Try opening with the resolved name */
-        if(NULL == (src_file = H5F_open(full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENFILE, NULL, "unable to open vds file, vds file name = '%s', temp_file_name = '%s'", file_name, temp_file_name)
-        full_name = (char *)H5MM_xfree(full_name);
-    } /* end if */
-
-    /* Success */
-    ret_value = src_file;
-done:
-    if((NULL == ret_value) && src_file)
-        if(H5F_try_close(src_file, NULL) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEFILE, FAIL, "can't close source file")
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D__virtual_open_file() */
-
 
 /*-------------------------------------------------------------------------
  * Function:    H5D__virtual_open_source_dset
@@ -984,13 +750,9 @@ H5D__virtual_open_source_dset(const H5D_t *vdset,
     H5O_storage_virtual_srcdset_t *source_dset, hid_t dxpl_id)
 {
     H5F_t       *src_file = NULL;       /* Source file */
-    char        *vds_prefix = NULL;     /* Source file vds_prefix */
     hbool_t     src_file_open = FALSE;  /* Whether we have opened and need to close src_file */
     H5G_loc_t   src_root_loc;           /* Object location of source file root group */
     herr_t      ret_value = SUCCEED;    /* Return value */
-    char        *full_name = NULL;      /* File name with prefix */
-    unsigned    intent;                 /* File access permissions */
-    H5P_genplist_t *plist;              /* Property list pointer */
 
     FUNC_ENTER_STATIC
 
@@ -1003,9 +765,8 @@ H5D__virtual_open_source_dset(const H5D_t *vdset,
 
     /* Check if we need to open the source file */
     if(HDstrcmp(source_dset->file_name, ".")) {
-        if((plist = H5D_get_access_plist(vdset)) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't get access plist")
-        if(NULL == (src_file = H5D__virtual_open_file(plist, vdset->oloc.file, source_dset->file_name, vdset->shared->layout.storage.u.virt.source_fapl, dxpl_id)))
+        /* Open the source file */
+        if(NULL == (src_file = H5F_open(source_dset->file_name, H5F_INTENT(vdset->oloc.file) & (H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ), H5P_FILE_CREATE_DEFAULT, vdset->shared->layout.storage.u.virt.source_fapl, dxpl_id)))
             H5E_clear_stack(NULL); /* Quick hack until proper support for H5Fopen with missing file is implemented */
         else
             src_file_open = TRUE;
@@ -1646,7 +1407,7 @@ H5D__virtual_set_extent_unlim(const H5D_t *dset, hid_t dxpl_id)
                                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCLIP, FAIL, "failed to clip unlimited selection")
                         } /* end if */
 
-                        /* Update cached values unlim_extent_source and
+                        /* Update cached values unlim_extent_source and 
                          * clip_size_virtual */
                         storage->list[i].unlim_extent_source = curr_dims[storage->list[i].unlim_dim_source];
                         storage->list[i].clip_size_virtual = clip_size;
@@ -1798,7 +1559,7 @@ H5D__virtual_set_extent_unlim(const H5D_t *dset, hid_t dxpl_id)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to modify size of data space")
 
         /* Mark the space as dirty, for later writing to the file */
-        if(H5F_INTENT(dset->oloc.file) & H5F_ACC_RDWR)
+        if(H5F_INTENT(dset->oloc.file) & H5F_ACC_RDWR) 
             if(H5D__mark(dset, dxpl_id, H5D_MARK_SPACE) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty")
     } /* end if */
@@ -2485,7 +2246,7 @@ H5D__virtual_pre_io(H5D_io_info_t *io_info,
                             HGOTO_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "can't close projected memory space")
                         storage->list[i].sub_dset[j].projected_mem_space = NULL;
                     } /* end if */
-                    else
+                    else 
                         *tot_nelmts += (hsize_t)select_nelmts;
                 } /* end if */
             } /* end for */
@@ -2504,7 +2265,7 @@ H5D__virtual_pre_io(H5D_io_info_t *io_info,
                 /* Check if anything is selected */
                 if(select_nelmts > (hssize_t)0) {
                     /* Open source dataset */
-                    if(!storage->list[i].source_dset.dset)
+                    if(!storage->list[i].source_dset.dset) 
                         /* Try to open dataset */
                         if(H5D__virtual_open_source_dset(io_info->dset, &storage->list[i], &storage->list[i].source_dset, io_info->md_dxpl_id) < 0)
                             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open source dataset")
@@ -2745,7 +2506,7 @@ H5D__virtual_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
                             HGOTO_ERROR(H5E_DATASET, H5E_CANTCLIP, FAIL, "unable to clip fill selection")
 
             /* Write fill values to memory buffer */
-            if(H5D__fill(io_info->dset->shared->dcpl_cache.fill.buf, io_info->dset->shared->type, io_info->u.rbuf,
+            if(H5D__fill(io_info->dset->shared->dcpl_cache.fill.buf, io_info->dset->shared->type, io_info->u.rbuf, 
                          type_info->mem_type, fill_space, io_info->md_dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "filling buf failed")
 
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 96b8e36..daf0a52 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -25,13 +25,13 @@ typedef struct H5F_t H5F_t;
 #include "H5Fpublic.h"
 
 /* Public headers needed by this file */
-#include "H5FDpublic.h"        /* File drivers                */
+#include "H5FDpublic.h"		/* File drivers				*/
 
 /* Private headers needed by this file */
 #ifdef H5_HAVE_PARALLEL
-#include "H5Pprivate.h"        /* Property lists            */
+#include "H5Pprivate.h"		/* Property lists			*/
 #endif /* H5_HAVE_PARALLEL */
-#include "H5VMprivate.h"        /* Vectors and arrays */
+#include "H5VMprivate.h"		/* Vectors and arrays */
 
 
 /**************************/
@@ -43,68 +43,68 @@ typedef struct H5F_t H5F_t;
  * Currently, all file meta-data is little-endian.
  */
 
-#  define INT16ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (unsigned)(i)     & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;              \
+#  define INT16ENCODE(p, i) {						      \
+   *(p) = (uint8_t)( (unsigned)(i)	 & 0xff); (p)++;		      \
+   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;		      \
 }
 
-#  define UINT16ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (unsigned)(i)     & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;              \
+#  define UINT16ENCODE(p, i) {						      \
+   *(p) = (uint8_t)( (unsigned)(i)	 & 0xff); (p)++;		      \
+   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;		      \
 }
 
-#  define INT32ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (uint32_t)(i)      & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >>  8) & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >> 16) & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >> 24) & 0xff); (p)++;              \
+#  define INT32ENCODE(p, i) {						      \
+   *(p) = (uint8_t)( (uint32_t)(i)	  & 0xff); (p)++;		      \
+   *(p) = (uint8_t)(((uint32_t)(i) >>  8) & 0xff); (p)++;		      \
+   *(p) = (uint8_t)(((uint32_t)(i) >> 16) & 0xff); (p)++;		      \
+   *(p) = (uint8_t)(((uint32_t)(i) >> 24) & 0xff); (p)++;		      \
 }
 
-#  define UINT32ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (i)        & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >>  8) & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >> 16) & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >> 24) & 0xff); (p)++;                      \
+#  define UINT32ENCODE(p, i) {						      \
+   *(p) = (uint8_t)( (i)        & 0xff); (p)++;				      \
+   *(p) = (uint8_t)(((i) >>  8) & 0xff); (p)++;				      \
+   *(p) = (uint8_t)(((i) >> 16) & 0xff); (p)++;				      \
+   *(p) = (uint8_t)(((i) >> 24) & 0xff); (p)++;				      \
 }
 
 /* Encode an unsigned integer into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
-#  define ENCODE_VAR(p, typ, n, l) {                          \
-   typ _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for(_i = 0; _i < l; _i++, _n >>= 8)                          \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   (p) = (uint8_t*)(p) + l;                              \
+#  define ENCODE_VAR(p, typ, n, l) {					      \
+   typ _n = (n);							      \
+   size_t _i;								      \
+   uint8_t *_p = (uint8_t*)(p);						      \
+									      \
+   for(_i = 0; _i < l; _i++, _n >>= 8)					      \
+      *_p++ = (uint8_t)(_n & 0xff);					      \
+   (p) = (uint8_t*)(p) + l;						      \
 }
 
 /* Encode a 32-bit unsigned integer into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
 #  define UINT32ENCODE_VAR(p, n, l)     ENCODE_VAR(p, uint32_t, n, l)
 
-#  define INT64ENCODE(p, n) {                              \
-   int64_t _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for (_i = 0; _i < sizeof(int64_t); _i++, _n >>= 8)                  \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   for (/*void*/; _i < 8; _i++)                              \
-      *_p++ = (n) < 0 ? 0xff : 0;                          \
-   (p) = (uint8_t*)(p)+8;                              \
+#  define INT64ENCODE(p, n) {						      \
+   int64_t _n = (n);							      \
+   size_t _i;								      \
+   uint8_t *_p = (uint8_t*)(p);						      \
+									      \
+   for (_i = 0; _i < sizeof(int64_t); _i++, _n >>= 8)			      \
+      *_p++ = (uint8_t)(_n & 0xff);					      \
+   for (/*void*/; _i < 8; _i++)						      \
+      *_p++ = (n) < 0 ? 0xff : 0;					      \
+   (p) = (uint8_t*)(p)+8;						      \
 }
 
-#  define UINT64ENCODE(p, n) {                              \
-   uint64_t _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for (_i = 0; _i < sizeof(uint64_t); _i++, _n >>= 8)                  \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   for (/*void*/; _i < 8; _i++)                              \
-      *_p++ = 0;                                  \
-   (p) = (uint8_t*)(p) + 8;                              \
+#  define UINT64ENCODE(p, n) {						      \
+   uint64_t _n = (n);							      \
+   size_t _i;								      \
+   uint8_t *_p = (uint8_t*)(p);						      \
+									      \
+   for (_i = 0; _i < sizeof(uint64_t); _i++, _n >>= 8)			      \
+      *_p++ = (uint8_t)(_n & 0xff);					      \
+   for (/*void*/; _i < 8; _i++)						      \
+      *_p++ = 0;							      \
+   (p) = (uint8_t*)(p) + 8;						      \
 }
 
 /* Encode a 64-bit unsigned integer into a variable-sized buffer */
@@ -113,31 +113,31 @@ typedef struct H5F_t H5F_t;
 
 /* Encode a 64-bit unsigned integer and its length into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
-#  define UINT64ENCODE_VARLEN(p, n) {                          \
-   uint64_t __n = (uint64_t)(n);                                  \
-   unsigned _s = H5VM_limit_enc_size(__n);                      \
-                                        \
-   *(p)++ = (uint8_t)_s;                              \
-   UINT64ENCODE_VAR(p, __n, _s);                              \
+#  define UINT64ENCODE_VARLEN(p, n) {					      \
+   uint64_t __n = (uint64_t)(n);							      \
+   unsigned _s = H5VM_limit_enc_size(__n);				      \
+									      \
+   *(p)++ = (uint8_t)_s;						      \
+   UINT64ENCODE_VAR(p, __n, _s);						      \
 }
 
-#  define H5_ENCODE_UNSIGNED(p, n) {                          \
-    HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t));              \
-    UINT32ENCODE(p, n)                                  \
+#  define H5_ENCODE_UNSIGNED(p, n) {					      \
+    HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t));		      \
+    UINT32ENCODE(p, n)							      \
 }
 
 /* Assumes the endianness of uint64_t is the same as double */
-#  define H5_ENCODE_DOUBLE(p, n) {                          \
-    uint64_t _n;                                  \
-    size_t _u;                                      \
-    uint8_t *_p = (uint8_t*)(p);                          \
-                                        \
-    HDcompile_assert(sizeof(double) == 8);                      \
-    HDcompile_assert(sizeof(double) == sizeof(uint64_t));              \
-    HDmemcpy(&_n, &n, sizeof(double));                          \
-    for(_u = 0; _u < sizeof(uint64_t); _u++, _n >>= 8)                  \
-        *_p++ = (uint8_t)(_n & 0xff);                          \
-    (p) = (uint8_t *)(p) + 8;                              \
+#  define H5_ENCODE_DOUBLE(p, n) {					      \
+    uint64_t _n;							      \
+    size_t _u;								      \
+    uint8_t *_p = (uint8_t*)(p);					      \
+									      \
+    HDcompile_assert(sizeof(double) == 8);				      \
+    HDcompile_assert(sizeof(double) == sizeof(uint64_t));		      \
+    HDmemcpy(&_n, &n, sizeof(double));					      \
+    for(_u = 0; _u < sizeof(uint64_t); _u++, _n >>= 8)			      \
+        *_p++ = (uint8_t)(_n & 0xff);					      \
+    (p) = (uint8_t *)(p) + 8;						      \
 }
 
 /* DECODE converts little endian bytes pointed by p to integer values and store
@@ -148,68 +148,68 @@ typedef struct H5F_t H5F_t;
  * correctly even if i is actually a 64bit int like in a Cray.
  */
 
-#  define INT16DECODE(p, i) {                              \
-   (i)    = (int16_t)((*(p) & 0xff));      (p)++;                      \
+#  define INT16DECODE(p, i) {						      \
+   (i)	= (int16_t)((*(p) & 0xff));      (p)++;				      \
    (i) |= (int16_t)(((*(p) & 0xff) << 8) |                                    \
-                   ((*(p) & 0x80) ? ~0xffff : 0x0)); (p)++;              \
+                   ((*(p) & 0x80) ? ~0xffff : 0x0)); (p)++;		      \
 }
 
-#  define UINT16DECODE(p, i) {                              \
-   (i)    = (uint16_t) (*(p) & 0xff);      (p)++;                  \
-   (i) |= (uint16_t)((*(p) & 0xff) << 8); (p)++;                  \
+#  define UINT16DECODE(p, i) {						      \
+   (i)	= (uint16_t) (*(p) & 0xff);	  (p)++;			      \
+   (i) |= (uint16_t)((*(p) & 0xff) << 8); (p)++;			      \
 }
 
-#  define INT32DECODE(p, i) {                              \
-   (i)    = ((int32_t)(*(p) & (unsigned)0xff));      (p)++;              \
-   (i) |= ((int32_t)(*(p) & (unsigned)0xff) <<  8); (p)++;              \
-   (i) |= ((int32_t)(*(p) & (unsigned)0xff) << 16); (p)++;              \
+#  define INT32DECODE(p, i) {						      \
+   (i)	= ((int32_t)(*(p) & (unsigned)0xff));	  (p)++;		      \
+   (i) |= ((int32_t)(*(p) & (unsigned)0xff) <<  8); (p)++;		      \
+   (i) |= ((int32_t)(*(p) & (unsigned)0xff) << 16); (p)++;		      \
    (i) |= ((int32_t)(((*(p) & (unsigned)0xff) << 24) |                        \
                    ((*(p) & (unsigned)0x80) ? (unsigned)(~0xffffffff) : (unsigned)0x0))); (p)++; \
 }
 
-#  define UINT32DECODE(p, i) {                              \
-   (i)    =  (uint32_t)(*(p) & 0xff);       (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) <<  8); (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) << 16); (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) << 24); (p)++;                  \
+#  define UINT32DECODE(p, i) {						      \
+   (i)	=  (uint32_t)(*(p) & 0xff);	   (p)++;			      \
+   (i) |= ((uint32_t)(*(p) & 0xff) <<  8); (p)++;			      \
+   (i) |= ((uint32_t)(*(p) & 0xff) << 16); (p)++;			      \
+   (i) |= ((uint32_t)(*(p) & 0xff) << 24); (p)++;			      \
 }
 
 /* Decode a variable-sized buffer */
 /* (Assumes that the high bits of the integer will be zero) */
-#  define DECODE_VAR(p, n, l) {                              \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += l;                                      \
-   for (_i = 0; _i < l; _i++)                              \
-      n = (n << 8) | *(--p);                              \
-   (p) += l;                                      \
+#  define DECODE_VAR(p, n, l) {						      \
+   size_t _i;								      \
+									      \
+   n = 0;								      \
+   (p) += l;								      \
+   for (_i = 0; _i < l; _i++)						      \
+      n = (n << 8) | *(--p);						      \
+   (p) += l;								      \
 }
 
 /* Decode a variable-sized buffer into a 32-bit unsigned integer */
 /* (Assumes that the high bits of the integer will be zero) */
 #  define UINT32DECODE_VAR(p, n, l)     DECODE_VAR(p, n, l)
 
-#  define INT64DECODE(p, n) {                              \
-   /* WE DON'T CHECK FOR OVERFLOW! */                          \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += 8;                                      \
-   for (_i = 0; _i < sizeof(int64_t); _i++)                          \
-      n = (n << 8) | *(--p);                              \
-   (p) += 8;                                      \
+#  define INT64DECODE(p, n) {						      \
+   /* WE DON'T CHECK FOR OVERFLOW! */					      \
+   size_t _i;								      \
+									      \
+   n = 0;								      \
+   (p) += 8;								      \
+   for (_i = 0; _i < sizeof(int64_t); _i++)					      \
+      n = (n << 8) | *(--p);						      \
+   (p) += 8;								      \
 }
 
-#  define UINT64DECODE(p, n) {                              \
-   /* WE DON'T CHECK FOR OVERFLOW! */                          \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += 8;                                      \
-   for (_i = 0; _i < sizeof(uint64_t); _i++)                      \
-      n = (n << 8) | *(--p);                              \
-   (p) += 8;                                      \
+#  define UINT64DECODE(p, n) {						      \
+   /* WE DON'T CHECK FOR OVERFLOW! */					      \
+   size_t _i;								      \
+									      \
+   n = 0;								      \
+   (p) += 8;								      \
+   for (_i = 0; _i < sizeof(uint64_t); _i++)				      \
+      n = (n << 8) | *(--p);						      \
+   (p) += 8;								      \
 }
 
 /* Decode a variable-sized buffer into a 64-bit unsigned integer */
@@ -218,58 +218,58 @@ typedef struct H5F_t H5F_t;
 
 /* Decode a 64-bit unsigned integer and its length from a variable-sized buffer */
 /* (Assumes that the high bits of the integer will be zero) */
-#  define UINT64DECODE_VARLEN(p, n) {                          \
-   unsigned _s = *(p)++;                              \
-                                        \
-   UINT64DECODE_VAR(p, n, _s);                              \
+#  define UINT64DECODE_VARLEN(p, n) {					      \
+   unsigned _s = *(p)++;						      \
+									      \
+   UINT64DECODE_VAR(p, n, _s);						      \
 }
 
-#  define H5_DECODE_UNSIGNED(p, n) {                          \
-    HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t));              \
-    UINT32DECODE(p, n)                                  \
+#  define H5_DECODE_UNSIGNED(p, n) {					      \
+    HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t));		      \
+    UINT32DECODE(p, n)							      \
 }
 
 /* Assumes the endianness of uint64_t is the same as double */
-#  define H5_DECODE_DOUBLE(p, n) {                          \
-    uint64_t _n;                                  \
-    size_t _u;                                      \
-                                        \
-    HDcompile_assert(sizeof(double) == 8);                      \
-    HDcompile_assert(sizeof(double) == sizeof(uint64_t));              \
-    _n = 0;                                      \
-    (p) += 8;                                      \
-    for(_u = 0; _u < sizeof(uint64_t); _u++)                      \
-        _n = (_n << 8) | *(--p);                          \
-    HDmemcpy(&(n), &_n, sizeof(double));                          \
-    (p) += 8;                                      \
+#  define H5_DECODE_DOUBLE(p, n) {					      \
+    uint64_t _n;							      \
+    size_t _u;								      \
+									      \
+    HDcompile_assert(sizeof(double) == 8);				      \
+    HDcompile_assert(sizeof(double) == sizeof(uint64_t));		      \
+    _n = 0;								      \
+    (p) += 8;								      \
+    for(_u = 0; _u < sizeof(uint64_t); _u++)				      \
+        _n = (_n << 8) | *(--p);					      \
+    HDmemcpy(&(n), &_n, sizeof(double));					      \
+    (p) += 8;								      \
 }
 
 /* Address-related macros */
-#define H5F_addr_overflow(X,Z)    (HADDR_UNDEF==(X) ||                  \
-                HADDR_UNDEF==(X)+(haddr_t)(Z) ||          \
-                (X)+(haddr_t)(Z)<(X))
-#define H5F_addr_defined(X)    ((X)!=HADDR_UNDEF)
+#define H5F_addr_overflow(X,Z)	(HADDR_UNDEF==(X) ||			      \
+				 HADDR_UNDEF==(X)+(haddr_t)(Z) ||	      \
+				 (X)+(haddr_t)(Z)<(X))
+#define H5F_addr_defined(X)	((X)!=HADDR_UNDEF)
 /* The H5F_addr_eq() macro guarantees that Y is not HADDR_UNDEF by making
  * certain that X is not HADDR_UNDEF and then checking that X equals Y
  */
-#define H5F_addr_eq(X,Y)    ((X)!=HADDR_UNDEF &&                  \
-                (X)==(Y))
-#define H5F_addr_ne(X,Y)    (!H5F_addr_eq((X),(Y)))
-#define H5F_addr_lt(X,Y)     ((X)!=HADDR_UNDEF &&                  \
-                (Y)!=HADDR_UNDEF &&                  \
-                (X)<(Y))
-#define H5F_addr_le(X,Y)    ((X)!=HADDR_UNDEF &&                  \
-                (Y)!=HADDR_UNDEF &&                  \
-                (X)<=(Y))
-#define H5F_addr_gt(X,Y)    ((X)!=HADDR_UNDEF &&                  \
-                (Y)!=HADDR_UNDEF &&                  \
-                (X)>(Y))
-#define H5F_addr_ge(X,Y)    ((X)!=HADDR_UNDEF &&                  \
-                (Y)!=HADDR_UNDEF &&                  \
-                (X)>=(Y))
-#define H5F_addr_cmp(X,Y)    (H5F_addr_eq((X), (Y)) ? 0 :              \
-                (H5F_addr_lt((X), (Y)) ? -1 : 1))
-#define H5F_addr_pow2(N)    ((haddr_t)1<<(N))
+#define H5F_addr_eq(X,Y)	((X)!=HADDR_UNDEF &&			      \
+				 (X)==(Y))
+#define H5F_addr_ne(X,Y)	(!H5F_addr_eq((X),(Y)))
+#define H5F_addr_lt(X,Y) 	((X)!=HADDR_UNDEF &&			      \
+				 (Y)!=HADDR_UNDEF &&			      \
+				 (X)<(Y))
+#define H5F_addr_le(X,Y)	((X)!=HADDR_UNDEF &&			      \
+				 (Y)!=HADDR_UNDEF &&			      \
+				 (X)<=(Y))
+#define H5F_addr_gt(X,Y)	((X)!=HADDR_UNDEF &&			      \
+				 (Y)!=HADDR_UNDEF &&			      \
+				 (X)>(Y))
+#define H5F_addr_ge(X,Y)	((X)!=HADDR_UNDEF &&			      \
+				 (Y)!=HADDR_UNDEF &&			      \
+				 (X)>=(Y))
+#define H5F_addr_cmp(X,Y)	(H5F_addr_eq((X), (Y)) ? 0 :		      \
+				 (H5F_addr_lt((X), (Y)) ? -1 : 1))
+#define H5F_addr_pow2(N)	((haddr_t)1<<(N))
 #define H5F_addr_overlap(O1,L1,O2,L2) (((O1) < (O2) && ((O1) + (L1)) > (O2)) || \
                                  ((O1) >= (O2) && (O1) < ((O2) + (L2))))
 
@@ -294,7 +294,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_BASE_ADDR(F)        ((F)->shared->sblock->base_addr)
 #define H5F_SYM_LEAF_K(F)       ((F)->shared->sblock->sym_leaf_k)
 #define H5F_KVALUE(F,T)         ((F)->shared->sblock->btree_k[(T)->id])
-#define H5F_NREFS(F)        ((F)->shared->nrefs)
+#define H5F_NREFS(F)		((F)->shared->nrefs)
 #define H5F_SIZEOF_ADDR(F)      ((F)->shared->sizeof_addr)
 #define H5F_SIZEOF_SIZE(F)      ((F)->shared->sizeof_size)
 #define H5F_SOHM_ADDR(F)        ((F)->shared->sohm_addr)
@@ -325,8 +325,8 @@ typedef struct H5F_t H5F_t;
 #define H5F_USE_MDC_LOGGING(F)  ((F)->shared->use_mdc_logging)
 #define H5F_START_MDC_LOG_ON_ACCESS(F)  ((F)->shared->start_mdc_log_on_access)
 #define H5F_MDC_LOG_LOCATION(F) ((F)->shared->mdc_log_location)
-#define H5F_ALIGNMENT(F)       ((F)->shared->alignment)
-#define H5F_THRESHOLD(F)       ((F)->shared->threshold)
+#define H5F_ALIGNMENT(F)   	((F)->shared->alignment)
+#define H5F_THRESHOLD(F)   	((F)->shared->threshold)
 #define H5F_PGEND_META_THRES(F) ((F)->shared->fs.pgend_meta_thres)
 #define H5F_POINT_OF_NO_RETURN(F) ((F)->shared->fs.point_of_no_return)
 #define H5F_FIRST_ALLOC_DEALLOC(F) ((F)->shared->first_alloc_dealloc)
@@ -351,7 +351,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_BASE_ADDR(F)        (H5F_get_base_addr(F))
 #define H5F_SYM_LEAF_K(F)       (H5F_sym_leaf_k(F))
 #define H5F_KVALUE(F,T)         (H5F_Kvalue(F,T))
-#define H5F_NREFS(F)        (H5F_get_nrefs(F))
+#define H5F_NREFS(F)		(H5F_get_nrefs(F))
 #define H5F_SIZEOF_ADDR(F)      (H5F_sizeof_addr(F))
 #define H5F_SIZEOF_SIZE(F)      (H5F_sizeof_size(F))
 #define H5F_SOHM_ADDR(F)        (H5F_get_sohm_addr(F))
@@ -382,8 +382,8 @@ typedef struct H5F_t H5F_t;
 #define H5F_USE_MDC_LOGGING(F)  (H5F_use_mdc_logging(F))
 #define H5F_START_MDC_LOG_ON_ACCESS(F)  (H5F_start_mdc_log_on_access(F))
 #define H5F_MDC_LOG_LOCATION(F) (H5F_mdc_log_location(F))
-#define H5F_ALIGNMENT(F)        (H5F_get_alignment(F))
-#define H5F_THRESHOLD(F)        (H5F_get_threshold(F))
+#define H5F_ALIGNMENT(F)    	(H5F_get_alignment(F))
+#define H5F_THRESHOLD(F)    	(H5F_get_threshold(F))
 #define H5F_PGEND_META_THRES(F) (H5F_get_pgend_meta_thres(F))
 #define H5F_POINT_OF_NO_RETURN(F) (H5F_get_point_of_no_return(F))
 #define H5F_FIRST_ALLOC_DEALLOC(F) (H5F_get_first_alloc_dealloc(F))
@@ -392,32 +392,32 @@ typedef struct H5F_t H5F_t;
 
 
 /* Macros to encode/decode offset/length's for storing in the file */
-#define H5F_ENCODE_OFFSET(f,p,o) switch(H5F_SIZEOF_ADDR(f)) {              \
-    case 4: UINT32ENCODE(p,o); break;                          \
-    case 8: UINT64ENCODE(p,o); break;                          \
-    case 2: UINT16ENCODE(p,o); break;                          \
+#define H5F_ENCODE_OFFSET(f,p,o) switch(H5F_SIZEOF_ADDR(f)) {		      \
+    case 4: UINT32ENCODE(p,o); break;					      \
+    case 8: UINT64ENCODE(p,o); break;					      \
+    case 2: UINT16ENCODE(p,o); break;					      \
 }
 
-#define H5F_DECODE_OFFSET(f,p,o) switch (H5F_SIZEOF_ADDR (f)) {              \
-    case 4: UINT32DECODE(p, o); break;                          \
-    case 8: UINT64DECODE(p, o); break;                          \
-    case 2: UINT16DECODE(p, o); break;                          \
+#define H5F_DECODE_OFFSET(f,p,o) switch (H5F_SIZEOF_ADDR (f)) {		      \
+    case 4: UINT32DECODE(p, o); break;					      \
+    case 8: UINT64DECODE(p, o); break;					      \
+    case 2: UINT16DECODE(p, o); break;					      \
 }
 
-#define H5F_ENCODE_LENGTH_LEN(p,l,s) switch(s) {                        \
-    case 4: UINT32ENCODE(p,l); break;                          \
-    case 8: UINT64ENCODE(p,l); break;                          \
-    case 2: UINT16ENCODE(p,l); break;                          \
-    default: HDassert("bad sizeof size" && 0);                      \
+#define H5F_ENCODE_LENGTH_LEN(p,l,s) switch(s) {		      	      \
+    case 4: UINT32ENCODE(p,l); break;					      \
+    case 8: UINT64ENCODE(p,l); break;					      \
+    case 2: UINT16ENCODE(p,l); break;					      \
+    default: HDassert("bad sizeof size" && 0);				      \
 }
 
 #define H5F_ENCODE_LENGTH(f,p,l) H5F_ENCODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f))
 
-#define H5F_DECODE_LENGTH_LEN(p,l,s) switch(s) {                      \
-    case 4: UINT32DECODE(p,l); break;                          \
-    case 8: UINT64DECODE(p,l); break;                          \
-    case 2: UINT16DECODE(p,l); break;                          \
-    default: HDassert("bad sizeof size" && 0);                      \
+#define H5F_DECODE_LENGTH_LEN(p,l,s) switch(s) {		              \
+    case 4: UINT32DECODE(p,l); break;					      \
+    case 8: UINT64DECODE(p,l); break;					      \
+    case 2: UINT16DECODE(p,l); break;					      \
+    default: HDassert("bad sizeof size" && 0);				      \
 }
 
 #define H5F_DECODE_LENGTH(f,p,l) H5F_DECODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f))
@@ -427,13 +427,13 @@ typedef struct H5F_t H5F_t;
  * with.
  */
 #if (H5_SIZEOF_SIZE_T >= H5_SIZEOF_OFF_T)
-#   define H5F_OVERFLOW_SIZET2OFFT(X)                          \
+#   define H5F_OVERFLOW_SIZET2OFFT(X)					      \
     ((size_t)(X)>=(size_t)((size_t)1<<(8*sizeof(HDoff_t)-1)))
 #else
 #   define H5F_OVERFLOW_SIZET2OFFT(X) 0
 #endif
 #if (H5_SIZEOF_HSIZE_T >= H5_SIZEOF_OFF_T)
-#   define H5F_OVERFLOW_HSIZET2OFFT(X)                          \
+#   define H5F_OVERFLOW_HSIZET2OFFT(X)					      \
     ((hsize_t)(X) >= (hsize_t)((hsize_t)1 << (8 * sizeof(HDoff_t) - 1)))
 #else
 #   define H5F_OVERFLOW_HSIZET2OFFT(X) 0
@@ -461,14 +461,14 @@ typedef struct H5F_t H5F_t;
 #define H5F_CRT_SHMSG_LIST_MAX_NAME  "shmsg_list_max"   /* Shared message list maximum size */
 #define H5F_CRT_SHMSG_BTREE_MIN_NAME "shmsg_btree_min"  /* Shared message B-tree minimum size */
 #define H5F_CRT_FILE_SPACE_STRATEGY_NAME "file_space_strategy"  /* File space handling strategy */
-#define H5F_CRT_FREE_SPACE_PERSIST_NAME "free_space_persist"      /* Free-space persisting status */
+#define H5F_CRT_FREE_SPACE_PERSIST_NAME "free_space_persist"  	/* Free-space persisting status */
 #define H5F_CRT_FREE_SPACE_THRESHOLD_NAME "free_space_threshold"  /* Free space section threshold */
 #define H5F_CRT_FILE_SPACE_PAGE_SIZE_NAME "file_space_page_size"  /* File space page size */
 
 
 
 /* ========= File Access properties ============ */
-#define H5F_ACS_META_CACHE_INIT_CONFIG_NAME    "mdc_initCacheCfg" /* Initial metadata cache resize configuration */
+#define H5F_ACS_META_CACHE_INIT_CONFIG_NAME	"mdc_initCacheCfg" /* Initial metadata cache resize configuration */
 #define H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME       "rdcc_nslots"   /* Size of raw data chunk cache(slots) */
 #define H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME       "rdcc_nbytes"   /* Size of raw data chunk cache(bytes) */
 #define H5F_ACS_PREEMPT_READ_CHUNKS_NAME        "rdcc_w0"       /* Preemption read chunks first */
@@ -487,7 +487,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_ACS_LATEST_FORMAT_NAME              "latest_format" /* 'Use latest format version' flag */
 #define H5F_ACS_WANT_POSIX_FD_NAME              "want_posix_fd" /* Internal: query the file descriptor from the core VFD, instead of the memory address */
 #define H5F_ACS_METADATA_READ_ATTEMPTS_NAME     "metadata_read_attempts" /* # of metadata read attempts */
-#define H5F_ACS_OBJECT_FLUSH_CB_NAME            "object_flush_cb"      /* Object flush callback */
+#define H5F_ACS_OBJECT_FLUSH_CB_NAME            "object_flush_cb" 	 /* Object flush callback */
 #define H5F_ACS_EFC_SIZE_NAME                   "efc_size"      /* Size of external file cache */
 #define H5F_ACS_FILE_IMAGE_INFO_NAME            "file_image_info" /* struct containing initial file image and callback info */
 #define H5F_ACS_CLEAR_STATUS_FLAGS_NAME         "clear_status_flags" /* Whether to clear superblock status_flags (private property only used by h5clear) */
@@ -504,7 +504,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_NAME   "page_buffer_min_raw_perc" /* the min raw data percentage for the page buffer cache */
 
 /* ======================== File Mount properties ====================*/
-#define H5F_MNT_SYM_LOCAL_NAME         "local"                 /* Whether absolute symlinks local to file. */
+#define H5F_MNT_SYM_LOCAL_NAME 		"local"                 /* Whether absolute symlinks local to file. */
 
 
 #ifdef H5_HAVE_PARALLEL
@@ -513,20 +513,20 @@ typedef struct H5F_t H5F_t;
 #endif /* H5_HAVE_PARALLEL */
 
 /* Define the HDF5 file signature */
-#define H5F_SIGNATURE      "\211HDF\r\n\032\n"
+#define H5F_SIGNATURE	  "\211HDF\r\n\032\n"
 #define H5F_SIGNATURE_LEN 8
 
 /* Version #'s of the major components of the file format */
-#define HDF5_SUPERBLOCK_VERSION_DEF    0    /* The default super block format      */
-#define HDF5_SUPERBLOCK_VERSION_1    1    /* Version with non-default B-tree 'K' value */
-#define HDF5_SUPERBLOCK_VERSION_2    2    /* Revised version with superblock extension and checksum */
-#define HDF5_SUPERBLOCK_VERSION_3    3    /* With file locking and consistency flags (at least this version for SWMR support) */
-#define HDF5_SUPERBLOCK_VERSION_LATEST    HDF5_SUPERBLOCK_VERSION_3    /* The maximum super block format    */
+#define HDF5_SUPERBLOCK_VERSION_DEF	0	/* The default super block format	  */
+#define HDF5_SUPERBLOCK_VERSION_1	1	/* Version with non-default B-tree 'K' value */
+#define HDF5_SUPERBLOCK_VERSION_2	2	/* Revised version with superblock extension and checksum */
+#define HDF5_SUPERBLOCK_VERSION_3	3	/* With file locking and consistency flags (at least this version for SWMR support) */
+#define HDF5_SUPERBLOCK_VERSION_LATEST	HDF5_SUPERBLOCK_VERSION_3	/* The maximum super block format    */
 #define HDF5_SUPERBLOCK_VERSION_V18_LATEST HDF5_SUPERBLOCK_VERSION_2    /* The latest superblock version for v18 */
-#define HDF5_FREESPACE_VERSION            0    /* of the Free-Space Info      */
-#define HDF5_OBJECTDIR_VERSION            0    /* of the Object Directory format */
-#define HDF5_SHAREDHEADER_VERSION       0    /* of the Shared-Header Info      */
-#define HDF5_DRIVERINFO_VERSION_0       0    /* of the Driver Information Block*/
+#define HDF5_FREESPACE_VERSION	        0	/* of the Free-Space Info	  */
+#define HDF5_OBJECTDIR_VERSION	        0	/* of the Object Directory format */
+#define HDF5_SHAREDHEADER_VERSION       0	/* of the Shared-Header Info	  */
+#define HDF5_DRIVERINFO_VERSION_0       0	/* of the Driver Information Block*/
 
 /* B-tree internal 'K' values */
 #define HDF5_BTREE_SNODE_IK_DEF         16
@@ -536,54 +536,54 @@ typedef struct H5F_t H5F_t;
                                                     if it is changed, the code
                                                     must compensate. -QAK
                                                  */
-#define HDF5_BTREE_IK_MAX_ENTRIES       65536     /* 2^16 - 2 bytes for storing entries (children) */
-                        /* See format specification on version 1 B-trees */
+#define HDF5_BTREE_IK_MAX_ENTRIES       65536 	/* 2^16 - 2 bytes for storing entries (children) */
+						/* See format specification on version 1 B-trees */
 
 /* Default file space handling strategy */
-#define H5F_FILE_SPACE_STRATEGY_DEF            H5F_FSPACE_STRATEGY_FSM_AGGR
+#define H5F_FILE_SPACE_STRATEGY_DEF	        H5F_FSPACE_STRATEGY_FSM_AGGR
 
 /* Default free space section threshold used by free-space managers */
-#define H5F_FREE_SPACE_PERSIST_DEF            FALSE
+#define H5F_FREE_SPACE_PERSIST_DEF	        FALSE
 
 /* Default free space section threshold used by free-space managers */
-#define H5F_FREE_SPACE_THRESHOLD_DEF            1
+#define H5F_FREE_SPACE_THRESHOLD_DEF	        1
 
 /* For paged aggregation: default file space page size when not set */
-#define H5F_FILE_SPACE_PAGE_SIZE_DEF         4096
+#define H5F_FILE_SPACE_PAGE_SIZE_DEF     	4096    
 /* For paged aggregation: minimum value for file space page size */
-#define H5F_FILE_SPACE_PAGE_SIZE_MIN         512
+#define H5F_FILE_SPACE_PAGE_SIZE_MIN     	512
 /* For paged aggregation: maxiumum value for file space page size: 1 gigabyte */
-#define H5F_FILE_SPACE_PAGE_SIZE_MAX         1024*1024*1024
+#define H5F_FILE_SPACE_PAGE_SIZE_MAX     	1024*1024*1024
 
 /* For paged aggregation: drop free-space with size <= this threshold for small meta section */
 #define H5F_FILE_SPACE_PGEND_META_THRES  0
 
 /* Default for threshold for alignment (can be set via H5Pset_alignment()) */
-#define H5F_ALIGN_DEF            1
+#define H5F_ALIGN_DEF			1
 /* Default for alignment (can be set via H5Pset_alignment()) */
-#define H5F_ALIGN_THRHD_DEF        1
+#define H5F_ALIGN_THRHD_DEF		1
 /* Default size for meta data aggregation block (can be set via H5Pset_meta_block_size()) */
-#define H5F_META_BLOCK_SIZE_DEF        2048
+#define H5F_META_BLOCK_SIZE_DEF		2048
 /* Default size for small data aggregation block (can be set via H5Pset_small_data_block_size()) */
-#define H5F_SDATA_BLOCK_SIZE_DEF    2048
+#define H5F_SDATA_BLOCK_SIZE_DEF	2048
 
 /* Check for file using paged aggregation */
 #define H5F_PAGED_AGGR(F) (F->shared->fs_strategy == H5F_FSPACE_STRATEGY_PAGE && F->shared->fs_page_size)
 
 /* Metadata read attempt values */
-#define H5F_METADATA_READ_ATTEMPTS        1    /* Default # of read attempts for non-SWMR access */
-#define H5F_SWMR_METADATA_READ_ATTEMPTS        100    /* Default # of read attempts for SWMR access */
+#define H5F_METADATA_READ_ATTEMPTS		1	/* Default # of read attempts for non-SWMR access */
+#define H5F_SWMR_METADATA_READ_ATTEMPTS		100	/* Default # of read attempts for SWMR access */
 
 
 /* Macros to define signatures of all objects in the file */
 
 /* Size of signature information (on disk) */
 /* (all on-disk signatures should be this length) */
-#define H5_SIZEOF_MAGIC                   4
+#define H5_SIZEOF_MAGIC                 4
 
 /* Size of checksum information (on disk) */
 /* (all on-disk checksums should be this length) */
-#define H5_SIZEOF_CHKSUM                  4
+#define H5_SIZEOF_CHKSUM              	4
 
 /* v1 B-tree node signature */
 #define H5B_MAGIC                       "TREE"
@@ -704,11 +704,11 @@ typedef enum H5F_fs_state_t {
 typedef enum H5F_mem_page_t {
     H5F_MEM_PAGE_DEFAULT = 0,       /* Not used */
     H5F_MEM_PAGE_SUPER = 1,
-    H5F_MEM_PAGE_BTREE = 2,
-    H5F_MEM_PAGE_DRAW = 3,
-    H5F_MEM_PAGE_GHEAP = 4,
-    H5F_MEM_PAGE_LHEAP = 5,
-    H5F_MEM_PAGE_OHDR = 6,
+    H5F_MEM_PAGE_BTREE = 2,          
+    H5F_MEM_PAGE_DRAW = 3, 
+    H5F_MEM_PAGE_GHEAP = 4,      
+    H5F_MEM_PAGE_LHEAP = 5,      
+    H5F_MEM_PAGE_OHDR = 6,      
     H5F_MEM_PAGE_LARGE_SUPER = 7,
     H5F_MEM_PAGE_LARGE_BTREE = 8,
     H5F_MEM_PAGE_LARGE_DRAW = 9,
diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index 4765d00..61b4183 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -144,7 +144,7 @@ H5F_get_actual_name(const H5F_t *f)
  * Function: H5F_get_extpath
  *
  * Purpose:  Retrieve the file's 'extpath' flags
- *           This is used by H5L_extern_traverse() and H5D_build_file_prefix() to retrieve the main file's location
+ *           This is used by H5L_extern_traverse() and H5D_build_extfile_prefix() to retrieve the main file's location
  *           when searching the target file.
  *
  * Return:   'extpath' on success/abort on failure (shouldn't fail)
diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c
index da06297..494de3e 100644
--- a/src/H5Pdapl.c
+++ b/src/H5Pdapl.c
@@ -71,17 +71,6 @@
 #define H5D_ACS_VDS_PRINTF_GAP_DEF              (hsize_t)0
 #define H5D_ACS_VDS_PRINTF_GAP_ENC              H5P__encode_hsize_t
 #define H5D_ACS_VDS_PRINTF_GAP_DEC              H5P__decode_hsize_t
-/* Definitions for VDS file prefix */
-#define H5D_ACS_VDS_PREFIX_SIZE                 sizeof(char *)
-#define H5D_ACS_VDS_PREFIX_DEF                  NULL /*default is no prefix */
-#define H5D_ACS_VDS_PREFIX_SET                  H5P__dapl_vds_file_pref_set
-#define H5D_ACS_VDS_PREFIX_GET                  H5P__dapl_vds_file_pref_get
-#define H5D_ACS_VDS_PREFIX_ENC                  H5P__dapl_vds_file_pref_enc
-#define H5D_ACS_VDS_PREFIX_DEC                  H5P__dapl_vds_file_pref_dec
-#define H5D_ACS_VDS_PREFIX_DEL                  H5P__dapl_vds_file_pref_del
-#define H5D_ACS_VDS_PREFIX_COPY                 H5P__dapl_vds_file_pref_copy
-#define H5D_ACS_VDS_PREFIX_CMP                  H5P__dapl_vds_file_pref_cmp
-#define H5D_ACS_VDS_PREFIX_CLOSE                H5P__dapl_vds_file_pref_close
 /* Definition for append flush */
 #define H5D_ACS_APPEND_FLUSH_SIZE               sizeof(H5D_append_flush_t)
 #define H5D_ACS_APPEND_FLUSH_DEF                {0,{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},NULL,NULL}
@@ -123,14 +112,6 @@ static herr_t H5P__decode_chunk_cache_nbytes(const void **_pp, void *_value);
 /* Property list callbacks */
 static herr_t H5P__dacc_vds_view_enc(const void *value, void **pp, size_t *size);
 static herr_t H5P__dacc_vds_view_dec(const void **pp, void *value);
-static herr_t H5P__dapl_vds_file_pref_set(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_vds_file_pref_get(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_vds_file_pref_enc(const void *value, void **_pp, size_t *size);
-static herr_t H5P__dapl_vds_file_pref_dec(const void **_pp, void *value);
-static herr_t H5P__dapl_vds_file_pref_del(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_vds_file_pref_copy(const char* name, size_t size, void* value);
-static int H5P__dapl_vds_file_pref_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__dapl_vds_file_pref_close(const char* name, size_t size, void* value);
 
 /* Property list callbacks */
 static herr_t H5P__dapl_efile_pref_set(hid_t prop_id, const char* name, size_t size, void* value);
@@ -179,7 +160,6 @@ const H5P_libclass_t H5P_CLS_DACC[1] = {{
 /* Property value defaults */
 static const H5D_append_flush_t H5D_def_append_flush_g = H5D_ACS_APPEND_FLUSH_DEF;   /* Default setting for append flush */
 static const char *H5D_def_efile_prefix_g = H5D_ACS_EFILE_PREFIX_DEF;                /* Default external file prefix string */
-static const char *H5D_def_vds_prefix_g = H5D_ACS_VDS_PREFIX_DEF;                    /* Default vds prefix string */
 
 
 /*-------------------------------------------------------------------------
@@ -230,12 +210,6 @@ H5P__dacc_reg_prop(H5P_genclass_t *pclass)
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    /* Register property for vds prefix */
-    if(H5P_register_real(pclass, H5D_ACS_VDS_PREFIX_NAME, H5D_ACS_VDS_PREFIX_SIZE, &H5D_def_vds_prefix_g,
-            NULL, H5D_ACS_VDS_PREFIX_SET, H5D_ACS_VDS_PREFIX_GET, H5D_ACS_VDS_PREFIX_ENC, H5D_ACS_VDS_PREFIX_DEC,
-            H5D_ACS_VDS_PREFIX_DEL, H5D_ACS_VDS_PREFIX_COPY, H5D_ACS_VDS_PREFIX_CMP, H5D_ACS_VDS_PREFIX_CLOSE) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-
     /* Register info for append flush */
     /* (Note: this property should not have an encode/decode callback -QAK) */
     if(H5P_register_real(pclass, H5D_ACS_APPEND_FLUSH_NAME, H5D_ACS_APPEND_FLUSH_SIZE, &H5D_def_append_flush_g,
@@ -252,254 +226,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dacc_reg_prop() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_set
- *
- * Purpose:     Copies a vds file prefix property when it's set
- *              for a property list
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
-{
-    FUNC_ENTER_STATIC_NOERR
-
-    /* Sanity check */
-    HDassert(value);
-
-    /* Copy the prefix */
-    *(char **)value = H5MM_xstrdup(*(const char **)value);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_set() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_get
- *
- * Purpose:     Copies a vds file prefix property when it's retrieved
- *              from a property list
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
-{
-    FUNC_ENTER_STATIC_NOERR
-
-    /* Sanity check */
-    HDassert(value);
-
-    /* Copy the prefix */
-    *(char **)value = H5MM_xstrdup(*(const char **)value);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_get() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_enc
- *
- * Purpose:     Callback routine which is called whenever the vds file flags
- *              property in the dataset access property list is
- *              encoded.
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_enc(const void *value, void **_pp, size_t *size)
-{
-    const char *vds_file_pref = *(const char * const *)value;
-    uint8_t **pp = (uint8_t **)_pp;
-    size_t len = 0;
-    uint64_t enc_value;
-    unsigned enc_size;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t));
-
-    /* calculate prefix length */
-    if(NULL != vds_file_pref)
-        len = HDstrlen(vds_file_pref);
-
-    enc_value = (uint64_t)len;
-    enc_size = H5VM_limit_enc_size(enc_value);
-    HDassert(enc_size < 256);
-
-    if(NULL != *pp) {
-        /* encode the length of the prefix */
-        *(*pp)++ = (uint8_t)enc_size;
-        UINT64ENCODE_VAR(*pp, enc_value, enc_size);
-
-        /* encode the prefix */
-        if(NULL != vds_file_pref) {
-            HDmemcpy(*(char **)pp, vds_file_pref, len);
-            *pp += len;
-        } /* end if */
-    } /* end if */
-
-    *size += (1 + enc_size);
-    if(NULL != vds_file_pref)
-        *size += len;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_enc() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_dec
- *
- * Purpose:     Callback routine which is called whenever the vds file prefix
- *              property in the dataset access property list is
- *              decoded.
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_dec(const void **_pp, void *_value)
-{
-    char **vds_file_pref = (char **)_value;
-    const uint8_t **pp = (const uint8_t **)_pp;
-    size_t len;
-    uint64_t enc_value;                 /* Decoded property value */
-    unsigned enc_size;                  /* Size of encoded property */
-    herr_t ret_value = SUCCEED;
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    HDassert(pp);
-    HDassert(*pp);
-    HDassert(vds_file_pref);
-    HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t));
-
-    /* Decode the size */
-    enc_size = *(*pp)++;
-    HDassert(enc_size < 256);
-
-    /* Decode the value */
-    UINT64DECODE_VAR(*pp, enc_value, enc_size);
-    len = (size_t)enc_value;
-
-    if(0 != len) {
-        /* Make a copy of the user's prefix string */
-        if(NULL == (*vds_file_pref = (char *)H5MM_malloc(len + 1)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "memory allocation failed for prefix")
-        HDstrncpy(*vds_file_pref, *(const char **)pp, len);
-        (*vds_file_pref)[len] = '\0';
-
-        *pp += len;
-    } /* end if */
-    else
-        *vds_file_pref = NULL;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5P__dapl_vds_file_pref_dec() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_del
- *
- * Purpose:     Frees memory used to store the vds file prefix string
- *
- * Return:      SUCCEED (Can't fail)
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    HDassert(value);
-
-    H5MM_xfree(*(void **)value);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_del() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_copy
- *
- * Purpose:     Creates a copy of the vds file prefix string
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    HDassert(value);
-
-    *(char **)value = H5MM_xstrdup(*(const char **)value);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_copy() */
-
-
-/*-------------------------------------------------------------------------
- * Function:       H5P__dapl_vds_file_pref_cmp
- *
- * Purpose:        Callback routine which is called whenever the vds file prefix
- *                 property in the dataset creation property list is
- *                 compared.
- *
- * Return:         zero if VALUE1 and VALUE2 are equal, non zero otherwise.
- *-------------------------------------------------------------------------
- */
-static int
-H5P__dapl_vds_file_pref_cmp(const void *value1, const void *value2, size_t H5_ATTR_UNUSED size)
-{
-    const char *pref1 = *(const char * const *)value1;
-    const char *pref2 = *(const char * const *)value2;
-    int ret_value = 0;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    if(NULL == pref1 && NULL != pref2)
-        HGOTO_DONE(1);
-    if(NULL != pref1 && NULL == pref2)
-        HGOTO_DONE(-1);
-    if(NULL != pref1 && NULL != pref2)
-        ret_value = HDstrcmp(pref1, pref2);
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5P__dapl_vds_file_pref_cmp() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5P__dapl_vds_file_pref_close
- *
- * Purpose:     Frees memory used to store the vds file prefix string
- *
- * Return:      SUCCEED/FAIL
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P__dapl_vds_file_pref_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    HDassert(value);
-
-    H5MM_xfree(*(void **)value);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5P__dapl_vds_file_pref_close() */
-
 
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_set
@@ -1494,95 +1220,3 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_efile_prefix() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5Pset_virtual_prefix
- *
- * Purpose:     Set a prefix to be applied to the path of any vds files
- *              traversed.
-  *
- *              If the prefix starts with ${ORIGIN}, this will be replaced by
- *              the absolute path of the directory of the HDF5 file containing
- *              the dataset.
- *
- *              If the prefix is ".", no prefix will be applied.
- *
- *              This property can be overwritten by the environment variable
- *              HDF5_VDS_PREFIX.
- *
- * Return:    Non-negative on success/Negative on failure
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_virtual_prefix(hid_t plist_id, const char *prefix)
-{
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "i*s", plist_id, prefix);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-
-    /* Set prefix */
-    if(H5P_set(plist, H5D_ACS_VDS_PREFIX_NAME, &prefix) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set prefix info")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_virtual_prefix() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5Pget_virtual_prefix
- *
- * Purpose:    Gets the prefix to be applied to any vds file
- *              traversals made using this property list.
- *
- *              If the pointer is not NULL, it points to a user-allocated
- *              buffer.
- *
- * Return:    Non-negative on success/Negative on failure
- *-------------------------------------------------------------------------
- */
-ssize_t
-H5Pget_virtual_prefix(hid_t plist_id, char *prefix, size_t size)
-{
-    H5P_genplist_t *plist;              /* Property list pointer */
-    char           *my_prefix;          /* Library's copy of the prefix */
-    size_t          len;                /* Length of prefix string */
-    ssize_t         ret_value;          /* Return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE3("Zs", "i*sz", plist_id, prefix, size);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-
-    /* Get the current prefix */
-    if(H5P_peek(plist, H5D_ACS_VDS_PREFIX_NAME, &my_prefix) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get vds file prefix")
-
-    /* Check for prefix being set */
-    if(my_prefix) {
-        /* Copy to user's buffer, if given */
-        len = HDstrlen(my_prefix);
-        if(prefix) {
-            HDstrncpy(prefix, my_prefix, MIN(len + 1, size));
-            if(len >= size)
-                prefix[size - 1] = '\0';
-        } /* end if */
-    } /* end if */
-    else
-        len = 0;
-
-    /* Set return value */
-    ret_value = (ssize_t)len;
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_virtual_prefix() */
-
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index ea9bfb4..915aa38 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -13,9 +13,9 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:        H5Pfapl.c
+ * Created:		H5Pfapl.c
  *
- * Purpose:        File access property list class routines
+ * Purpose:		File access property list class routines
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@
 #include "H5Ppkg.h"             /* Property lists                       */
 
 /* Includes needed to set as default file driver */
-#include "H5FDsec2.h"           /* Posix unbuffered I/O    file driver     */
+#include "H5FDsec2.h"           /* Posix unbuffered I/O	file driver     */
 #include "H5FDstdio.h"          /* Standard C buffered I/O              */
 #ifdef H5_HAVE_WINDOWS
 #include "H5FDwindows.h"        /* Win32 I/O                            */
@@ -54,10 +54,10 @@
 
 /* ========= File Access properties ============ */
 /* Definitions for the initial metadata cache resize configuration */
-#define H5F_ACS_META_CACHE_INIT_CONFIG_SIZE    sizeof(H5AC_cache_config_t)
-#define H5F_ACS_META_CACHE_INIT_CONFIG_DEF    H5AC__DEFAULT_CACHE_CONFIG
-#define H5F_ACS_META_CACHE_INIT_CONFIG_ENC    H5P__facc_cache_config_enc
-#define H5F_ACS_META_CACHE_INIT_CONFIG_DEC    H5P__facc_cache_config_dec
+#define H5F_ACS_META_CACHE_INIT_CONFIG_SIZE	sizeof(H5AC_cache_config_t)
+#define H5F_ACS_META_CACHE_INIT_CONFIG_DEF	H5AC__DEFAULT_CACHE_CONFIG
+#define H5F_ACS_META_CACHE_INIT_CONFIG_ENC	H5P__facc_cache_config_enc
+#define H5F_ACS_META_CACHE_INIT_CONFIG_DEC	H5P__facc_cache_config_dec
 #define H5F_ACS_META_CACHE_INIT_CONFIG_CMP      H5P__facc_cache_config_cmp
 /* Definitions for size of raw data chunk cache(slots) */
 #define H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE       sizeof(size_t)
@@ -118,10 +118,10 @@
 #define H5F_ACS_FILE_DRV_CMP                    H5P__facc_file_driver_cmp
 #define H5F_ACS_FILE_DRV_CLOSE                  H5P__facc_file_driver_close
 /* Definition for file close degree */
-#define H5F_CLOSE_DEGREE_SIZE                sizeof(H5F_close_degree_t)
-#define H5F_CLOSE_DEGREE_DEF                H5F_CLOSE_DEFAULT
-#define H5F_CLOSE_DEGREE_ENC                H5P__facc_fclose_degree_enc
-#define H5F_CLOSE_DEGREE_DEC                H5P__facc_fclose_degree_dec
+#define H5F_CLOSE_DEGREE_SIZE		        sizeof(H5F_close_degree_t)
+#define H5F_CLOSE_DEGREE_DEF		        H5F_CLOSE_DEFAULT
+#define H5F_CLOSE_DEGREE_ENC		        H5P__facc_fclose_degree_enc
+#define H5F_CLOSE_DEGREE_DEC		        H5P__facc_fclose_degree_dec
 /* Definition for offset position in file for family file driver */
 #define H5F_ACS_FAMILY_OFFSET_SIZE              sizeof(hsize_t)
 #define H5F_ACS_FAMILY_OFFSET_DEF               0
@@ -175,12 +175,12 @@
 #define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_ENC       H5P__encode_size_t
 #define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEC       H5P__decode_size_t
 /* Definition for # of metadata read attempts */
-#define H5F_ACS_METADATA_READ_ATTEMPTS_SIZE    sizeof(unsigned)
-#define H5F_ACS_METADATA_READ_ATTEMPTS_DEF         0
-#define H5F_ACS_METADATA_READ_ATTEMPTS_ENC         H5P__encode_unsigned
-#define H5F_ACS_METADATA_READ_ATTEMPTS_DEC         H5P__decode_unsigned
+#define H5F_ACS_METADATA_READ_ATTEMPTS_SIZE	sizeof(unsigned)
+#define H5F_ACS_METADATA_READ_ATTEMPTS_DEF     	0
+#define H5F_ACS_METADATA_READ_ATTEMPTS_ENC     	H5P__encode_unsigned
+#define H5F_ACS_METADATA_READ_ATTEMPTS_DEC     	H5P__decode_unsigned
 /* Definition for object flush callback */
-#define H5F_ACS_OBJECT_FLUSH_CB_SIZE        sizeof(H5F_object_flush_t)
+#define H5F_ACS_OBJECT_FLUSH_CB_SIZE		sizeof(H5F_object_flush_t)
 #define H5F_ACS_OBJECT_FLUSH_CB_DEF             {NULL, NULL}
 /* Definition for status_flags in the superblock */
 #define H5F_ACS_CLEAR_STATUS_FLAGS_SIZE         sizeof(hbool_t)
@@ -309,21 +309,21 @@ static herr_t H5P__facc_cache_image_config_dec(const void **_pp, void *_value);
 
 /* File access property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FACC[1] = {{
-    "file access",        /* Class name for debugging     */
+    "file access",		/* Class name for debugging     */
     H5P_TYPE_FILE_ACCESS,       /* Class type                   */
 
-    &H5P_CLS_ROOT_g,        /* Parent class                 */
-    &H5P_CLS_FILE_ACCESS_g,    /* Pointer to class             */
-    &H5P_CLS_FILE_ACCESS_ID_g,    /* Pointer to class ID          */
-    &H5P_LST_FILE_ACCESS_ID_g,    /* Pointer to default property list ID */
-    H5P__facc_reg_prop,        /* Default property registration routine */
-
-    NULL,            /* Class creation callback      */
-    NULL,                /* Class creation callback info */
-    NULL,            /* Class copy callback          */
-    NULL,                /* Class copy callback info     */
-    NULL,            /* Class close callback         */
-    NULL                 /* Class close callback info    */
+    &H5P_CLS_ROOT_g,		/* Parent class                 */
+    &H5P_CLS_FILE_ACCESS_g,	/* Pointer to class             */
+    &H5P_CLS_FILE_ACCESS_ID_g,	/* Pointer to class ID          */
+    &H5P_LST_FILE_ACCESS_ID_g,	/* Pointer to default property list ID */
+    H5P__facc_reg_prop,		/* Default property registration routine */
+
+    NULL,			/* Class creation callback      */
+    NULL,		        /* Class creation callback info */
+    NULL,			/* Class copy callback          */
+    NULL,		        /* Class copy callback info     */
+    NULL,			/* Class close callback         */
+    NULL 		        /* Class close callback info    */
 }};
 
 
@@ -395,149 +395,149 @@ H5P__facc_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register the initial metadata cache resize configuration */
-    if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE, &H5F_def_mdc_initCacheCfg_g,
-            NULL, NULL, NULL, H5F_ACS_META_CACHE_INIT_CONFIG_ENC, H5F_ACS_META_CACHE_INIT_CONFIG_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE, &H5F_def_mdc_initCacheCfg_g, 
+            NULL, NULL, NULL, H5F_ACS_META_CACHE_INIT_CONFIG_ENC, H5F_ACS_META_CACHE_INIT_CONFIG_DEC, 
             NULL, NULL, H5F_ACS_META_CACHE_INIT_CONFIG_CMP, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of raw data chunk cache (elements) */
-    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE, &H5F_def_rdcc_nslots_g,
-            NULL, NULL, NULL, H5F_ACS_DATA_CACHE_NUM_SLOTS_ENC, H5F_ACS_DATA_CACHE_NUM_SLOTS_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE, &H5F_def_rdcc_nslots_g, 
+            NULL, NULL, NULL, H5F_ACS_DATA_CACHE_NUM_SLOTS_ENC, H5F_ACS_DATA_CACHE_NUM_SLOTS_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of raw data chunk cache(bytes) */
-    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE, &H5F_def_rdcc_nbytes_g,
-            NULL, NULL, NULL, H5F_ACS_DATA_CACHE_BYTE_SIZE_ENC, H5F_ACS_DATA_CACHE_BYTE_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE, &H5F_def_rdcc_nbytes_g, 
+            NULL, NULL, NULL, H5F_ACS_DATA_CACHE_BYTE_SIZE_ENC, H5F_ACS_DATA_CACHE_BYTE_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the preemption for reading chunks */
-    if(H5P_register_real(pclass, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, H5F_ACS_PREEMPT_READ_CHUNKS_SIZE, &H5F_def_rdcc_w0_g,
-            NULL, NULL, NULL, H5F_ACS_PREEMPT_READ_CHUNKS_ENC, H5F_ACS_PREEMPT_READ_CHUNKS_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, H5F_ACS_PREEMPT_READ_CHUNKS_SIZE, &H5F_def_rdcc_w0_g, 
+            NULL, NULL, NULL, H5F_ACS_PREEMPT_READ_CHUNKS_ENC, H5F_ACS_PREEMPT_READ_CHUNKS_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the threshold for alignment */
-    if(H5P_register_real(pclass, H5F_ACS_ALIGN_THRHD_NAME, H5F_ACS_ALIGN_THRHD_SIZE, &H5F_def_threshold_g,
-            NULL, NULL, NULL, H5F_ACS_ALIGN_THRHD_ENC, H5F_ACS_ALIGN_THRHD_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_ALIGN_THRHD_NAME, H5F_ACS_ALIGN_THRHD_SIZE, &H5F_def_threshold_g, 
+            NULL, NULL, NULL, H5F_ACS_ALIGN_THRHD_ENC, H5F_ACS_ALIGN_THRHD_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the alignment */
-    if(H5P_register_real(pclass, H5F_ACS_ALIGN_NAME, H5F_ACS_ALIGN_SIZE, &H5F_def_alignment_g,
-            NULL, NULL, NULL, H5F_ACS_ALIGN_ENC, H5F_ACS_ALIGN_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_ALIGN_NAME, H5F_ACS_ALIGN_SIZE, &H5F_def_alignment_g, 
+            NULL, NULL, NULL, H5F_ACS_ALIGN_ENC, H5F_ACS_ALIGN_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the minimum metadata allocation block size */
-    if(H5P_register_real(pclass, H5F_ACS_META_BLOCK_SIZE_NAME, H5F_ACS_META_BLOCK_SIZE_SIZE, &H5F_def_meta_block_size_g,
-            NULL, NULL, NULL, H5F_ACS_META_BLOCK_SIZE_ENC, H5F_ACS_META_BLOCK_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_META_BLOCK_SIZE_NAME, H5F_ACS_META_BLOCK_SIZE_SIZE, &H5F_def_meta_block_size_g, 
+            NULL, NULL, NULL, H5F_ACS_META_BLOCK_SIZE_ENC, H5F_ACS_META_BLOCK_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the maximum sieve buffer size */
-    if(H5P_register_real(pclass, H5F_ACS_SIEVE_BUF_SIZE_NAME, H5F_ACS_SIEVE_BUF_SIZE_SIZE, &H5F_def_sieve_buf_size_g,
-            NULL, NULL, NULL, H5F_ACS_SIEVE_BUF_SIZE_ENC, H5F_ACS_SIEVE_BUF_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_SIEVE_BUF_SIZE_NAME, H5F_ACS_SIEVE_BUF_SIZE_SIZE, &H5F_def_sieve_buf_size_g, 
+            NULL, NULL, NULL, H5F_ACS_SIEVE_BUF_SIZE_ENC, H5F_ACS_SIEVE_BUF_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the minimum "small data" allocation block size */
-    if(H5P_register_real(pclass, H5F_ACS_SDATA_BLOCK_SIZE_NAME, H5F_ACS_SDATA_BLOCK_SIZE_SIZE, &H5F_def_sdata_block_size_g,
-            NULL, NULL, NULL, H5F_ACS_SDATA_BLOCK_SIZE_ENC, H5F_ACS_SDATA_BLOCK_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_SDATA_BLOCK_SIZE_NAME, H5F_ACS_SDATA_BLOCK_SIZE_SIZE, &H5F_def_sdata_block_size_g, 
+            NULL, NULL, NULL, H5F_ACS_SDATA_BLOCK_SIZE_ENC, H5F_ACS_SDATA_BLOCK_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the garbage collection reference */
-    if(H5P_register_real(pclass, H5F_ACS_GARBG_COLCT_REF_NAME, H5F_ACS_GARBG_COLCT_REF_SIZE, &H5F_def_gc_ref_g,
-            NULL, NULL, NULL, H5F_ACS_GARBG_COLCT_REF_ENC, H5F_ACS_GARBG_COLCT_REF_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_GARBG_COLCT_REF_NAME, H5F_ACS_GARBG_COLCT_REF_SIZE, &H5F_def_gc_ref_g, 
+            NULL, NULL, NULL, H5F_ACS_GARBG_COLCT_REF_ENC, H5F_ACS_GARBG_COLCT_REF_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file driver ID & info */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_FILE_DRV_NAME, H5F_ACS_FILE_DRV_SIZE, &def_driver_prop,
+    if(H5P_register_real(pclass, H5F_ACS_FILE_DRV_NAME, H5F_ACS_FILE_DRV_SIZE, &def_driver_prop, 
             H5F_ACS_FILE_DRV_CRT, H5F_ACS_FILE_DRV_SET, H5F_ACS_FILE_DRV_GET, NULL, NULL,
             H5F_ACS_FILE_DRV_DEL, H5F_ACS_FILE_DRV_COPY, H5F_ACS_FILE_DRV_CMP, H5F_ACS_FILE_DRV_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file close degree */
-    if(H5P_register_real(pclass, H5F_ACS_CLOSE_DEGREE_NAME, H5F_CLOSE_DEGREE_SIZE, &H5F_def_close_degree_g,
-            NULL, NULL, NULL, H5F_CLOSE_DEGREE_ENC, H5F_CLOSE_DEGREE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_CLOSE_DEGREE_NAME, H5F_CLOSE_DEGREE_SIZE, &H5F_def_close_degree_g, 
+            NULL, NULL, NULL, H5F_CLOSE_DEGREE_ENC, H5F_CLOSE_DEGREE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the offset of family driver info */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_OFFSET_NAME, H5F_ACS_FAMILY_OFFSET_SIZE, &H5F_def_family_offset_g,
-            NULL, NULL, NULL, H5F_ACS_FAMILY_OFFSET_ENC, H5F_ACS_FAMILY_OFFSET_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_FAMILY_OFFSET_NAME, H5F_ACS_FAMILY_OFFSET_SIZE, &H5F_def_family_offset_g, 
+            NULL, NULL, NULL, H5F_ACS_FAMILY_OFFSET_ENC, H5F_ACS_FAMILY_OFFSET_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of new family file size. It's used by h5repart only. */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_NEWSIZE_NAME, H5F_ACS_FAMILY_NEWSIZE_SIZE, &H5F_def_family_newsize_g,
+    if(H5P_register_real(pclass, H5F_ACS_FAMILY_NEWSIZE_NAME, H5F_ACS_FAMILY_NEWSIZE_SIZE, &H5F_def_family_newsize_g, 
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of whether convert family to sec2 driver. It's used by h5repart only. */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_TO_SEC2_NAME, H5F_ACS_FAMILY_TO_SEC2_SIZE, &H5F_def_family_to_sec2_g,
+    if(H5P_register_real(pclass, H5F_ACS_FAMILY_TO_SEC2_NAME, H5F_ACS_FAMILY_TO_SEC2_SIZE, &H5F_def_family_to_sec2_g, 
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the data type of multi driver info */
-    if(H5P_register_real(pclass, H5F_ACS_MULTI_TYPE_NAME, H5F_ACS_MULTI_TYPE_SIZE, &H5F_def_mem_type_g,
-            NULL, NULL, NULL, H5F_ACS_MULTI_TYPE_ENC, H5F_ACS_MULTI_TYPE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_MULTI_TYPE_NAME, H5F_ACS_MULTI_TYPE_SIZE, &H5F_def_mem_type_g, 
+            NULL, NULL, NULL, H5F_ACS_MULTI_TYPE_ENC, H5F_ACS_MULTI_TYPE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 'use the latest version of the format' flag */
-    if(H5P_register_real(pclass, H5F_ACS_LATEST_FORMAT_NAME, H5F_ACS_LATEST_FORMAT_SIZE, &H5F_def_latest_format_g,
-            NULL, NULL, NULL, H5F_ACS_LATEST_FORMAT_ENC, H5F_ACS_LATEST_FORMAT_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_LATEST_FORMAT_NAME, H5F_ACS_LATEST_FORMAT_SIZE, &H5F_def_latest_format_g, 
+            NULL, NULL, NULL, H5F_ACS_LATEST_FORMAT_ENC, H5F_ACS_LATEST_FORMAT_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of whether to retrieve the file descriptor from the core VFD */
     /* (used internally to the library only) */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_WANT_POSIX_FD_NAME, H5F_ACS_WANT_POSIX_FD_SIZE, &H5F_def_want_posix_fd_g,
+    if(H5P_register_real(pclass, H5F_ACS_WANT_POSIX_FD_NAME, H5F_ACS_WANT_POSIX_FD_SIZE, &H5F_def_want_posix_fd_g, 
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the external file cache size */
-    if(H5P_register_real(pclass, H5F_ACS_EFC_SIZE_NAME, H5F_ACS_EFC_SIZE_SIZE, &H5F_def_efc_size_g,
-            NULL, NULL, NULL, H5F_ACS_EFC_SIZE_ENC, H5F_ACS_EFC_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_EFC_SIZE_NAME, H5F_ACS_EFC_SIZE_SIZE, &H5F_def_efc_size_g, 
+            NULL, NULL, NULL, H5F_ACS_EFC_SIZE_ENC, H5F_ACS_EFC_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the initial file image info */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_FILE_IMAGE_INFO_NAME, H5F_ACS_FILE_IMAGE_INFO_SIZE, &H5F_def_file_image_info_g,
+    if(H5P_register_real(pclass, H5F_ACS_FILE_IMAGE_INFO_NAME, H5F_ACS_FILE_IMAGE_INFO_SIZE, &H5F_def_file_image_info_g, 
             NULL, H5F_ACS_FILE_IMAGE_INFO_SET, H5F_ACS_FILE_IMAGE_INFO_GET, NULL, NULL,
             H5F_ACS_FILE_IMAGE_INFO_DEL, H5F_ACS_FILE_IMAGE_INFO_COPY, H5F_ACS_FILE_IMAGE_INFO_CMP, H5F_ACS_FILE_IMAGE_INFO_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the core VFD backing store write tracking flag */
-    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE, &H5F_def_core_write_tracking_flag_g,
-            NULL, NULL, NULL, H5F_ACS_CORE_WRITE_TRACKING_FLAG_ENC, H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE, &H5F_def_core_write_tracking_flag_g, 
+            NULL, NULL, NULL, H5F_ACS_CORE_WRITE_TRACKING_FLAG_ENC, H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of the core VFD backing store page size */
-    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE, &H5F_def_core_write_tracking_page_size_g,
-            NULL, NULL, NULL, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_ENC, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE, &H5F_def_core_write_tracking_page_size_g, 
+            NULL, NULL, NULL, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_ENC, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the # of read attempts */
-    if(H5P_register_real(pclass, H5F_ACS_METADATA_READ_ATTEMPTS_NAME, H5F_ACS_METADATA_READ_ATTEMPTS_SIZE, &H5F_def_metadata_read_attempts_g,
-            NULL, NULL, NULL, H5F_ACS_METADATA_READ_ATTEMPTS_ENC, H5F_ACS_METADATA_READ_ATTEMPTS_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_METADATA_READ_ATTEMPTS_NAME, H5F_ACS_METADATA_READ_ATTEMPTS_SIZE, &H5F_def_metadata_read_attempts_g, 
+            NULL, NULL, NULL, H5F_ACS_METADATA_READ_ATTEMPTS_ENC, H5F_ACS_METADATA_READ_ATTEMPTS_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register object flush callback */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5F_ACS_OBJECT_FLUSH_CB_NAME, H5F_ACS_OBJECT_FLUSH_CB_SIZE, &H5F_def_object_flush_cb_g,
+    if(H5P_register_real(pclass, H5F_ACS_OBJECT_FLUSH_CB_NAME, H5F_ACS_OBJECT_FLUSH_CB_SIZE, &H5F_def_object_flush_cb_g, 
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -563,44 +563,44 @@ H5P__facc_reg_prop(H5P_genclass_t *pclass)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the evict on close flag */
-    if(H5P_register_real(pclass, H5F_ACS_EVICT_ON_CLOSE_FLAG_NAME, H5F_ACS_EVICT_ON_CLOSE_FLAG_SIZE, &H5F_def_evict_on_close_flag_g,
-            NULL, NULL, NULL, H5F_ACS_EVICT_ON_CLOSE_FLAG_ENC, H5F_ACS_EVICT_ON_CLOSE_FLAG_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_EVICT_ON_CLOSE_FLAG_NAME, H5F_ACS_EVICT_ON_CLOSE_FLAG_SIZE, &H5F_def_evict_on_close_flag_g, 
+            NULL, NULL, NULL, H5F_ACS_EVICT_ON_CLOSE_FLAG_ENC, H5F_ACS_EVICT_ON_CLOSE_FLAG_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 #ifdef H5_HAVE_PARALLEL
     /* Register the metadata collective read flag */
-    if(H5P_register_real(pclass, H5_COLL_MD_READ_FLAG_NAME, H5F_ACS_COLL_MD_READ_FLAG_SIZE, &H5F_def_coll_md_read_flag_g,
-            NULL, NULL, NULL, H5F_ACS_COLL_MD_READ_FLAG_ENC, H5F_ACS_COLL_MD_READ_FLAG_DEC,
+    if(H5P_register_real(pclass, H5_COLL_MD_READ_FLAG_NAME, H5F_ACS_COLL_MD_READ_FLAG_SIZE, &H5F_def_coll_md_read_flag_g, 
+            NULL, NULL, NULL, H5F_ACS_COLL_MD_READ_FLAG_ENC, H5F_ACS_COLL_MD_READ_FLAG_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the metadata collective write flag */
-    if(H5P_register_real(pclass, H5F_ACS_COLL_MD_WRITE_FLAG_NAME, H5F_ACS_COLL_MD_WRITE_FLAG_SIZE, &H5F_def_coll_md_write_flag_g,
-            NULL, NULL, NULL, H5F_ACS_COLL_MD_WRITE_FLAG_ENC, H5F_ACS_COLL_MD_WRITE_FLAG_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_COLL_MD_WRITE_FLAG_NAME, H5F_ACS_COLL_MD_WRITE_FLAG_SIZE, &H5F_def_coll_md_write_flag_g, 
+            NULL, NULL, NULL, H5F_ACS_COLL_MD_WRITE_FLAG_ENC, H5F_ACS_COLL_MD_WRITE_FLAG_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 #endif /* H5_HAVE_PARALLEL */
 
     /* Register the initial metadata cache image configuration */
-    if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_SIZE, &H5F_def_mdc_initCacheImageCfg_g,
-            NULL, NULL, NULL, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_ENC, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_SIZE, &H5F_def_mdc_initCacheImageCfg_g, 
+            NULL, NULL, NULL, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_ENC, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_DEC, 
             NULL, NULL, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_CMP, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of the page buffer size */
-    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_SIZE_NAME, H5F_ACS_PAGE_BUFFER_SIZE_SIZE, &H5F_def_page_buf_size_g,
-            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_SIZE_ENC, H5F_ACS_PAGE_BUFFER_SIZE_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_SIZE_NAME, H5F_ACS_PAGE_BUFFER_SIZE_SIZE, &H5F_def_page_buf_size_g, 
+            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_SIZE_ENC, H5F_ACS_PAGE_BUFFER_SIZE_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
     /* Register the size of the page buffer minimum metadata size */
-    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_NAME, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_SIZE, &H5F_def_page_buf_min_meta_perc_g,
-            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_ENC, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_NAME, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_SIZE, &H5F_def_page_buf_min_meta_perc_g, 
+            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_ENC, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
     /* Register the size of the page buffer minimum raw data size */
-    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_NAME, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_SIZE, &H5F_def_page_buf_min_raw_perc_g,
-            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_ENC, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_DEC,
+    if(H5P_register_real(pclass, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_NAME, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_SIZE, &H5F_def_page_buf_min_raw_perc_g, 
+            NULL, NULL, NULL, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_ENC, H5F_ACS_PAGE_BUFFER_MIN_RAW_PERC_DEC, 
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -610,33 +610,33 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_alignment
+ * Function:	H5Pset_alignment
  *
- * Purpose:    Sets the alignment properties of a file access property list
- *        so that any file object >= THRESHOLD bytes will be aligned on
- *        an address which is a multiple of ALIGNMENT.  The addresses
- *        are relative to the end of the user block; the alignment is
- *        calculated by subtracting the user block size from the
- *        absolute file address and then adjusting the address to be a
- *        multiple of ALIGNMENT.
+ * Purpose:	Sets the alignment properties of a file access property list
+ *		so that any file object >= THRESHOLD bytes will be aligned on
+ *		an address which is a multiple of ALIGNMENT.  The addresses
+ *		are relative to the end of the user block; the alignment is
+ *		calculated by subtracting the user block size from the
+ *		absolute file address and then adjusting the address to be a
+ *		multiple of ALIGNMENT.
  *
- *        Default values for THRESHOLD and ALIGNMENT are one, implying
- *        no alignment.  Generally the default values will result in
- *        the best performance for single-process access to the file.
- *        For MPI-IO and other parallel systems, choose an alignment
- *        which is a multiple of the disk block size.
+ *		Default values for THRESHOLD and ALIGNMENT are one, implying
+ *		no alignment.  Generally the default values will result in
+ *		the best performance for single-process access to the file.
+ *		For MPI-IO and other parallel systems, choose an alignment
+ *		which is a multiple of the disk block size.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, June  9, 1998
  *
  * Modifications:
  *
- *        Raymond Lu
- *        Tuesday, Oct 23, 2001
- *        Changed file access property list mechanism to the new
- *        generic property list.
+ *		Raymond Lu
+ *		Tuesday, Oct 23, 2001
+ *		Changed file access property list mechanism to the new
+ *		generic property list.
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -668,15 +668,15 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_alignment
+ * Function:	H5Pget_alignment
  *
- * Purpose:    Returns the current settings for alignment properties from a
- *        file access property list.  The THRESHOLD and/or ALIGNMENT
- *        pointers may be null pointers.
+ * Purpose:	Returns the current settings for alignment properties from a
+ *		file access property list.  The THRESHOLD and/or ALIGNMENT
+ *		pointers may be null pointers.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, June  9, 1998
  *
  *-------------------------------------------------------------------------
@@ -709,20 +709,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5P_set_driver
+ * Function:	H5P_set_driver
  *
- * Purpose:    Set the file driver (DRIVER_ID) for a file access
- *        property list (PLIST_ID) and supply an optional
- *        struct containing the driver-specific properites
- *        (DRIVER_INFO).  The driver properties will be copied into the
- *        property list and the reference count on the driver will be
- *        incremented, allowing the caller to close the driver ID but
- *        still use the property list.
+ * Purpose:	Set the file driver (DRIVER_ID) for a file access 
+ *		property list (PLIST_ID) and supply an optional
+ *		struct containing the driver-specific properites
+ *		(DRIVER_INFO).  The driver properties will be copied into the
+ *		property list and the reference count on the driver will be
+ *		incremented, allowing the caller to close the driver ID but
+ *		still use the property list.
  *
- * Return:    Success:    Non-negative
- *        Failure:    Negative
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, August  3, 1999
  *
  *-------------------------------------------------------------------------
@@ -757,20 +757,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_driver
+ * Function:	H5Pset_driver
  *
- * Purpose:    Set the file driver (DRIVER_ID) for a file access
- *        property list (PLIST_ID) and supply an optional
- *        struct containing the driver-specific properites
- *        (DRIVER_INFO).  The driver properties will be copied into the
- *        property list and the reference count on the driver will be
- *        incremented, allowing the caller to close the driver ID but
- *        still use the property list.
+ * Purpose:	Set the file driver (DRIVER_ID) for a file access 
+ *		property list (PLIST_ID) and supply an optional
+ *		struct containing the driver-specific properites
+ *		(DRIVER_INFO).  The driver properties will be copied into the
+ *		property list and the reference count on the driver will be
+ *		incremented, allowing the caller to close the driver ID but
+ *		still use the property list.
  *
- * Return:    Success:    Non-negative
- *        Failure:    Negative
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, August  3, 1999
  *
  *-------------------------------------------------------------------------
@@ -800,20 +800,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5P_peek_driver
+ * Function:	H5P_peek_driver
  *
- * Purpose:    Return the ID of the low-level file driver.  PLIST_ID should
- *        be a file access property list.
+ * Purpose:	Return the ID of the low-level file driver.  PLIST_ID should
+ *		be a file access property list.
  *
- * Return:    Success:    A low-level driver ID which is the same ID
- *                used when the driver was set for the property
- *                list. The driver ID is only valid as long as
- *                the file driver remains registered.
+ * Return:	Success:	A low-level driver ID which is the same ID
+ *				used when the driver was set for the property
+ *				list. The driver ID is only valid as long as
+ *				the file driver remains registered.
  *
- *        Failure:    Negative
+ *		Failure:	Negative
  *
- * Programmer:    Robb Matzke
- *        Thursday, February 26, 1998
+ * Programmer:	Robb Matzke
+ *		Thursday, February 26, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -844,22 +844,22 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_driver
+ * Function:	H5Pget_driver
  *
- * Purpose:    Return the ID of the low-level file driver.  PLIST_ID should
- *        be a file access property list.
+ * Purpose:	Return the ID of the low-level file driver.  PLIST_ID should
+ *		be a file access property list.
  *
- * Note:    The ID returned should not be closed.
+ * Note:	The ID returned should not be closed.
  *
- * Return:    Success:    A low-level driver ID which is the same ID
- *                used when the driver was set for the property
- *                list. The driver ID is only valid as long as
- *                the file driver remains registered.
+ * Return:	Success:	A low-level driver ID which is the same ID
+ *				used when the driver was set for the property
+ *				list. The driver ID is only valid as long as
+ *				the file driver remains registered.
  *
- *        Failure:    Negative
+ *		Failure:	Negative
  *
- * Programmer:    Robb Matzke
- *        Thursday, February 26, 1998
+ * Programmer:	Robb Matzke
+ *		Thursday, February 26, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -867,7 +867,7 @@ hid_t
 H5Pget_driver(hid_t plist_id)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    hid_t    ret_value;      /* Return value */
+    hid_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", plist_id);
@@ -885,20 +885,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5P_peek_driver_info
+ * Function:	H5P_peek_driver_info
  *
- * Purpose:    Returns a pointer directly to the file driver-specific
- *        information of a file access.
+ * Purpose:	Returns a pointer directly to the file driver-specific
+ *		information of a file access.
  *
- * Return:    Success:    Ptr to *uncopied* driver specific data
- *                structure if any.
+ * Return:	Success:	Ptr to *uncopied* driver specific data
+ *				structure if any.
  *
- *        Failure:    NULL. Null is also returned if the driver has
- *                not registered any driver-specific properties
- *                although no error is pushed on the stack in
- *                this case.
+ *		Failure:	NULL. Null is also returned if the driver has
+ *				not registered any driver-specific properties
+ *				although no error is pushed on the stack in
+ *				this case.
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -927,20 +927,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_driver_info
+ * Function:	H5Pget_driver_info
  *
- * Purpose:    Returns a pointer directly to the file driver-specific
- *        information of a file access.
+ * Purpose:	Returns a pointer directly to the file driver-specific
+ *		information of a file access.
  *
- * Return:    Success:    Ptr to *uncopied* driver specific data
- *                structure if any.
+ * Return:	Success:	Ptr to *uncopied* driver specific data
+ *				structure if any.
  *
- *        Failure:    NULL. Null is also returned if the driver has
- *                not registered any driver-specific properties
- *                although no error is pushed on the stack in
- *                this case.
+ *		Failure:	NULL. Null is also returned if the driver has
+ *				not registered any driver-specific properties
+ *				although no error is pushed on the stack in
+ *				this case.
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -973,7 +973,7 @@ done:
  *
  * Note:        This is an "in-place" copy, since this routine gets called
  *              after the top-level copy has been performed and this routine
- *        finishes the "deep" part of the copy.
+ *		finishes the "deep" part of the copy.
  *
  * Return:      Success:        Non-negative
  *              Failure:        Negative
@@ -1486,30 +1486,30 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_cache
+ * Function:	H5Pset_cache
  *
- * Purpose:    Set the number of objects in the meta data cache and the
- *        maximum number of chunks and bytes in the raw data chunk
- *        cache.
+ * Purpose:	Set the number of objects in the meta data cache and the
+ *		maximum number of chunks and bytes in the raw data chunk
+ *		cache.
  *
- *         The RDCC_W0 value should be between 0 and 1 inclusive and
- *        indicates how much chunks that have been fully read or fully
- *        written are favored for preemption.  A value of zero means
- *        fully read or written chunks are treated no differently than
- *        other chunks (the preemption is strictly LRU) while a value
- *        of one means fully read chunks are always preempted before
- *        other chunks.
+ * 		The RDCC_W0 value should be between 0 and 1 inclusive and
+ *		indicates how much chunks that have been fully read or fully
+ *		written are favored for preemption.  A value of zero means
+ *		fully read or written chunks are treated no differently than
+ *		other chunks (the preemption is strictly LRU) while a value
+ *		of one means fully read chunks are always preempted before
+ *		other chunks.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, May 19, 1998
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Pset_cache(hid_t plist_id, int H5_ATTR_UNUSED mdc_nelmts,
-        size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
+	     size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
@@ -1540,24 +1540,24 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_cache
+ * Function:	H5Pget_cache
  *
- * Purpose:    Retrieves the maximum possible number of elements in the meta
- *        data cache and the maximum possible number of elements and
- *        bytes and the RDCC_W0 value in the raw data chunk cache.  Any
- *        (or all) arguments may be null pointers in which case the
- *        corresponding datum is not returned.
+ * Purpose:	Retrieves the maximum possible number of elements in the meta
+ *		data cache and the maximum possible number of elements and
+ *		bytes and the RDCC_W0 value in the raw data chunk cache.  Any
+ *		(or all) arguments may be null pointers in which case the
+ *		corresponding datum is not returned.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Tuesday, May 19, 1998
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
-        size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
+	     size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
@@ -1592,14 +1592,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_mdc_image_config
+ * Function:	H5Pset_mdc_image_config
  *
- * Purpose:    Set the initial metadata cache image configuration in the
- *        target FAPL.
+ * Purpose:	Set the initial metadata cache image configuration in the
+ *		target FAPL.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    J. Mainzer
+ * Programmer:	J. Mainzer
  *              Thursday, June 25, 2015
  *
  *-------------------------------------------------------------------------
@@ -1636,18 +1636,18 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_mdc_image_config
+ * Function:	H5Pget_mdc_image_config
  *
- * Purpose:    Retrieve the metadata cache initial image configuration
- *        from the target FAPL.
+ * Purpose:	Retrieve the metadata cache initial image configuration
+ *		from the target FAPL.
  *
- *        Observe that the function will fail if config_ptr is
- *        NULL, or if config_ptr->version specifies an unknown
- *        version of H5AC_cache_image_config_t.
+ *		Observe that the function will fail if config_ptr is
+ *		NULL, or if config_ptr->version specifies an unknown
+ *		version of H5AC_cache_image_config_t.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    J. Mainzer
+ * Programmer:	J. Mainzer
  *              Friday, June 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -1687,14 +1687,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_mdc_config
+ * Function:	H5Pset_mdc_config
  *
- * Purpose:    Set the initial metadata cache resize configuration in the
- *        target FAPL.
+ * Purpose:	Set the initial metadata cache resize configuration in the
+ *		target FAPL.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    J. Mainzer
+ * Programmer:	J. Mainzer
  *              Thursday, April 7, 2005
  *
  *-------------------------------------------------------------------------
@@ -1731,18 +1731,18 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_mdc_config
+ * Function:	H5Pget_mdc_config
  *
- * Purpose:    Retrieve the metadata cache initial resize configuration
- *        from the target FAPL.
+ * Purpose:	Retrieve the metadata cache initial resize configuration
+ *		from the target FAPL.
  *
- *        Observe that the function will fail if config_ptr is
- *        NULL, or if config_ptr->version specifies an unknown
- *        version of H5AC_cache_config_t.
+ *		Observe that the function will fail if config_ptr is
+ *		NULL, or if config_ptr->version specifies an unknown
+ *		version of H5AC_cache_config_t.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    J. Mainzer
+ * Programmer:	J. Mainzer
  *              Thursday, April 7, 2005
  *
  *-------------------------------------------------------------------------
@@ -1782,33 +1782,33 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_gc_references
+ * Function:	H5Pset_gc_references
  *
- * Purpose:    Sets the flag for garbage collecting references for the file.
- *        Dataset region references (and other reference types
- *        probably) use space in the file heap.  If garbage collection
- *        is on and the user passes in an uninitialized value in a
- *        reference structure, the heap might get corrupted.  When
- *        garbage collection is off however and the user re-uses a
- *        reference, the previous heap block will be orphaned and not
- *        returned to the free heap space.  When garbage collection is
- *        on, the user must initialize the reference structures to 0 or
- *        risk heap corruption.
+ * Purpose:	Sets the flag for garbage collecting references for the file.
+ *		Dataset region references (and other reference types
+ *		probably) use space in the file heap.  If garbage collection
+ *		is on and the user passes in an uninitialized value in a
+ *		reference structure, the heap might get corrupted.  When
+ *		garbage collection is off however and the user re-uses a
+ *		reference, the previous heap block will be orphaned and not
+ *		returned to the free heap space.  When garbage collection is
+ *		on, the user must initialize the reference structures to 0 or
+ *		risk heap corruption.
  *
- *        Default value for garbage collecting references is off, just
- *        to be on the safe side.
+ *		Default value for garbage collecting references is off, just
+ *		to be on the safe side.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
- *        June, 1999
+ * Programmer:	Quincey Koziol
+ *		June, 1999
  *
  * Modifications:
  *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ * 		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -1835,22 +1835,22 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_gc_references
+ * Function:	H5Pget_gc_references
  *
- * Purpose:    Returns the current setting for the garbage collection
- *        references property from a file access property list.
+ * Purpose:	Returns the current setting for the garbage collection
+ *		references property from a file access property list.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              June, 1999
  *
  * Modifications:
  *
- *        Raymond Lu
- *        Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ *		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -1949,31 +1949,31 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_meta_block_size
+ * Function:	H5Pset_meta_block_size
  *
- * Purpose:    Sets the minimum size of metadata block allocations when
+ * Purpose:	Sets the minimum size of metadata block allocations when
  *      the H5FD_FEAT_AGGREGATE_METADATA is set by a VFL driver.
  *      Each "raw" metadata block is allocated to be this size and then
  *      specific pieces of metadata (object headers, local heaps, B-trees, etc)
  *      are sub-allocated from this block.
  *
- *        The default value is set to 2048 (bytes), indicating that metadata
+ *		The default value is set to 2048 (bytes), indicating that metadata
  *      will be attempted to be bunched together in (at least) 2K blocks in
  *      the file.  Setting the value to 0 with this API function will
  *      turn off the metadata aggregation, even if the VFL driver attempts to
  *      use that strategy.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Friday, August 25, 2000
  *
  * Modifications:
  *
- *        Raymond Lu
- *        Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ *		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -2000,22 +2000,22 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_meta_block_size
+ * Function:	H5Pget_meta_block_size
  *
- * Purpose:    Returns the current settings for the metadata block allocation
+ * Purpose:	Returns the current settings for the metadata block allocation
  *      property from a file access property list.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Friday, August 29, 2000
  *
  * Modifications:
  *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ * 		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -2044,31 +2044,31 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_sieve_buf_size
+ * Function:	H5Pset_sieve_buf_size
  *
- * Purpose:    Sets the maximum size of the data seive buffer used for file
+ * Purpose:	Sets the maximum size of the data seive buffer used for file
  *      drivers which are capable of using data sieving.  The data sieve
  *      buffer is used when performing I/O on datasets in the file.  Using a
  *      buffer which is large anough to hold several pieces of the dataset
  *      being read in for hyperslab selections boosts performance by quite a
  *      bit.
  *
- *        The default value is set to 64KB, indicating that file I/O for raw data
+ *		The default value is set to 64KB, indicating that file I/O for raw data
  *      reads and writes will occur in at least 64KB blocks.
  *      Setting the value to 0 with this API function will turn off the
  *      data sieving, even if the VFL driver attempts to use that strategy.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Thursday, September 21, 2000
  *
  * Modifications:
  *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ * 		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -2095,22 +2095,22 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_sieve_buf_size
+ * Function:	H5Pget_sieve_buf_size
  *
- * Purpose:    Returns the current settings for the data sieve buffer size
+ * Purpose:	Returns the current settings for the data sieve buffer size
  *      property from a file access property list.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Thursday, September 21, 2000
  *
  * Modifications:
  *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
+ *		Raymond Lu
+ * 		Tuesday, Oct 23, 2001
+ *		Changed the file access list to the new generic property
+ *		list.
  *
  *-------------------------------------------------------------------------
  */
@@ -2138,23 +2138,23 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_small_data_block_size
+ * Function:	H5Pset_small_data_block_size
  *
- * Purpose:    Sets the minimum size of "small" raw data block allocations
+ * Purpose:	Sets the minimum size of "small" raw data block allocations
  *      when the H5FD_FEAT_AGGREGATE_SMALLDATA is set by a VFL driver.
  *      Each "small" raw data block is allocated to be this size and then
  *      pieces of raw data which are small enough to fit are sub-allocated from
  *      this block.
  *
- *    The default value is set to 2048 (bytes), indicating that raw data
+ *	The default value is set to 2048 (bytes), indicating that raw data
  *      smaller than this value will be attempted to be bunched together in (at
  *      least) 2K blocks in the file.  Setting the value to 0 with this API
  *      function will turn off the "small" raw data aggregation, even if the
  *      VFL driver attempts to use that strategy.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Wednesday, June 5, 2002
  *
  * Modifications:
@@ -2184,14 +2184,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_small_data_block_size
+ * Function:	H5Pget_small_data_block_size
  *
- * Purpose:    Returns the current settings for the "small" raw data block
+ * Purpose:	Returns the current settings for the "small" raw data block
  *      allocation property from a file access property list.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Wednesday, June 5, 2002
  *
  * Modifications:
@@ -2223,9 +2223,9 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_libver_bounds
+ * Function:	H5Pset_libver_bounds
  *
- * Purpose:    Indicates which versions of the file format the library should
+ * Purpose:	Indicates which versions of the file format the library should
  *      use when creating objects.  LOW is the earliest version of the HDF5
  *      library that is guaranteed to be able to access the objects created
  *      (the format of some objects in an HDF5 file may not have changed between
@@ -2301,9 +2301,9 @@ done:
  *      releases and then map down to the previous actual library release which
  *      had a format change.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Sunday, December 30, 2007
  *
  *-------------------------------------------------------------------------
@@ -2341,14 +2341,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_libver_bounds
+ * Function:	H5Pget_libver_bounds
  *
- * Purpose:    Returns the current settings for the library version format bounds
+ * Purpose:	Returns the current settings for the library version format bounds
  *      from a file access property list.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Thursday, January 3, 2008
  *
  *-------------------------------------------------------------------------
@@ -2464,9 +2464,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function: H5Pset_file_image
  *
- * Purpose:     Sets the initial file image. Some file drivers can initialize
- *              the starting data in a file from a buffer.
- *
+ * Purpose:     Sets the initial file image. Some file drivers can initialize 
+ *              the starting data in a file from a buffer. 
+ *              
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Jacob Gruber
@@ -2480,22 +2480,22 @@ H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len)
     H5P_genplist_t *fapl;               /* Property list pointer */
     H5FD_file_image_info_t image_info;  /* File image info */
     herr_t ret_value = SUCCEED;         /* Return value */
-
+    
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*xz", fapl_id, buf_ptr, buf_len);
 
     /* validate parameters */
     if(!(((buf_ptr == NULL) && (buf_len == 0)) || ((buf_ptr != NULL) && (buf_len > 0))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "inconsistant buf_ptr and buf_len")
-
+   
     /* Get the plist structure */
     if(NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-
+        
     /* Get old image info */
     if(H5P_peek(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get old file image pointer")
-
+        
     /* Release previous buffer, if it exists */
     if(image_info.buffer != NULL) {
         if(image_info.callbacks.image_free) {
@@ -2504,8 +2504,8 @@ H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len)
         } /* end if */
         else
             H5MM_xfree(image_info.buffer);
-    } /* end if */
-
+    } /* end if */  
+    
     /* Update struct */
     if(buf_ptr) {
         /* Allocate memory */
@@ -2517,15 +2517,15 @@ H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len)
          else
             if(NULL == (image_info.buffer = H5MM_malloc(buf_len)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory block")
-
+    
         /* Copy data */
         if(image_info.callbacks.image_memcpy) {
-            if(image_info.buffer != image_info.callbacks.image_memcpy(image_info.buffer,
-                   buf_ptr, buf_len, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET,
+            if(image_info.buffer != image_info.callbacks.image_memcpy(image_info.buffer, 
+                   buf_ptr, buf_len, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET, 
                    image_info.callbacks.udata))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
+	        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
         } /* end if */
-    else
+	else
             HDmemcpy(image_info.buffer, buf_ptr, buf_len);
     } /* end if */
     else
@@ -2545,24 +2545,24 @@ done:
 /*-------------------------------------------------------------------------
  * Function: H5Pget_file_image
  *
- * Purpose:     If the file image exists and buf_ptr_ptr is not NULL,
- *        allocate a buffer of the correct size, copy the image into
- *        the new buffer, and return the buffer to the caller in
- *        *buf_ptr_ptr.  Do this using the file image callbacks
- *        if defined.
+ * Purpose:     If the file image exists and buf_ptr_ptr is not NULL, 
+ *		allocate a buffer of the correct size, copy the image into 
+ *		the new buffer, and return the buffer to the caller in 
+ *		*buf_ptr_ptr.  Do this using the file image callbacks
+ *		if defined.  
  *
- *        NB: It is the responsibility of the caller to free the
- *        buffer whose address is returned in *buf_ptr_ptr.  Do
- *        this using free if the file image callbacks are not
- *        defined, or with whatever method is appropriate if
- *        the callbacks are defined.
+ *		NB: It is the responsibility of the caller to free the 
+ *		buffer whose address is returned in *buf_ptr_ptr.  Do
+ *		this using free if the file image callbacks are not 
+ *		defined, or with whatever method is appropriate if 
+ *		the callbacks are defined.
  *
- *              If buf_ptr_ptr is not NULL, and no image exists, set
- *        *buf_ptr_ptr to NULL.
+ *              If buf_ptr_ptr is not NULL, and no image exists, set 
+ *		*buf_ptr_ptr to NULL.
  *
- *        If buf_len_ptr is not NULL, set *buf_len_ptr equal
- *        to the length of the file image if it exists, and
- *        to 0 if it does not.
+ *		If buf_len_ptr is not NULL, set *buf_len_ptr equal
+ *		to the length of the file image if it exists, and 
+ *		to 0 if it does not.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2590,7 +2590,7 @@ H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file image info")
 
     /* verify file image field consistancy */
-    HDassert(((image_info.buffer != NULL) && (image_info.size > 0)) ||
+    HDassert(((image_info.buffer != NULL) && (image_info.size > 0)) || 
              ((image_info.buffer == NULL) && (image_info.size == 0)));
 
     /* Set output size */
@@ -2611,15 +2611,15 @@ H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
             else
                 if(NULL == (copy_ptr = H5MM_malloc(image_info.size)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate copy")
-
+    
             /* Copy data */
             if(image_info.callbacks.image_memcpy) {
                 if(copy_ptr != image_info.callbacks.image_memcpy(copy_ptr, image_info.buffer,
-                        image_info.size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET,
+                        image_info.size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET, 
                         image_info.callbacks.udata))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
             } /* end if */
-        else
+	    else
                 HDmemcpy(copy_ptr, image_info.buffer, image_info.size);
         } /* end if */
 
@@ -2636,7 +2636,7 @@ done:
  *
  * Purpose:     Sets the callbacks for file images. Some file drivers allow
  *              the use of user-defined callbacks for allocating, freeing and
- *              copying the drivers internal buffer, potentially allowing a
+ *              copying the drivers internal buffer, potentially allowing a 
  *              clever user to do optimizations such as avoiding large mallocs
  *              and memcpys or to perform detailed logging.
  *
@@ -2666,7 +2666,7 @@ H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get old file image info")
 
     /* verify file image field consistancy */
-    HDassert(((info.buffer != NULL) && (info.size > 0)) ||
+    HDassert(((info.buffer != NULL) && (info.size > 0)) || 
              ((info.buffer == NULL) && (info.size == 0)));
 
     /* Make sure a file image hasn't already been set */
@@ -2675,7 +2675,7 @@ H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback
 
     /* verify that callbacks_ptr is not NULL */
     if(NULL == callbacks_ptr)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
 
     /* Make sure udata callbacks are going to be set if udata is going to be set */
     if(callbacks_ptr->udata)
@@ -2686,7 +2686,7 @@ H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback
     if(info.callbacks.udata != NULL) {
         HDassert(info.callbacks.udata_free);
         if(info.callbacks.udata_free(info.callbacks.udata) < 0)
-        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
     } /* end if */
 
     /* Update struct */
@@ -2713,7 +2713,7 @@ done:
  *
  * Purpose:     Sets the callbacks for file images. Some file drivers allow
  *              the use of user-defined callbacks for allocating, freeing and
- *              copying the drivers internal buffer, potentially allowing a
+ *              copying the drivers internal buffer, potentially allowing a 
  *              clever user to do optimizations such as avoiding large mallocs
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2742,12 +2742,12 @@ H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file image info")
 
     /* verify file image field consistancy */
-    HDassert(((info.buffer != NULL) && (info.size > 0)) ||
+    HDassert(((info.buffer != NULL) && (info.size > 0)) || 
              ((info.buffer == NULL) && (info.size == 0)));
 
     /* verify that callbacks_ptr is not NULL */
     if(NULL == callbacks_ptr)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
 
     /* Transfer values to parameters */
     *callbacks_ptr = info.callbacks;
@@ -2768,12 +2768,12 @@ done:
  * Function:    H5P__file_image_info_copy
  *
  * Purpose:     Copy file image info. The buffer
- *              and udata may need to be copied, possibly using their
+ *              and udata may need to be copied, possibly using their 
  *              respective callbacks so the default copy won't work.
  *
  * Note:        This is an "in-place" copy, since this routine gets called
  *              after the top-level copy has been performed and this routine
- *        finishes the "deep" part of the copy.
+ *		finishes the "deep" part of the copy.
  *
  * Return:      Success:        Non-negative
  *              Failure:        Negative
@@ -2796,7 +2796,7 @@ H5P__file_image_info_copy(void *value)
         info = (H5FD_file_image_info_t *)value;
 
         /* verify file image field consistancy */
-        HDassert(((info->buffer != NULL) && (info->size > 0)) ||
+        HDassert(((info->buffer != NULL) && (info->size > 0)) || 
                  ((info->buffer == NULL) && (info->size == 0)));
 
         if(info->buffer && info->size > 0) {
@@ -2815,14 +2815,14 @@ H5P__file_image_info_copy(void *value)
                 if(NULL == (info->buffer = H5MM_malloc(info->size)))
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "unable to allocate memory block")
             } /* end else */
-
+            
             /* Copy data to new buffer */
             if(info->callbacks.image_memcpy) {
-                if(info->buffer != info->callbacks.image_memcpy(info->buffer, old_buffer,
-            info->size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY, info->callbacks.udata))
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
+                if(info->buffer != info->callbacks.image_memcpy(info->buffer, old_buffer, 
+			info->size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY, info->callbacks.udata))
+		    HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
             } /* end if */
-        else
+	    else
                 HDmemcpy(info->buffer, old_buffer, info->size);
         } /* end if */
 
@@ -2846,8 +2846,8 @@ done:
  * Function:    H5P__file_image_info_free
  *
  * Purpose:     Free file image info.  The buffer and udata may need to be
- *        freed, possibly using their respective callbacks, so the
- *        default free won't work.
+ *		freed, possibly using their respective callbacks, so the
+ *		default free won't work.
  *
  * Return:      Success:        Non-negative
  *              Failure:        Negative
@@ -2868,16 +2868,16 @@ H5P__file_image_info_free(void *value)
         H5FD_file_image_info_t *info;        /* Image info struct */
 
         info = (H5FD_file_image_info_t *)value;
-
+             
         /* Verify file image field consistancy */
-        HDassert(((info->buffer != NULL) && (info->size > 0)) ||
+        HDassert(((info->buffer != NULL) && (info->size > 0)) || 
                  ((info->buffer == NULL) && (info->size == 0)));
 
         /* Free buffer */
-        if(info->buffer != NULL && info->size > 0) {
+        if(info->buffer != NULL && info->size > 0) { 
             if(info->callbacks.image_free) {
                 if((*info->callbacks.image_free)(info->buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE, info->callbacks.udata) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "image_free callback failed")
+		    HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "image_free callback failed")
             } /* end if */
             else
                 H5MM_xfree(info->buffer);
@@ -2903,7 +2903,7 @@ done:
  * Purpose: Compare two cache image configurations.
  *
  * Return: positive if VALUE1 is greater than VALUE2, negative if VALUE2 is
- *        greater than VALUE1 and zero if VALUE1 and VALUE2 are equal.
+ *		greater than VALUE1 and zero if VALUE1 and VALUE2 are equal.
  *
  * Programmer:     John Mainzer
  *                 June 26, 2015
@@ -2944,11 +2944,11 @@ done:
  * Function:       H5P__facc_cache_image_config_enc
  *
  * Purpose:        Callback routine which is called whenever the default
- *                 cache image config property in the file creation
- *           property list is encoded.
+ *                 cache image config property in the file creation 
+ *		   property list is encoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     John Mainzer
  *                 June 26, 2015
@@ -2990,11 +2990,11 @@ H5P__facc_cache_image_config_enc(const void *value, void **_pp, size_t *size)
  * Function:       H5P__facc_cache_image_config_dec
  *
  * Purpose:        Callback routine which is called whenever the default
- *                 cache image config property in the file creation property
- *           list is  decoded.
+ *                 cache image config property in the file creation property 
+ *		   list is  decoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     John Mainzer
  *                 June 26, 2015
@@ -3109,7 +3109,7 @@ done:
  *
  * Purpose:     Delete callback for the file image info property, called
  *              when the property is deleted from the plist. The buffer
- *              and udata may need to be freed, possibly using their
+ *              and udata may need to be freed, possibly using their 
  *              respective callbacks so the default free won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -3139,7 +3139,7 @@ done:
  * Function:    H5P__facc_file_image_info_copy
  *
  * Purpose:     Copy callback for the file image info property. The buffer
- *              and udata may need to be copied, possibly using their
+ *              and udata may need to be copied, possibly using their 
  *              respective callbacks so the default copy won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -3228,7 +3228,7 @@ done:
  * Function:    H5P__facc_file_image_info_close
  *
  * Purpose:     Close callback for the file image info property. The buffer
- *              and udata may need to be freed, possibly using their
+ *              and udata may need to be freed, possibly using their 
  *              respective callbacks so the standard free won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -3260,7 +3260,7 @@ done:
  * Purpose: Compare two cache configurations.
  *
  * Return: positive if VALUE1 is greater than VALUE2, negative if VALUE2 is
- *        greater than VALUE1 and zero if VALUE1 and VALUE2 are equal.
+ *		greater than VALUE1 and zero if VALUE1 and VALUE2 are equal.
  *
  * Programmer:     Mohamad Chaarawi
  *                 September 24, 2012
@@ -3373,8 +3373,8 @@ done:
  *                 cache config property in the file creation property list is
  *                 encoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Mohamad Chaarawi
  *                 August 09, 2012
@@ -3518,8 +3518,8 @@ H5P__facc_cache_config_enc(const void *value, void **_pp, size_t *size)
  *                 cache config property in the file creation property list is
  *                 decoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Mohamad Chaarawi
  *                 August 09, 2012
@@ -3653,8 +3653,8 @@ done:
  *                 degree property in the file access property list
  *                 is encoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Quincey Koziol
  *                 Wednesday, August 15, 2012
@@ -3691,8 +3691,8 @@ H5P__facc_fclose_degree_enc(const void *value, void **_pp, size_t *size)
  *                 degree property in the file access property list
  *                 is decoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Quincey Koziol
  *                 Wednesday, August 15, 2012
@@ -3726,8 +3726,8 @@ H5P__facc_fclose_degree_dec(const void **_pp, void *_value)
  *                 memory type property in the file access property list
  *                 is encoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Quincey Koziol
  *                 Wednesday, August 15, 2012
@@ -3764,8 +3764,8 @@ H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size)
  *                 memory type property in the file access property list
  *                 is decoded.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Quincey Koziol
  *                 Wednesday, August 15, 2012
@@ -3793,12 +3793,12 @@ H5P__facc_multi_type_dec(const void **_pp, void *_value)
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_core_write_tracking
+ * Function:	H5Pset_core_write_tracking
  *
- * Purpose:    Enables/disables core VFD write tracking and page
+ * Purpose:	Enables/disables core VFD write tracking and page
  *              aggregation size.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:  Dana Robinson
  *              Tuesday, April 8, 2014
@@ -3834,12 +3834,12 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_core_write_tracking
+ * Function:	H5Pget_core_write_tracking
  *
- * Purpose:    Gets information about core VFD write tracking and page
+ * Purpose:	Gets information about core VFD write tracking and page
  *              aggregation size.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:  Dana Robinson
  *              Tuesday, April 8, 2014
@@ -3876,19 +3876,19 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_metadata_read_attempts
- *
- * Purpose:    Sets the # of read attempts in the file access property list
- *        when reading metadata with checksum.
- *        The # of read attempts set via this routine will only apply
- *        when opening a file with SWMR access.
- *        The # of read attempts set via this routine does not have
- *        any effect when opening a file with non-SWMR access; for this
- *        case, the # of read attempts will be always be 1.
+ * Function:	H5Pset_metadata_read_attempts
  *
- * Return:    Non-negative on success/Negative on failure
+ * Purpose:	Sets the # of read attempts in the file access property list
+ *		when reading metadata with checksum.
+ *		The # of read attempts set via this routine will only apply
+ *		when opening a file with SWMR access. 
+ *		The # of read attempts set via this routine does not have 
+ *		any effect when opening a file with non-SWMR access; for this
+ *		case, the # of read attempts will be always be 1.
+ *	
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Vailin Choi; Sept 2013
+ * Programmer:	Vailin Choi; Sept 2013
  *
  *-------------------------------------------------------------------------
  */
@@ -3919,13 +3919,13 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_metadata_read_attempts
+ * Function:	H5Pget_metadata_read_attempts
  *
- * Purpose:    Returns the # of metadata read attempts set in the file access property list.
+ * Purpose:	Returns the # of metadata read attempts set in the file access property list. 
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Vailin Choi; Sept 2013
+ * Programmer:	Vailin Choi; Sept 2013
  *
  *-------------------------------------------------------------------------
  */
@@ -3945,13 +3945,13 @@ H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts/*out*/)
         if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    /* Get the # of read attempts set */
+	/* Get the # of read attempts set */
         if(H5P_get(plist, H5F_ACS_METADATA_READ_ATTEMPTS_NAME, attempts) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get the number of metadata read attempts")
 
-    /* If not set, return the default value */
-    if(*attempts == H5F_ACS_METADATA_READ_ATTEMPTS_DEF)    /* 0 */
-        *attempts = H5F_METADATA_READ_ATTEMPTS;
+	/* If not set, return the default value */
+	if(*attempts == H5F_ACS_METADATA_READ_ATTEMPTS_DEF)	/* 0 */
+	    *attempts = H5F_METADATA_READ_ATTEMPTS;
     } /* end if */
 
 done:
@@ -3960,14 +3960,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_obj_flush_cb
+ * Function:	H5Pset_obj_flush_cb
  *
- * Purpose:    Sets the callback function to invoke and the user data when an
- *        object flush occurs in the file.
+ * Purpose:	Sets the callback function to invoke and the user data when an
+ *		object flush occurs in the file.
+ *	
+ * Return:	Non-negative on success/Negative on failure
  *
- * Return:    Non-negative on success/Negative on failure
- *
- * Programmer:    Vailin Choi; Dec 2013
+ * Programmer:	Vailin Choi; Dec 2013
  *
  *-------------------------------------------------------------------------
  */
@@ -4004,14 +4004,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_obj_flush_cb
- *
- * Purpose:    Retrieves the callback function and user data set in the
- *        property list for an object flush.
+ * Function:	H5Pget_obj_flush_cb
  *
- * Return:    Non-negative on success/Negative on failure
+ * Purpose:	Retrieves the callback function and user data set in the
+ *		property list for an object flush.
+ *	
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Vailin Choi; Dec 2013
+ * Programmer:	Vailin Choi; Dec 2013
  *
  *-------------------------------------------------------------------------
  */
@@ -4035,9 +4035,9 @@ H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func, void **udata)
 
     /* Assign return value */
     if(func)
-    *func = flush_info.func;
+	*func = flush_info.func;
     if(udata)
-    *udata = flush_info.udata;
+	*udata = flush_info.udata;
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -4045,11 +4045,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_mdc_log_options
+ * Function:	H5Pset_mdc_log_options
  *
- * Purpose:    Set metadata cache log options.
+ * Purpose:	Set metadata cache log options.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -4097,11 +4097,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_mdc_log_options
+ * Function:	H5Pget_mdc_log_options
  *
- * Purpose:    Get metadata cache log options.
+ * Purpose:	Get metadata cache log options. 
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -4455,8 +4455,8 @@ done:
  *
  * Purpose:        Generic encoding callback routine for 'coll_md_read_flag' properties.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Mohamad Chaarawi
  *                 Sunday, June 21, 2015
@@ -4493,8 +4493,8 @@ H5P__encode_coll_md_read_flag_t(const void *value, void **_pp, size_t *size)
  *
  * Purpose:        Generic decoding callback routine for 'coll_md_read_flag' properties.
  *
- * Return:       Success:    Non-negative
- *           Failure:    Negative
+ * Return:	   Success:	Non-negative
+ *		   Failure:	Negative
  *
  * Programmer:     Mohamad Chaarawi
  *                 Sunday, June 21, 2015
@@ -4523,22 +4523,22 @@ H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value)
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_all_coll_metadata_ops
+ * Function:	H5Pset_all_coll_metadata_ops
  *
- * Purpose:    Tell the library whether the metadata read operations will
- *        be done collectively (1) or not (0). Default is independent.
- *        With collective mode, the library will optimize access to
- *        metadata operations on the file.
+ * Purpose:	Tell the library whether the metadata read operations will
+ *		be done collectively (1) or not (0). Default is independent.
+ *		With collective mode, the library will optimize access to
+ *		metadata operations on the file.
  *
- * Note:    This routine accepts file access property lists, link
- *        access property lists, attribute access property lists,
- *        dataset access property lists, group access property lists,
- *        named datatype access property lists,
- *        and dataset transfer property lists.
+ * Note:	This routine accepts file access property lists, link
+ *		access property lists, attribute access property lists,
+ *		dataset access property lists, group access property lists,
+ *		named datatype access property lists,
+ *		and dataset transfer property lists.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              Sunday, June 21, 2015
  *
  *-------------------------------------------------------------------------
@@ -4582,19 +4582,19 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_all_coll_metadata_ops
+ * Function:	H5Pget_all_coll_metadata_ops
  *
- * Purpose:    Gets information about collective metadata read mode.
+ * Purpose:	Gets information about collective metadata read mode.
  *
- * Note:    This routine accepts file access property lists, link
- *        access property lists, attribute access property lists,
- *        dataset access property lists, group access property lists,
- *        named datatype access property lists,
- *        and dataset transfer property lists.
+ * Note:	This routine accepts file access property lists, link
+ *		access property lists, attribute access property lists,
+ *		dataset access property lists, group access property lists,
+ *		named datatype access property lists,
+ *		and dataset transfer property lists.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              Sunday, June 21, 2015
  *
  *-------------------------------------------------------------------------
@@ -4640,14 +4640,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_coll_metadata_write
+ * Function:	H5Pset_coll_metadata_write
  *
- * Purpose:    Tell the library whether the metadata write operations will
- *        be done collectively (1) or not (0). Default is collective.
+ * Purpose:	Tell the library whether the metadata write operations will
+ *		be done collectively (1) or not (0). Default is collective.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              Sunday, June 21, 2015
  *
  *-------------------------------------------------------------------------
@@ -4679,13 +4679,13 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_coll_metadata_write
+ * Function:	H5Pget_coll_metadata_write
  *
- * Purpose:    Gets information about collective metadata write mode.
+ * Purpose:	Gets information about collective metadata write mode.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              Sunday, June 21, 2015
  *
  *-------------------------------------------------------------------------
@@ -4717,15 +4717,15 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_page_buffer_size
+ * Function:	H5Pset_page_buffer_size
  *
  * Purpose:     Set the maximum page buffering size. This has to be a
  *              multiple of the page allocation size which must be enabled;
  *              otherwise file create/open will fail.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              June 2015
  *
  *-------------------------------------------------------------------------
@@ -4765,13 +4765,13 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pget_page_buffer_size
+ * Function:	H5Pget_page_buffer_size
  *
- * Purpose:    Retrieves the maximum page buffer size.
+ * Purpose:	Retrieves the maximum page buffer size.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Mohamad Chaarawi
+ * Programmer:	Mohamad Chaarawi
  *              June 2015
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index a2c0418..493a322 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -420,8 +420,6 @@ H5_DLL herr_t H5Pset_virtual_view(hid_t plist_id, H5D_vds_view_t view);
 H5_DLL herr_t H5Pget_virtual_view(hid_t plist_id, H5D_vds_view_t *view);
 H5_DLL herr_t H5Pset_virtual_printf_gap(hid_t plist_id, hsize_t gap_size);
 H5_DLL herr_t H5Pget_virtual_printf_gap(hid_t plist_id, hsize_t *gap_size);
-H5_DLL herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix);
-H5_DLL ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
 H5_DLL herr_t H5Pset_append_flush(hid_t plist_id, unsigned ndims,
     const hsize_t boundary[], H5D_append_cb_t func, void *udata);
 H5_DLL herr_t H5Pget_append_flush(hid_t plist_id, unsigned dims,
diff --git a/src/H5system.c b/src/H5system.c
index 719b7e0..a8726c2 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -1043,7 +1043,7 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
          * Unix: does not apply
          */
         if(H5_CHECK_ABS_DRIVE(name)) {
-            drive = HDtoupper(name[0]) - 'A' + 1;
+            drive = name[0] - 'A' + 1;
             retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
             HDstrncpy(new_name, &name[2], name_len);
         } /* end if */