Merge pull request #179 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_valgrind_bugfix to develop

Fix for some evict-on-close issues revealed by Valgrind.

* commit 'd3dbe9d90ee71b231b3264e1d62d3efbae3242ef':
  Tentative fix for valgrind issues related to EoC.

2 files changed, 163 insertions, 163 deletions

diff --git a/test/efc.c b/test/efc.c
index 6a7c8d8..57a600d 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -104,7 +104,7 @@ test_single(void)
         FAIL_STACK_ERROR
     if(ftmp1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -261,13 +261,13 @@ test_single(void)
         TEST_ERROR
     if(f4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -294,7 +294,7 @@ test_single(void)
         FAIL_STACK_ERROR
     if(ftmp1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -375,9 +375,9 @@ test_single(void)
         TEST_ERROR
     if(ftmp2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -455,13 +455,13 @@ test_single(void)
         TEST_ERROR
     if(ftmp4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp4) < 0)
+    if(H5F_try_close(ftmp4, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -494,12 +494,12 @@ test_single(void)
         FAIL_STACK_ERROR
     if(ftmp1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
     /* Close parent file */
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
     PASSED();
@@ -576,9 +576,9 @@ test_graph_nocycle(void)
         FAIL_STACK_ERROR
     if(ftmp2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(NULL == (f0 = H5F_open(filename[0],
@@ -596,7 +596,7 @@ test_graph_nocycle(void)
     if(NULL == (f1 = H5F_efc_open(f0, filename[1], H5F_ACC_RDWR, fcpl_id,
             fapl_id, dxpl_id)))
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
     if(H5F_efc_close(f1, f2) < 0)
         FAIL_STACK_ERROR
@@ -611,9 +611,9 @@ test_graph_nocycle(void)
         FAIL_STACK_ERROR
     if(ftmp2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -667,11 +667,11 @@ test_graph_nocycle(void)
         TEST_ERROR
     if(ftmp4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp4) < 0)
+    if(H5F_try_close(ftmp4, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -731,11 +731,11 @@ test_graph_nocycle(void)
     if(ftmp3->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -780,9 +780,9 @@ test_graph_nocycle(void)
     if(ftmp3->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -868,15 +868,15 @@ test_graph_nocycle(void)
     if(ftmp3->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp4) < 0)
+    if(H5F_try_close(ftmp4, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -951,7 +951,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -960,7 +960,7 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -991,7 +991,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(NULL == (f1 = H5F_efc_open(f0, filename[1],
@@ -1007,7 +1007,7 @@ test_graph_cycle(void)
         TEST_ERROR
     if(H5F_efc_close(f0, f1) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1015,7 +1015,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1055,7 +1055,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1063,7 +1063,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1091,7 +1091,7 @@ test_graph_cycle(void)
         TEST_ERROR
     if(H5F_efc_close(f0, f1) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1099,7 +1099,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1132,7 +1132,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 3)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1140,7 +1140,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1177,7 +1177,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1221,7 +1221,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1229,7 +1229,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1277,7 +1277,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1304,11 +1304,11 @@ test_graph_cycle(void)
         TEST_ERROR
     if(f0->shared->nrefs != 3)
         TEST_ERROR
-    if(H5F_try_close(ftmp0) < 0)
+    if(H5F_try_close(ftmp0, NULL) < 0)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1316,7 +1316,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1344,7 +1344,7 @@ test_graph_cycle(void)
     if(ftmp1->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(ftmp1->shared->nrefs != 2)
         TEST_ERROR
@@ -1354,9 +1354,9 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp1) < 0)
+    if(H5F_try_close(ftmp1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1364,7 +1364,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1372,7 +1372,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1411,7 +1411,7 @@ test_graph_cycle(void)
     if(ftmp2->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(ftmp2->shared->nrefs != 2)
         TEST_ERROR
@@ -1421,9 +1421,9 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 3)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1431,7 +1431,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1439,7 +1439,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1447,7 +1447,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1499,9 +1499,9 @@ test_graph_cycle(void)
         TEST_ERROR
     if(ftmp2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp2) < 0)
+    if(H5F_try_close(ftmp2, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1551,7 +1551,7 @@ test_graph_cycle(void)
     if(ftmp3->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(ftmp3->shared->nrefs != 2)
         TEST_ERROR
@@ -1561,9 +1561,9 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1571,7 +1571,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1579,7 +1579,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1587,7 +1587,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1595,7 +1595,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1659,9 +1659,9 @@ test_graph_cycle(void)
         TEST_ERROR
     if(ftmp3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1701,7 +1701,7 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1709,7 +1709,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1717,7 +1717,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1725,7 +1725,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1733,7 +1733,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1777,7 +1777,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1785,7 +1785,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1793,7 +1793,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1801,7 +1801,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1844,7 +1844,7 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1852,12 +1852,12 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(ftmp3->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1865,7 +1865,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1873,7 +1873,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -1881,7 +1881,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1937,14 +1937,14 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(H5F_efc_release(ftmp3->shared->efc) < 0)
@@ -1956,12 +1956,12 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(ftmp3) < 0)
+    if(H5F_try_close(ftmp3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2029,7 +2029,7 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2037,7 +2037,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2045,7 +2045,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2053,7 +2053,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2061,7 +2061,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f4 = H5F_open(filename[4],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2069,7 +2069,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f5 = H5F_open(filename[5],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2077,7 +2077,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f5->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f5) < 0)
+    if(H5F_try_close(f5, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2150,7 +2150,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2158,7 +2158,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2166,7 +2166,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2174,7 +2174,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f4 = H5F_open(filename[4],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2182,7 +2182,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f5 = H5F_open(filename[5],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2190,7 +2190,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f5->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f5) < 0)
+    if(H5F_try_close(f5, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2268,7 +2268,7 @@ test_graph_cycle(void)
     if(f5->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(f4->shared->nrefs != 2)
         TEST_ERROR
@@ -2280,14 +2280,14 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
     if(f5->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(f5->shared->nrefs != 2)
         TEST_ERROR
@@ -2296,10 +2296,10 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f5) < 0)
+    if(H5F_try_close(f5, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(NULL == (f0 = H5F_open(filename[0],
@@ -2308,7 +2308,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2316,7 +2316,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2324,7 +2324,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2332,7 +2332,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f4 = H5F_open(filename[4],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2340,7 +2340,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f4->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f5 = H5F_open(filename[5],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2348,7 +2348,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f5->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f5) < 0)
+    if(H5F_try_close(f5, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2440,7 +2440,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 3)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(H5F_efc_release(f4->shared->efc) < 0)
@@ -2456,7 +2456,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(H5F_efc_release(f5->shared->efc) < 0)
@@ -2472,14 +2472,14 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f4) < 0)
+    if(H5F_try_close(f4, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f5) < 0)
+    if(H5F_try_close(f5, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2577,7 +2577,7 @@ test_graph_cycle(void)
     if(H5F_efc_close(f0, f3) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2585,7 +2585,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2593,7 +2593,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2601,7 +2601,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2609,7 +2609,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2711,7 +2711,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2719,7 +2719,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2727,7 +2727,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3],
             H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC, fcpl_id, fapl_id,
@@ -2735,7 +2735,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2773,7 +2773,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2812,7 +2812,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -2853,7 +2853,7 @@ test_graph_cycle(void)
     if(f3->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 2)
         TEST_ERROR
@@ -2866,7 +2866,7 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(H5F_efc_close(f1, f3) < 0)
@@ -2880,14 +2880,14 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
     if(H5F_efc_close(f2, f1) < 0)
@@ -2899,52 +2899,52 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 3)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 2)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -3023,19 +3023,19 @@ test_graph_cycle(void)
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f3 = H5F_open(filename[3], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f3->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f3) < 0)
+    if(H5F_try_close(f3, NULL) < 0)
         FAIL_STACK_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -3066,21 +3066,21 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 1)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
 
 
@@ -3113,28 +3113,28 @@ test_graph_cycle(void)
     if(f0->shared->nrefs != 2)
         TEST_ERROR
 
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f0 = H5F_open(filename[0], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f0->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f0) < 0)
+    if(H5F_try_close(f0, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f1 = H5F_open(filename[1], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f1->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f1) < 0)
+    if(H5F_try_close(f1, NULL) < 0)
         FAIL_STACK_ERROR
     if(NULL == (f2 = H5F_open(filename[2], H5F_ACC_RDWR, fcpl_id, fapl_id,
             dxpl_id)))
         FAIL_STACK_ERROR
     if(f2->shared->nrefs != 1)
         TEST_ERROR
-    if(H5F_try_close(f2) < 0)
+    if(H5F_try_close(f2, NULL) < 0)
         FAIL_STACK_ERROR
 
 
diff --git a/test/ohdr.c b/test/ohdr.c
index 1478c5c..f06dc71 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -131,9 +131,9 @@ test_cont(char *filename, hid_t fapl)
     if(hdr_info.nchunks >= nchunks)
         TEST_ERROR
 
-    if(H5O_close(&oh_locA) < 0)
+    if(H5O_close(&oh_locA, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5O_close(&oh_locB) < 0)
+    if(H5O_close(&oh_locB, NULL) < 0)
         FAIL_STACK_ERROR
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
@@ -145,8 +145,8 @@ test_cont(char *filename, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        H5O_close(&oh_locA);
-        H5O_close(&oh_locB);
+        H5O_close(&oh_locA, NULL);
+        H5O_close(&oh_locB, NULL);
         H5Fclose(file);
     } H5E_END_TRY;
 
@@ -272,7 +272,7 @@ test_ohdr_cache(char *filename, hid_t fapl)
         FAIL_STACK_ERROR
 
     /* Close object header created */
-    if(H5O_close(&oh_loc) < 0)
+    if(H5O_close(&oh_loc, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Unprotect local heap (which actually unpins it from the cache) */
@@ -731,7 +731,7 @@ main(void)
          *  works correctly - QAK)
          */
         TESTING("close & re-open object header");
-        if(H5O_close(&oh_loc) < 0)
+        if(H5O_close(&oh_loc, NULL) < 0)
             FAIL_STACK_ERROR
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
@@ -806,7 +806,7 @@ main(void)
 
         /* release resources */
         TESTING("object header closing");
-        if(H5O_close(&oh_loc) < 0)
+        if(H5O_close(&oh_loc, NULL) < 0)
             FAIL_STACK_ERROR
         PASSED();