diff options
author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-08-14 16:41:53 (GMT) |
---|---|---|
committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-10-08 20:19:28 (GMT) |
commit | 383e7f78711f69909775e3210416b684a3ecb097 (patch) | |
tree | 22ab80746787dc1f83f1a87e1c3641f28af82ecd /tools/lib | |
parent | dabdcf95593aa97185c83006f35a0849ea012450 (diff) | |
download | hdf5-383e7f78711f69909775e3210416b684a3ecb097.zip hdf5-383e7f78711f69909775e3210416b684a3ecb097.tar.gz hdf5-383e7f78711f69909775e3210416b684a3ecb097.tar.bz2 |
Make wrappers, tests and tools use H5Treclaim() instead of H5Dvlen_reclaim()
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/h5diff_attr.c | 8 | ||||
-rw-r--r-- | tools/lib/h5diff_dset.c | 16 | ||||
-rw-r--r-- | tools/lib/h5tools_dump.c | 6 |
3 files changed, 15 insertions, 15 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); } |