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

5 files changed, 11 insertions, 9 deletions

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)