Make wrappers, tests and tools use H5Treclaim() instead of H5Dvlen_reclaim()

4 files changed, 40 insertions, 40 deletions

diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index f6aa72f..a3acdae 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -261,7 +261,7 @@ static void gent_named_vl(hid_t loc_id)
     H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
 
     /* close */
-    H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf);
+    H5Treclaim(tid,sid,H5P_DEFAULT,buf);
     H5Sclose(sid);
     H5Dclose(did);
     H5Tclose(tid);
@@ -314,7 +314,7 @@ static void gent_nested_vl(hid_t loc_id)
     H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
 
     /* close */
-    H5Dvlen_reclaim(tid2,sid,H5P_DEFAULT,buf);
+    H5Treclaim(tid2,sid,H5P_DEFAULT,buf);
     H5Sclose(sid);
     H5Dclose(did);
     H5Tclose(tid1);
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index d60e393..c711013 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -4403,7 +4403,7 @@ static void test_comps_vlen(const char * fname, const char *dset, const char *at
     assert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
     /* ----------------
@@ -4537,7 +4537,7 @@ static void test_comps_array_vlen(const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
     /*-------------------
@@ -4680,7 +4680,7 @@ static void test_comps_vlen_arry(const char * fname, const char *dset, const cha
     assert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
     /* ----------------
@@ -5446,7 +5446,7 @@ void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make
     aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf5);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -5712,7 +5712,7 @@ void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make
     aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf52);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -6108,7 +6108,7 @@ void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make
     aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf53);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -6434,7 +6434,7 @@ void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf5);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -6702,7 +6702,7 @@ void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf52);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -7100,7 +7100,7 @@ void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf53);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
     assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -7395,7 +7395,7 @@ void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
@@ -7580,7 +7580,7 @@ void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     did = H5Dcreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf52);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
     assert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
@@ -7759,7 +7759,7 @@ void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     did = H5Dcreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf53);
     assert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
     assert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 35c3e3c..ad70770 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2624,7 +2624,7 @@ static void gent_vldatatypes(void)
     dset = H5Dcreate2(file, "Dataset1.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
-    ret = H5Dvlen_reclaim(type, space, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(type, space, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     ret = H5Dclose(dset);
@@ -2651,7 +2651,7 @@ static void gent_vldatatypes(void)
     dset = H5Dcreate2(file, "Dataset2.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
-    ret = H5Dvlen_reclaim(type, space, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(type, space, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     ret = H5Dclose(dset);
@@ -2674,7 +2674,7 @@ static void gent_vldatatypes(void)
     dset = H5Dcreate2(file, "Dataset3.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &adata);
     HDassert(ret >= 0);
-    ret = H5Dvlen_reclaim(type, space, H5P_DEFAULT, &adata);
+    ret = H5Treclaim(type, space, H5P_DEFAULT, &adata);
     HDassert(ret >= 0);
 
     ret = H5Dclose(dset);
@@ -2740,7 +2740,7 @@ gent_vldatatypes2(void)
     HDassert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid2, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     /* Close Dataset */
@@ -2811,7 +2811,7 @@ static void gent_vldatatypes3(void)
     HDassert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid2, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     /* Close Dataset */
@@ -2878,7 +2878,7 @@ static void gent_vldatatypes4(void)
     HDassert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid1, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     /* Close Dataset */
@@ -2942,7 +2942,7 @@ static void gent_vldatatypes5(void)
     ret = H5Dclose(dataset);
     HDassert(ret >= 0);
 
-    ret = H5Dvlen_reclaim(tid1, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     ret = H5Tclose(tid1);
@@ -3385,7 +3385,7 @@ static void gent_array6(void)
     HDassert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid1, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     /* Close Dataset */
@@ -3454,7 +3454,7 @@ static void gent_array7(void)
     HDassert(ret >= 0);
 
     /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid1, sid1, H5P_DEFAULT, wdata);
+    ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
     HDassert(ret >= 0);
 
     /* Close Dataset */
@@ -4054,7 +4054,7 @@ static void write_attr_in(hid_t loc_id,
     aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf5);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -4165,7 +4165,7 @@ static void write_attr_in(hid_t loc_id,
     aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf52);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
     HDassert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -4298,7 +4298,7 @@ static void write_attr_in(hid_t loc_id,
     aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf53);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
     HDassert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
@@ -4496,7 +4496,7 @@ static void write_dset_in(hid_t loc_id,
     did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
@@ -4606,7 +4606,7 @@ static void write_dset_in(hid_t loc_id,
     did = H5Dcreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf52);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
     HDassert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
@@ -4745,7 +4745,7 @@ static void write_dset_in(hid_t loc_id,
     did = H5Dcreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf53);
     HDassert(status >= 0);
-    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
     HDassert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
@@ -5966,7 +5966,7 @@ static void gent_fvalues(void)
     did = H5Dcreate2(fid, "fill_vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf3);
     HDassert(ret >= 0);
-    ret = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf3);
+    ret = H5Treclaim(tid, sid, H5P_DEFAULT, buf3);
     HDassert(ret >= 0);
     ret = H5Dclose(did);
     ret = H5Tclose(tid);
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index ec8df3c..f3e6cd3 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -4079,7 +4079,7 @@ int write_dset_in(hid_t loc_id,
         goto out;
     if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5) < 0)
         goto out;
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
         goto out;
     if (H5Dclose(did) < 0)
         goto out;
@@ -4312,7 +4312,7 @@ int write_dset_in(hid_t loc_id,
         goto out;
     if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf52) < 0)
         goto out;
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
         goto out;
     if (H5Dclose(did) < 0)
         goto out;
@@ -4533,7 +4533,7 @@ int write_dset_in(hid_t loc_id,
     if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf53) < 0)
         goto out;
 
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
         goto out;
 
     if (H5Dclose(did) < 0)
@@ -5009,7 +5009,7 @@ int write_attr_in(hid_t loc_id,
         goto out;
     if (H5Awrite(aid, tid, buf5) < 0)
         goto out;
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
         goto out;
     if (H5Aclose(aid) < 0)
         goto out;
@@ -5331,7 +5331,7 @@ int write_attr_in(hid_t loc_id,
         goto out;
     if (H5Awrite(aid, tid, buf52) < 0)
         goto out;
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
         goto out;
     if (H5Aclose(aid) < 0)
         goto out;
@@ -5793,7 +5793,7 @@ int write_attr_in(hid_t loc_id,
         goto out;
     if (H5Awrite(aid, tid, buf53) < 0)
         goto out;
-    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
         goto out;
     if (H5Aclose(aid) < 0)
         goto out;
@@ -7036,10 +7036,10 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     }
 
     /* close resource for vlen data */
-    status = H5Dvlen_reclaim (vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data);
+    status = H5Treclaim (vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data);
     if (status < 0)
     {
-        HDfprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7091,10 +7091,10 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     }
 
     /* close resource for vlen data */
-    status = H5Dvlen_reclaim (vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data);
+    status = H5Treclaim (vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data);
     if (status < 0)
     {
-        HDfprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }