* Made H5FD_driver_query() a private function instead of static.

* Moved H5FD_driver_query() to H5FDint.c.
* Minor typo fixes in H5I.c.
* Updated swmr.c to check the VFD feature flags and skip the
  retries test when the VFD is not compatible with H5P_DEFAULT.

5 files changed, 70 insertions, 45 deletions

diff --git a/src/H5FD.c b/src/H5FD.c
index dcfaa6d..d3cb77c 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -62,7 +62,6 @@
 /********************/
 static herr_t H5FD_free_cls(H5FD_class_t *cls);
 static int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/);
-static int H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/);
 
 /*********************/
 /* Package Variables */
@@ -1085,42 +1084,6 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
 
 
 /*-------------------------------------------------------------------------
-* Function:    H5FD_driver_query
-*
-* Purpose: Similar to H5FD_query(), but intended for cases when we don't
-*          have a file available (e.g. before one is opened). Since we
-*          can't use the file to get the driver, the driver is passed in
-*          as a parameter.
-*
-* Return:  Success:    non-negative
-*          Failure:    negative
-*
-* Programmer:  Jacob Gruber
-*              Wednesday, August 17, 2011
-*
-*-------------------------------------------------------------------------
-*/
-static int
-H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
-{
-    int ret_value = 0;          /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    HDassert(driver);
-    HDassert(flags);
-
-    /* Check for the driver to query and then query it */
-    if(driver->query)
-        ret_value = (driver->query)(NULL, flags);
-    else 
-        *flags = 0;
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_driver_query() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FDalloc
  *
  * Purpose:	Allocates SIZE bytes of memory from the FILE. The memory will
diff --git a/src/H5FDint.c b/src/H5FDint.c
index bc322d6..ccf0f2e 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -433,3 +433,40 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_eof() */
 
+
+/*-------------------------------------------------------------------------
+* Function:    H5FD_driver_query
+*
+* Purpose: Similar to H5FD_query(), but intended for cases when we don't
+*          have a file available (e.g. before one is opened). Since we
+*          can't use the file to get the driver, the driver is passed in
+*          as a parameter.
+*
+* Return:  Success:    non-negative
+*          Failure:    negative
+*
+* Programmer:  Jacob Gruber
+*              Wednesday, August 17, 2011
+*
+*-------------------------------------------------------------------------
+*/
+int
+H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
+{
+    int ret_value = 0;          /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+    HDassert(driver);
+    HDassert(flags);
+
+    /* Check for the driver to query and then query it */
+    if(driver->query)
+        ret_value = (driver->query)(NULL, flags);
+    else 
+        *flags = 0;
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_driver_query() */
+
+
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 0fc2135..589e391 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -153,6 +153,7 @@ H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id,
 		  haddr_t maxaddr);
 H5_DLL herr_t H5FD_close(H5FD_t *file);
 H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2);
+H5_DLL int H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/);
 H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, 
     struct H5F_t *f, hsize_t size, haddr_t *frag_addr, hsize_t *frag_size);
 H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f,
diff --git a/src/H5I.c b/src/H5I.c
index ce4ecdc..42edf58 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -888,7 +888,7 @@ H5I_subst(hid_t id, const void *new_object)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end if */
+} /* end H5I_subst() */
 
 
 /*-------------------------------------------------------------------------
@@ -920,7 +920,7 @@ H5I_object(hid_t id)
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end if */
+} /* end H5I_object() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/swmr.c b/test/swmr.c
index 5b50d63..9239ca2 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -116,16 +116,40 @@ static int test_multiple_same(hid_t in_fapl, hbool_t new_format);
 static int
 test_metadata_read_attempts(hid_t in_fapl)
 {
-    hid_t fapl = -1;                        /* File access property list        */
-    hid_t file_fapl = -1;                   /* The file's access property list  */
-    hid_t fid = -1, fid1 = -1, fid2 = -1;   /* File IDs                         */
-    unsigned attempts;                      /* The # of read attempts           */
-    char filename[NAME_BUF_SIZE];           /* File name                        */
-    herr_t ret;                             /* Generic return value             */
+    hid_t fapl = -1;                        /* File access property list            */
+    hid_t file_fapl = -1;                   /* The file's access property list      */
+    hid_t fid = -1, fid1 = -1, fid2 = -1;   /* File IDs                             */
+    hid_t driver_id = -1;                   /* ID for this VFD                      */
+    H5FD_class_t *driver = NULL;            /* Pointer to VFD class struct          */
+    unsigned long driver_flags = 0;         /* VFD feature flags                    */
+    hbool_t compat_w_default_vfd;           /* current VFD compat w/ H5P_DEFAULT?   */
+    unsigned attempts;                      /* The # of read attempts               */
+    char filename[NAME_BUF_SIZE];           /* File name                            */
+    herr_t ret;                             /* Generic return value                 */
 
     /* Output message about test being performed */
     TESTING("H5Pget/set_metadata_read_attempts()");
 
+    /* Check if the driver is compatible with the default VFD.
+     * Most of the tests will attempt to create and open files with both the
+     * VFD specified in the passed-in fapl and the default VFD. Since this
+     * will clearly not work with VFDs that are not compatible with the default
+     * fapl (e.g.: split/multi), we just skip this entire test.
+     */
+    if ((driver_id = H5Pget_driver(in_fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (NULL == (driver = (H5FD_class_t *)H5I_object_verify(driver_id, H5I_VFL)))
+        FAIL_STACK_ERROR
+    if (H5FD_driver_query(driver, &driver_flags) < 0)
+        FAIL_STACK_ERROR
+    compat_w_default_vfd = (driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE) ? TRUE : FALSE;
+
+    if (!compat_w_default_vfd) {
+        SKIPPED()
+        HDputs("    The current VFD is not compatible with the default VFD.");
+        return 0;
+    }
+
     /* Get a copy of the parameter fapl */
     if((fapl = H5Pcopy(in_fapl)) < 0)
         FAIL_STACK_ERROR