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

12 files changed, 66 insertions, 64 deletions

diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 4ad4c90..351e6ab 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -515,12 +515,12 @@ hsize_t diff_attr(hid_t loc1_id,
             /* Free buf1 and buf2, check both VLEN-data VLEN-string to reclaim any
             * VLEN memory first */
             if(TRUE == h5tools_detect_vlen(mtype1_id))
-                H5Dvlen_reclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
+                H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
             HDfree(buf1);
             buf1 = NULL;
 
             if(TRUE == h5tools_detect_vlen(mtype2_id))
-                H5Dvlen_reclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
+                H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
             HDfree(buf2);
             buf2 = NULL;
 
@@ -551,12 +551,12 @@ done:
     H5E_BEGIN_TRY {
         if(buf1) {
             if(buf1hasdata && TRUE == h5tools_detect_vlen(mtype1_id))
-                H5Dvlen_reclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
+                H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
             HDfree(buf1);
         } /* end if */
         if(buf2) {
             if(buf2hasdata && TRUE == h5tools_detect_vlen(mtype2_id))
-                H5Dvlen_reclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
+                H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
             HDfree(buf2);
         } /* end if */
 
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index ff542db..96f1d1a 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -416,10 +416,10 @@ hsize_t diff_datasetid(hid_t did1,
             /* reclaim any VL memory, if necessary */
             h5diffdebug2("check vl_data1:%d\n", vl_data1);
             if(vl_data1)
-                H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
+                H5Treclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
             h5diffdebug2("check vl_data2:%d\n", vl_data2);
             if(vl_data2)
-                H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
+                H5Treclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
             if(buf1 != NULL) {
                 HDfree(buf1);
                 buf1 = NULL;
@@ -510,9 +510,9 @@ hsize_t diff_datasetid(hid_t did1,
 
                 /* reclaim any VL memory, if necessary */
                 if(vl_data1)
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
+                    H5Treclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
                 if(vl_data2)
-                    H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
+                    H5Treclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
 
                 /* calculate the next hyperslab offset */
                 for(i = rank1, carry = 1; i > 0 && carry; --i) {
@@ -550,28 +550,28 @@ done:
     if(buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data1)
-            H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
+            H5Treclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
         HDfree(buf1);
         buf1 = NULL;
     }
     if(buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data2)
-            H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
+            H5Treclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
         HDfree(buf2);
         buf2 = NULL;
     }
     if(sm_buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data1)
-            H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
+            H5Treclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
         HDfree(sm_buf1);
         sm_buf1 = NULL;
     }
     if(sm_buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data2)
-            H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
+            H5Treclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
         HDfree(sm_buf2);
         sm_buf2 = NULL;
     }
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index eaac94a..e80cf53 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -1256,7 +1256,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
 
             /* Reclaim any VL memory, if necessary */
             if (vl_data)
-                H5Dvlen_reclaim(p_type, sm_space, H5P_DEFAULT, sm_buf);
+                H5Treclaim(p_type, sm_space, H5P_DEFAULT, sm_buf);
 
             if(H5Sclose(sm_space) < 0)
                 H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
@@ -1645,7 +1645,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
 
         /* Reclaim any VL memory, if necessary */
         if (vl_data)
-            H5Dvlen_reclaim(p_type, sm_space, H5P_DEFAULT, sm_buf);
+            H5Treclaim(p_type, sm_space, H5P_DEFAULT, sm_buf);
 
         /* Calculate the next hyperslab offset */
         for (i = ctx->ndims, carry = 1; i > 0 && carry; --i) {
@@ -3979,7 +3979,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
 
                 /* Reclaim any VL memory, if necessary */
                 if (vl_data)
-                    H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                    H5Treclaim(p_type, space, H5P_DEFAULT, buf);
 
                 HDfree(buf);
             }
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index c4fd948..be9e727 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -1919,7 +1919,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
                     }
                     /* Reclaim any VL memory, if necessary */
                     if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                        H5Treclaim(p_type, space, H5P_DEFAULT, buf);
 
                     HDfree(buf);
                 }
@@ -3099,7 +3099,7 @@ xml_print_strs(hid_t did, int source)
             HDfree(onestring);
     if (buf) {
         if (is_vlstr)
-            H5Dvlen_reclaim(type, space, H5P_DEFAULT, buf);
+            H5Treclaim(type, space, H5P_DEFAULT, buf);
         HDfree(buf);
     }
     H5Tclose(type);
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 3b0001d..5c9c693 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -1568,7 +1568,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
                     /* Reclaim any VL memory, if necessary */
                     if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                        H5Treclaim(p_type, space, H5P_DEFAULT, buf);
 
                     HDfree(buf);
                 }
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 0183cbf..5f688d9 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -486,7 +486,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_
             /* Check if we have VL data and string in the attribute's  datatype that must
              * be reclaimed */
             if (TRUE == h5tools_detect_vlen(wtype_id))
-                H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
             HDfree(buf);
             buf = NULL;
         } /*H5T_REFERENCE*/
@@ -519,7 +519,9 @@ done:
              * datatype that must be reclaimed
              */
             if (TRUE == h5tools_detect_vlen(wtype_id))
-                H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+
+            /* Free buf */
             HDfree(buf);
         }
 
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index f6409e3..24f67db 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -918,8 +918,8 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                     /* Check if we have VL data in the dataset's
                                      * datatype that must be reclaimed */
                                     if (TRUE == H5Tdetect_class(wtype_id, H5T_VLEN))
-                                        if (H5Dvlen_reclaim(wtype_id, f_space_id, H5P_DEFAULT, buf) < 0)
-                                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dvlen_reclaim failed");
+                                        if (H5Treclaim(wtype_id, f_space_id, H5P_DEFAULT, buf) < 0)
+                                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Treclaim failed");
 
                                     if (buf != NULL) { /* TODO: is buf potentially released by H5Dvlen_reclaim()? */
                                         HDfree(buf);
@@ -1010,7 +1010,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
 
                                         /* reclaim any VL memory, if necessary */
                                         if (vl_data)
-                                            H5Dvlen_reclaim(wtype_id, hslab_space, H5P_DEFAULT, hslab_buf);
+                                            H5Treclaim(wtype_id, hslab_space, H5P_DEFAULT, hslab_buf);
 
                                         /* calculate the next hyperslab offset */
                                         for (k = rank, carry = 1; k > 0 && carry; --k) {
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 7e8951f..bfc376f 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -712,7 +712,7 @@ static int copy_refs_attr(hid_t loc_in,
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Awrite failed");
 
             if (is_ref_vlen && buf)
-                H5Dvlen_reclaim (mtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim (mtype_id, space_id, H5P_DEFAULT, buf);
         } /* if (nelmts) */
 
         if (refbuf == buf)
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;
     }