diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 20:43:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 20:43:30 (GMT) |
commit | 1e91d96fa02466ffe451319bdac1005f84dc7993 (patch) | |
tree | 4de04ef502c313dfd766497b20235188761146c0 /src/H5Defl.c | |
parent | 95e5349089b95dfb95f0f8ce2d6db1bc04ba6c82 (diff) | |
download | hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.zip hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.gz hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.bz2 |
Brings over most of the HD prefix removal (#3293)
Diffstat (limited to 'src/H5Defl.c')
-rw-r--r-- | src/H5Defl.c | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/H5Defl.c b/src/H5Defl.c index 7509df7..ecd97a4 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -126,8 +126,8 @@ H5D__efl_construct(H5F_t *f, H5D_t *dset) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(f); - HDassert(dset); + assert(f); + assert(dset); /* * The maximum size of the dataset cannot exceed the storage size. @@ -158,7 +158,7 @@ H5D__efl_construct(H5F_t *f, H5D_t *dset) /* Compute the total size of dataset */ stmp_size = H5S_GET_EXTENT_NPOINTS(dset->shared->space); - HDassert(stmp_size >= 0); + assert(stmp_size >= 0); tmp_size = (hsize_t)stmp_size * dt_size; H5_CHECKED_ASSIGN(dset->shared->layout.storage.u.contig.size, hsize_t, tmp_size, hssize_t); @@ -187,7 +187,7 @@ H5D__efl_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(storage); + assert(storage); /* EFL storage is currently always treated as allocated */ FUNC_LEAVE_NOAPI(TRUE) @@ -252,10 +252,10 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size FUNC_ENTER_PACKAGE /* Check args */ - HDassert(efl && efl->nused > 0); - HDassert(H5F_addr_defined(addr)); - HDassert(size < SIZE_MAX); - HDassert(buf || 0 == size); + assert(efl && efl->nused > 0); + assert(H5F_addr_defined(addr)); + assert(size < SIZE_MAX); + assert(buf || 0 == size); /* Find the first efl member from which to read */ for (u = 0, cur = 0; u < efl->nused; u++) { @@ -268,7 +268,7 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size /* Read the data */ while (size) { - HDassert(buf); + assert(buf); if (u >= efl->nused) HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file") if (H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip)) @@ -289,7 +289,7 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size if ((n = HDread(fd, buf, to_read)) < 0) HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file") else if ((size_t)n < to_read) - HDmemset(buf + n, 0, to_read - (size_t)n); + memset(buf + n, 0, to_read - (size_t)n); full_name = (char *)H5MM_xfree(full_name); HDclose(fd); fd = -1; @@ -340,10 +340,10 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz FUNC_ENTER_PACKAGE /* Check args */ - HDassert(efl && efl->nused > 0); - HDassert(H5F_addr_defined(addr)); - HDassert(size < SIZE_MAX); - HDassert(buf || 0 == size); + assert(efl && efl->nused > 0); + assert(H5F_addr_defined(addr)); + assert(size < SIZE_MAX); + assert(buf || 0 == size); /* Find the first efl member in which to write */ for (u = 0, cur = 0; u < efl->nused; u++) { @@ -356,7 +356,7 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz /* Write the data */ while (size) { - HDassert(buf); + assert(buf); if (u >= efl->nused) HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "write past logical end of file") if (H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip)) @@ -452,18 +452,18 @@ H5D__efl_readvv(const H5D_io_info_t H5_ATTR_NDEBUG_UNUSED *io_info, const H5D_ds FUNC_ENTER_PACKAGE /* Check args */ - HDassert(io_info); - HDassert(dset_info); - HDassert(dset_info->store->efl.nused > 0); - HDassert(dset_info->buf.vp); - HDassert(dset_info->dset); - HDassert(dset_info->dset->shared); - HDassert(dset_curr_seq); - HDassert(dset_len_arr); - HDassert(dset_off_arr); - HDassert(mem_curr_seq); - HDassert(mem_len_arr); - HDassert(mem_off_arr); + assert(io_info); + assert(dset_info); + assert(dset_info->store->efl.nused > 0); + assert(dset_info->buf.vp); + assert(dset_info->dset); + assert(dset_info->dset->shared); + assert(dset_curr_seq); + assert(dset_len_arr); + assert(dset_off_arr); + assert(mem_curr_seq); + assert(mem_len_arr); + assert(mem_off_arr); /* Set up user data for H5VM_opvv() */ udata.efl = &(dset_info->store->efl); @@ -533,18 +533,18 @@ H5D__efl_writevv(const H5D_io_info_t H5_ATTR_NDEBUG_UNUSED *io_info, const H5D_d FUNC_ENTER_PACKAGE /* Check args */ - HDassert(io_info); - HDassert(dset_info); - HDassert(dset_info->store->efl.nused > 0); - HDassert(dset_info->buf.cvp); - HDassert(dset_info->dset); - HDassert(dset_info->dset->shared); - HDassert(dset_curr_seq); - HDassert(dset_len_arr); - HDassert(dset_off_arr); - HDassert(mem_curr_seq); - HDassert(mem_len_arr); - HDassert(mem_off_arr); + assert(io_info); + assert(dset_info); + assert(dset_info->store->efl.nused > 0); + assert(dset_info->buf.cvp); + assert(dset_info->dset); + assert(dset_info->dset->shared); + assert(dset_curr_seq); + assert(dset_len_arr); + assert(dset_off_arr); + assert(mem_curr_seq); + assert(mem_len_arr); + assert(mem_off_arr); /* Set up user data for H5VM_opvv() */ udata.efl = &(dset_info->store->efl); @@ -580,10 +580,10 @@ H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(f); - HDassert(efl); - HDassert(H5F_addr_defined(efl->heap_addr)); - HDassert(heap_size); + assert(f); + assert(efl); + assert(H5F_addr_defined(efl->heap_addr)); + assert(heap_size); /* Get the size of the local heap for EFL's file list */ if (H5HL_heapsize(f, efl->heap_addr, heap_size) < 0) |