Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize

14 files changed, 19 insertions, 16 deletions

diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index cee38f3..33d23dc 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -463,8 +463,6 @@ main(void)
         FAIL_STACK_ERROR
     if((H5Pset_mdc_image_config(fapl, &my_cache_image_config)) < 0)
         FAIL_STACK_ERROR
-    if((H5Pset_core_write_tracking(fapl, TRUE, 1024 * 1024)) < 0)
-        FAIL_STACK_ERROR
 
     /* Test encoding & decoding property list */
     if(test_encode_decode(fapl) < 0)
diff --git a/test/h5test.c b/test/h5test.c
index bd56592..e187264 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -763,10 +763,10 @@ h5_rmprefix(const char *filename)
  *
  * Purpose:     Returns a file access template which is the default template
  *              but with a file driver, VOL connector, or libver bound set
- *		according to a constant or environment variable
+ *              according to a constant or environment variable
  *
- * Return:      Success:  A file access property list
- *              Failure:  -1
+ * Return:      Success:    A file access property list
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, November 19, 1998
@@ -776,24 +776,29 @@ h5_rmprefix(const char *filename)
 hid_t
 h5_fileaccess(void)
 {
-    hid_t       fapl = -1;
+    hid_t       fapl_id = H5I_INVALID_HID;
 
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        return -1;
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
 
     /* Attempt to set up a file driver first */
-    if(h5_get_vfd_fapl(fapl) < 0)
-         return -1;
+    if(h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
 
     /* Next, try to set up a VOL connector */
-    if(h5_get_vol_fapl(fapl) < 0)
-        return -1;
+    if(h5_get_vol_fapl(fapl_id) < 0)
+        goto error;
  
     /* Finally, check for libver bounds */
-    if(h5_get_libver_fapl(fapl) < 0)
-        return -1;
+    if(h5_get_libver_fapl(fapl_id) < 0)
+        goto error;
  
-    return(fapl);
+    return fapl_id;
+
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
 } /* end h5_fileaccess() */
 
 
@@ -1003,7 +1008,7 @@ error:
  *              fapl but with a VOL connector set according to the constant
  *              or environment variable HDF5_VOL_CONNECTOR.
  *
- * Return:      Success:    A file access property list ID
+ * Return:      Success:    0
  *              Failure:    -1
  *
  * Programmer:  Jordan Henderson
diff --git a/test/testfiles/plist_files/def_fapl_32be b/test/testfiles/plist_files/def_fapl_32be
index 6e94011..cd8a33a 100644
--- a/test/testfiles/plist_files/def_fapl_32be
+++ b/test/testfiles/plist_files/def_fapl_32be
diff --git a/test/testfiles/plist_files/def_fapl_32le b/test/testfiles/plist_files/def_fapl_32le
index 6e94011..cd8a33a 100644
--- a/test/testfiles/plist_files/def_fapl_32le
+++ b/test/testfiles/plist_files/def_fapl_32le
diff --git a/test/testfiles/plist_files/def_fapl_64be b/test/testfiles/plist_files/def_fapl_64be
index 6e94011..cd8a33a 100644
--- a/test/testfiles/plist_files/def_fapl_64be
+++ b/test/testfiles/plist_files/def_fapl_64be
diff --git a/test/testfiles/plist_files/def_fapl_64le b/test/testfiles/plist_files/def_fapl_64le
index 6e94011..cd8a33a 100644
--- a/test/testfiles/plist_files/def_fapl_64le
+++ b/test/testfiles/plist_files/def_fapl_64le
diff --git a/test/testfiles/plist_files/fapl_32be b/test/testfiles/plist_files/fapl_32be
index 237b291..b0ad12e 100644
--- a/test/testfiles/plist_files/fapl_32be
+++ b/test/testfiles/plist_files/fapl_32be
diff --git a/test/testfiles/plist_files/fapl_32le b/test/testfiles/plist_files/fapl_32le
index 237b291..b0ad12e 100644
--- a/test/testfiles/plist_files/fapl_32le
+++ b/test/testfiles/plist_files/fapl_32le
diff --git a/test/testfiles/plist_files/fapl_64be b/test/testfiles/plist_files/fapl_64be
index 237b291..b0ad12e 100644
--- a/test/testfiles/plist_files/fapl_64be
+++ b/test/testfiles/plist_files/fapl_64be
diff --git a/test/testfiles/plist_files/fapl_64le b/test/testfiles/plist_files/fapl_64le
index 237b291..b0ad12e 100644
--- a/test/testfiles/plist_files/fapl_64le
+++ b/test/testfiles/plist_files/fapl_64le
diff --git a/test/testfiles/plist_files/lapl_32be b/test/testfiles/plist_files/lapl_32be
index 9d81759..f93e19a 100644
--- a/test/testfiles/plist_files/lapl_32be
+++ b/test/testfiles/plist_files/lapl_32be
diff --git a/test/testfiles/plist_files/lapl_32le b/test/testfiles/plist_files/lapl_32le
index 9d81759..f93e19a 100644
--- a/test/testfiles/plist_files/lapl_32le
+++ b/test/testfiles/plist_files/lapl_32le
diff --git a/test/testfiles/plist_files/lapl_64be b/test/testfiles/plist_files/lapl_64be
index 9d81759..f93e19a 100644
--- a/test/testfiles/plist_files/lapl_64be
+++ b/test/testfiles/plist_files/lapl_64be
diff --git a/test/testfiles/plist_files/lapl_64le b/test/testfiles/plist_files/lapl_64le
index 9d81759..f93e19a 100644
--- a/test/testfiles/plist_files/lapl_64le
+++ b/test/testfiles/plist_files/lapl_64le