[svn-r28712] Description:

    Switch v2 B-trees to use the same mechanism for setting up flush
dependencies as extensible and fixed arrays.

Tested on:
    MacOSX/64 10.11.2 (amazon) w/serial & parallel
    (h5committest not required on this branch)

1 files changed, 16 insertions, 16 deletions

diff --git a/test/btree2.c b/test/btree2.c
index c367779..7a2432c 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -138,7 +138,7 @@ create_btree(H5F_t *f, hid_t dxpl, const H5B2_create_t *cparam,
     H5B2_t **bt2, haddr_t *bt2_addr)
 {
     /* Create the v2 B-tree & get its address */
-    if(NULL == (*bt2 = H5B2_create(f, dxpl, cparam, f, NULL)))
+    if(NULL == (*bt2 = H5B2_create(f, dxpl, cparam, f)))
         FAIL_STACK_ERROR
     if(H5B2_get_addr(*bt2, bt2_addr/*out*/) < 0)
         FAIL_STACK_ERROR
@@ -177,7 +177,7 @@ reopen_btree(H5F_t *f, hid_t dxpl, H5B2_t **bt2, haddr_t bt2_addr,
             FAIL_STACK_ERROR
 
         /* Re-open v2 B-tree */
-        if(NULL == (*bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+        if(NULL == (*bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
             FAIL_STACK_ERROR
     } /* end if */
 
@@ -2852,7 +2852,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
         STACK_ERROR
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Check up on B-tree after re-open */
@@ -6547,7 +6547,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     } /* end for */
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Remove all records */
@@ -6631,7 +6631,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         STACK_ERROR
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Remove all records */
@@ -6641,7 +6641,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         rrecord = HSIZET_MAX;
 
         /* Remove random record */
-        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)rem_idx, NULL, remove_cb, &rrecord) < 0)
+        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)rem_idx, remove_cb, &rrecord) < 0)
             FAIL_STACK_ERROR
 
         /* Make certain that the record value is correct */
@@ -6719,14 +6719,14 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         STACK_ERROR
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Remove all records */
     for(u = 0; u < INSERT_MANY; u++) {
         /* Remove first record */
         rrecord = HSIZET_MAX;
-        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)0, NULL, remove_cb, &rrecord) < 0)
+        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)0, remove_cb, &rrecord) < 0)
             FAIL_STACK_ERROR
 
         /* Make certain that the record value is correct */
@@ -6804,14 +6804,14 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         STACK_ERROR
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Remove all records */
     for(u = 0; u < INSERT_MANY; u++) {
         /* Remove last record */
         rrecord = HSIZET_MAX;
-        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_DEC, (hsize_t)0, NULL, remove_cb, &rrecord) < 0)
+        if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_DEC, (hsize_t)0, remove_cb, &rrecord) < 0)
             FAIL_STACK_ERROR
 
         /* Make certain that the record value is correct */
@@ -7165,7 +7165,7 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     /*
      * Delete v2 B-tree
      */
-    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL, NULL) < 0)
+    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Close the file */
@@ -7222,7 +7222,7 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     /*
      * Delete v2 B-tree
      */
-    if(H5B2_delete(f, H5P_DATASET_XFER_DEFAULT, bt2_addr, f, NULL, NULL, NULL) < 0)
+    if(H5B2_delete(f, H5P_DATASET_XFER_DEFAULT, bt2_addr, f, NULL, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Close file */
@@ -7279,7 +7279,7 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     /*
      * Delete v2 B-tree
      */
-    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL, NULL) < 0)
+    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Close file */
@@ -7336,7 +7336,7 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     /*
      * Delete v2 B-tree
      */
-    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL, NULL) < 0)
+    if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Close file */
@@ -7648,7 +7648,7 @@ test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam)
         TEST_ERROR
 
     /* Re-open v2 B-tree */
-    if(NULL == (bt2_2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+    if(NULL == (bt2_2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
 
     /* Close the second v2 B-tree wrapper */
@@ -7694,7 +7694,7 @@ test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam)
         FAIL_STACK_ERROR
 
     /* Open the B-tree through the second file handle */
-    if(NULL == (bt2_2 = H5B2_open(f2, dxpl, bt2_addr, f2, NULL)))
+    if(NULL == (bt2_2 = H5B2_open(f2, dxpl, bt2_addr, f2)))
         FAIL_STACK_ERROR
 
     /* Close the extra file handles */