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/H5Dcompact.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/H5Dcompact.c')
-rw-r--r-- | src/H5Dcompact.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 5f45da4..f9742ff 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -125,10 +125,10 @@ H5D__compact_fill(const H5D_t *dset) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(dset && H5D_COMPACT == dset->shared->layout.type); - HDassert(dset->shared->layout.storage.u.compact.buf); - HDassert(dset->shared->type); - HDassert(dset->shared->space); + assert(dset && H5D_COMPACT == dset->shared->layout.type); + assert(dset->shared->layout.storage.u.compact.buf); + assert(dset->shared->type); + assert(dset->shared->space); /* Initialize the fill value buffer */ /* (use the compact dataset storage buffer as the fill value buffer) */ @@ -176,8 +176,8 @@ H5D__compact_construct(H5F_t *f, H5D_t *dset) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(f); - HDassert(dset); + assert(f); + assert(dset); /* Check for invalid dataset dimensions */ for (u = 0; u < dset->shared->ndims; u++) @@ -189,9 +189,9 @@ H5D__compact_construct(H5F_t *f, H5D_t *dset) * layout. */ stmp_size = H5S_GET_EXTENT_NPOINTS(dset->shared->space); - HDassert(stmp_size >= 0); + assert(stmp_size >= 0); tmp_size = H5T_get_size(dset->shared->type); - HDassert(tmp_size > 0); + assert(tmp_size > 0); tmp_size = tmp_size * (hsize_t)stmp_size; H5_CHECKED_ASSIGN(dset->shared->layout.storage.u.compact.size, size_t, tmp_size, hssize_t); @@ -225,7 +225,7 @@ H5D__compact_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(storage); + assert(storage); /* Compact storage is currently always allocated */ FUNC_LEAVE_NOAPI(TRUE) @@ -328,8 +328,8 @@ H5D__compact_readvv(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dset FUNC_ENTER_PACKAGE - HDassert(io_info); - HDassert(dset_info); + assert(io_info); + assert(dset_info); /* Check if file driver wishes to do its own memory management */ if (H5F_SHARED_HAS_FEATURE(io_info->f_sh, H5FD_FEAT_MEMMANAGE)) { @@ -389,8 +389,8 @@ H5D__compact_writevv(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dse FUNC_ENTER_PACKAGE - HDassert(io_info); - HDassert(dset_info); + assert(io_info); + assert(dset_info); /* Check if file driver wishes to do its own memory management */ if (H5F_SHARED_HAS_FEATURE(io_info->f_sh, H5FD_FEAT_MEMMANAGE)) { @@ -442,7 +442,7 @@ H5D__compact_flush(H5D_t *dset) FUNC_ENTER_PACKAGE /* Sanity check */ - HDassert(dset); + assert(dset); /* Check if the buffered compact information is dirty */ if (dset->shared->layout.storage.u.compact.dirty) { @@ -475,7 +475,7 @@ H5D__compact_dest(H5D_t *dset) FUNC_ENTER_PACKAGE_NOERR /* Sanity check */ - HDassert(dset); + assert(dset); /* Free the buffer for the raw data for compact datasets */ dset->shared->layout.storage.u.compact.buf = H5MM_xfree(dset->shared->layout.storage.u.compact.buf); @@ -514,12 +514,12 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds FUNC_ENTER_PACKAGE /* Check args */ - HDassert(f_src); - HDassert(storage_src); - HDassert(f_dst); - HDassert(storage_dst); - HDassert(storage_dst->buf); - HDassert(dt_src); + assert(f_src); + assert(storage_src); + assert(f_dst); + assert(storage_dst); + assert(storage_dst->buf); + assert(dt_src); /* If the dataset is open in the file, point to "layout" in the shared struct */ if (shared_fo != NULL) @@ -620,7 +620,7 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds H5MM_memcpy(reclaim_buf, buf, buf_size); /* Set background buffer to all zeros */ - HDmemset(bkg, 0, buf_size); + memset(bkg, 0, buf_size); /* Convert from memory to destination file */ if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg) < 0) @@ -643,7 +643,7 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds } /* end if */ else /* Reset value to zero */ - HDmemset(storage_dst->buf, 0, storage_src->size); + memset(storage_dst->buf, 0, storage_src->size); } /* end if */ else /* Type conversion not necessary */ |