diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-28 14:31:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 14:31:56 (GMT) |
commit | 7a44581a84778a1346a2fd5b6cca7d9db905a321 (patch) | |
tree | 44ea9c2d1b471eb227698abe8499c34cfa6d47d2 /src/H5Dearray.c | |
parent | 622fcbd13881fbc58bbeaed3062583b759f5e864 (diff) | |
download | hdf5-7a44581a84778a1346a2fd5b6cca7d9db905a321.zip hdf5-7a44581a84778a1346a2fd5b6cca7d9db905a321.tar.gz hdf5-7a44581a84778a1346a2fd5b6cca7d9db905a321.tar.bz2 |
Rename HDassert() to assert() (#3191)
* Change HDassert to assert
* Fix bin/make_err
Diffstat (limited to 'src/H5Dearray.c')
-rw-r--r-- | src/H5Dearray.c | 282 |
1 files changed, 141 insertions, 141 deletions
diff --git a/src/H5Dearray.c b/src/H5Dearray.c index 36c3dbc..5a98967 100644 --- a/src/H5Dearray.c +++ b/src/H5Dearray.c @@ -221,9 +221,9 @@ H5D__earray_crt_context(void *_udata) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(udata); - HDassert(udata->f); - HDassert(udata->chunk_size > 0); + assert(udata); + assert(udata->f); + assert(udata->chunk_size > 0); /* Allocate new context structure */ if (NULL == (ctx = H5FL_MALLOC(H5D_earray_ctx_t))) @@ -268,7 +268,7 @@ H5D__earray_dst_context(void *_ctx) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(ctx); + assert(ctx); /* Release context structure */ ctx = H5FL_FREE(H5D_earray_ctx_t, ctx); @@ -297,8 +297,8 @@ H5D__earray_fill(void *nat_blk, size_t nelmts) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(nat_blk); - HDassert(nelmts); + assert(nat_blk); + assert(nelmts); H5VM_array_fill(nat_blk, &fill_val, H5EA_CLS_CHUNK->nat_elmt_size, nelmts); @@ -327,10 +327,10 @@ H5D__earray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(raw); - HDassert(elmt); - HDassert(nelmts); - HDassert(ctx); + assert(raw); + assert(elmt); + assert(nelmts); + assert(ctx); /* Encode native elements into raw elements */ while (nelmts) { @@ -371,9 +371,9 @@ H5D__earray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(raw); - HDassert(elmt); - HDassert(nelmts); + assert(raw); + assert(elmt); + assert(nelmts); /* Decode raw elements into native elements */ while (nelmts) { @@ -412,8 +412,8 @@ H5D__earray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(stream); - HDassert(elmt); + assert(stream); + assert(elmt); /* Print element */ HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx); @@ -443,9 +443,9 @@ H5D__earray_filt_fill(void *nat_blk, size_t nelmts) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(nat_blk); - HDassert(nelmts); - HDassert(sizeof(fill_val) == H5EA_CLS_FILT_CHUNK->nat_elmt_size); + assert(nat_blk); + assert(nelmts); + assert(sizeof(fill_val) == H5EA_CLS_FILT_CHUNK->nat_elmt_size); H5VM_array_fill(nat_blk, &fill_val, H5EA_CLS_FILT_CHUNK->nat_elmt_size, nelmts); @@ -476,10 +476,10 @@ H5D__earray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(raw); - HDassert(elmt); - HDassert(nelmts); - HDassert(ctx); + assert(raw); + assert(elmt); + assert(nelmts); + assert(ctx); /* Encode native elements into raw elements */ while (nelmts) { @@ -523,9 +523,9 @@ H5D__earray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(raw); - HDassert(elmt); - HDassert(nelmts); + assert(raw); + assert(elmt); + assert(nelmts); /* Decode raw elements into native elements */ while (nelmts) { @@ -568,8 +568,8 @@ H5D__earray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(stream); - HDassert(elmt); + assert(stream); + assert(elmt); /* Print element */ HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx); @@ -604,8 +604,8 @@ H5D__earray_crt_dbg_context(H5F_t *f, haddr_t obj_addr) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(f); - HDassert(H5_addr_defined(obj_addr)); + assert(f); + assert(H5_addr_defined(obj_addr)); /* Allocate context for debugging callback */ if (NULL == (dbg_ctx = H5FL_MALLOC(H5D_earray_ctx_ud_t))) @@ -675,7 +675,7 @@ H5D__earray_dst_dbg_context(void *_dbg_ctx) FUNC_ENTER_PACKAGE_NOERR /* Sanity checks */ - HDassert(dbg_ctx); + assert(dbg_ctx); /* Release context structure */ dbg_ctx = H5FL_FREE(H5D_earray_ctx_ud_t, dbg_ctx); @@ -708,16 +708,16 @@ H5D__earray_idx_depend(const H5D_chk_idx_info_t *idx_info) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type); - HDassert(idx_info->storage); - HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->storage->idx_type); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(idx_info->storage->u.earray.ea); + assert(idx_info); + assert(idx_info->f); + assert(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE); + assert(idx_info->pline); + assert(idx_info->layout); + assert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type); + assert(idx_info->storage); + assert(H5D_CHUNK_IDX_EARRAY == idx_info->storage->idx_type); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(idx_info->storage->u.earray.ea); /* Set up object header location for dataset */ H5O_loc_reset(&oloc); @@ -772,15 +772,15 @@ H5D__earray_idx_open(const H5D_chk_idx_info_t *idx_info) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type); - HDassert(idx_info->storage); - HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->storage->idx_type); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(NULL == idx_info->storage->u.earray.ea); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type); + assert(idx_info->storage); + assert(H5D_CHUNK_IDX_EARRAY == idx_info->storage->idx_type); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(NULL == idx_info->storage->u.earray.ea); /* Set up the user data */ udata.f = idx_info->f; @@ -826,13 +826,13 @@ H5D__earray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t *space, had FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(space); - HDassert(H5_addr_defined(dset_ohdr_addr)); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(space); + assert(H5_addr_defined(dset_ohdr_addr)); /* Get the dim info for dataset */ if ((sndims = H5S_get_simple_extent_dims(space, NULL, max_dims)) < 0) @@ -895,13 +895,13 @@ H5D__earray_idx_create(const H5D_chk_idx_info_t *idx_info) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(!H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(NULL == idx_info->storage->u.earray.ea); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(!H5_addr_defined(idx_info->storage->idx_addr)); + assert(NULL == idx_info->storage->u.earray.ea); /* General parameters */ if (idx_info->pline->nused > 0) { @@ -922,15 +922,15 @@ H5D__earray_idx_create(const H5D_chk_idx_info_t *idx_info) cparam.raw_elmt_size = (uint8_t)H5F_SIZEOF_ADDR(idx_info->f); } /* end else */ cparam.max_nelmts_bits = idx_info->layout->u.earray.cparam.max_nelmts_bits; - HDassert(cparam.max_nelmts_bits > 0); + assert(cparam.max_nelmts_bits > 0); cparam.idx_blk_elmts = idx_info->layout->u.earray.cparam.idx_blk_elmts; - HDassert(cparam.idx_blk_elmts > 0); + assert(cparam.idx_blk_elmts > 0); cparam.sup_blk_min_data_ptrs = idx_info->layout->u.earray.cparam.sup_blk_min_data_ptrs; - HDassert(cparam.sup_blk_min_data_ptrs > 0); + assert(cparam.sup_blk_min_data_ptrs > 0); cparam.data_blk_min_elmts = idx_info->layout->u.earray.cparam.data_blk_min_elmts; - HDassert(cparam.data_blk_min_elmts > 0); + assert(cparam.data_blk_min_elmts > 0); cparam.max_dblk_page_nelmts_bits = idx_info->layout->u.earray.cparam.max_dblk_page_nelmts_bits; - HDassert(cparam.max_dblk_page_nelmts_bits > 0); + assert(cparam.max_dblk_page_nelmts_bits > 0); /* Set up the user data */ udata.f = idx_info->f; @@ -972,7 +972,7 @@ H5D__earray_idx_is_space_alloc(const H5O_storage_chunk_t *storage) FUNC_ENTER_PACKAGE_NOERR /* Check args */ - HDassert(storage); + assert(storage); FUNC_LEAVE_NOAPI((hbool_t)H5_addr_defined(storage->idx_addr)) } /* end H5D__earray_idx_is_space_alloc() */ @@ -998,13 +998,13 @@ H5D__earray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(udata); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(udata); /* Check if the extensible array is open yet */ if (NULL == idx_info->storage->u.earray.ea) { @@ -1069,13 +1069,13 @@ H5D__earray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(udata); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(udata); /* Check if the extensible array is open yet */ if (NULL == idx_info->storage->u.earray.ea) { @@ -1162,7 +1162,7 @@ H5D__earray_idx_resize(H5O_layout_chunk_t *layout) FUNC_ENTER_PACKAGE_NOERR /* Check args */ - HDassert(layout); + assert(layout); /* "Swizzle" constant dimensions for this dataset */ if (layout->u.earray.unlim_dim > 0) { @@ -1232,7 +1232,7 @@ H5D__earray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void * /* Update coordinates of chunk in dataset */ ndims = udata->common.layout->ndims - 1; - HDassert(ndims > 0); + assert(ndims > 0); curr_dim = (int)(ndims - 1); while (curr_dim >= 0) { /* Increment coordinate in current dimension */ @@ -1278,14 +1278,14 @@ H5D__earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(chunk_cb); - HDassert(chunk_udata); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(chunk_cb); + assert(chunk_udata); /* Check if the extensible array is open yet */ if (NULL == idx_info->storage->u.earray.ea) { @@ -1350,13 +1350,13 @@ H5D__earray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(udata); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(udata); /* Check if the extensible array is open yet */ if (NULL == idx_info->storage->u.earray.ea) { @@ -1402,7 +1402,7 @@ H5D__earray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk info") /* Remove raw data chunk from file if not doing SWMR writes */ - HDassert(H5_addr_defined(elmt.addr)); + assert(H5_addr_defined(elmt.addr)); if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) { H5_CHECK_OVERFLOW(elmt.nbytes, /*From: */ uint32_t, /*To: */ hsize_t); if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, elmt.addr, (hsize_t)elmt.nbytes) < 0) @@ -1424,7 +1424,7 @@ H5D__earray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address") /* Remove raw data chunk from file if not doing SWMR writes */ - HDassert(H5_addr_defined(addr)); + assert(H5_addr_defined(addr)); if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) { H5_CHECK_OVERFLOW(idx_info->layout->size, /*From: */ uint32_t, /*To: */ hsize_t); if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, addr, (hsize_t)idx_info->layout->size) < 0) @@ -1463,10 +1463,10 @@ H5D__earray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(chunk_rec); - HDassert(H5_addr_defined(chunk_rec->chunk_addr)); - HDassert(chunk_rec->nbytes > 0); - HDassert(f); + assert(chunk_rec); + assert(H5_addr_defined(chunk_rec->chunk_addr)); + assert(chunk_rec->nbytes > 0); + assert(f); /* Remove raw data chunk from file */ H5_CHECK_OVERFLOW(chunk_rec->nbytes, /*From: */ uint32_t, /*To: */ hsize_t); @@ -1503,11 +1503,11 @@ H5D__earray_idx_delete(const H5D_chk_idx_info_t *idx_info) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); /* Check if the index data structure has been allocated */ if (H5_addr_defined(idx_info->storage->idx_addr)) { @@ -1532,7 +1532,7 @@ H5D__earray_idx_delete(const H5D_chk_idx_info_t *idx_info) idx_info->storage->idx_addr = HADDR_UNDEF; } /* end if */ else - HDassert(NULL == idx_info->storage->u.earray.ea); + assert(NULL == idx_info->storage->u.earray.ea); done: FUNC_LEAVE_NOAPI(ret_value) @@ -1558,17 +1558,17 @@ H5D__earray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info_src); - HDassert(idx_info_src->f); - HDassert(idx_info_src->pline); - HDassert(idx_info_src->layout); - HDassert(idx_info_src->storage); - HDassert(idx_info_dst); - HDassert(idx_info_dst->f); - HDassert(idx_info_dst->pline); - HDassert(idx_info_dst->layout); - HDassert(idx_info_dst->storage); - HDassert(!H5_addr_defined(idx_info_dst->storage->idx_addr)); + assert(idx_info_src); + assert(idx_info_src->f); + assert(idx_info_src->pline); + assert(idx_info_src->layout); + assert(idx_info_src->storage); + assert(idx_info_dst); + assert(idx_info_dst->f); + assert(idx_info_dst->pline); + assert(idx_info_dst->layout); + assert(idx_info_dst->storage); + assert(!H5_addr_defined(idx_info_dst->storage->idx_addr)); /* Check if the source extensible array is open yet */ if (NULL == idx_info_src->storage->u.earray.ea) @@ -1582,7 +1582,7 @@ H5D__earray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk /* Create the extensible array that describes chunked storage in the dest. file */ if (H5D__earray_idx_create(idx_info_dst) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunked storage") - HDassert(H5_addr_defined(idx_info_dst->storage->idx_addr)); + assert(H5_addr_defined(idx_info_dst->storage->idx_addr)); /* Reset metadata tag */ H5_END_TAG @@ -1611,10 +1611,10 @@ H5D__earray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chun FUNC_ENTER_PACKAGE /* Check args */ - HDassert(storage_src); - HDassert(storage_src->u.earray.ea); - HDassert(storage_dst); - HDassert(storage_dst->u.earray.ea); + assert(storage_src); + assert(storage_src->u.earray.ea); + assert(storage_dst); + assert(storage_dst->u.earray.ea); /* Close extensible arrays */ if (H5EA_close(storage_src->u.earray.ea) < 0) @@ -1651,13 +1651,13 @@ H5D__earray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->pline); - HDassert(idx_info->layout); - HDassert(idx_info->storage); - HDassert(H5_addr_defined(idx_info->storage->idx_addr)); - HDassert(index_size); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->pline); + assert(idx_info->layout); + assert(idx_info->storage); + assert(H5_addr_defined(idx_info->storage->idx_addr)); + assert(index_size); /* Open the extensible array in file */ if (H5D__earray_idx_open(idx_info) < 0) @@ -1702,7 +1702,7 @@ H5D__earray_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr) FUNC_ENTER_PACKAGE_NOERR /* Check args */ - HDassert(storage); + assert(storage); /* Reset index info */ if (reset_addr) { @@ -1732,8 +1732,8 @@ H5D__earray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream) FUNC_ENTER_PACKAGE_NOERR /* Check args */ - HDassert(storage); - HDassert(stream); + assert(storage); + assert(stream); HDfprintf(stream, " Address: %" PRIuHADDR "\n", storage->idx_addr); @@ -1760,9 +1760,9 @@ H5D__earray_idx_dest(const H5D_chk_idx_info_t *idx_info) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(idx_info); - HDassert(idx_info->f); - HDassert(idx_info->storage); + assert(idx_info); + assert(idx_info->f); + assert(idx_info->storage); /* Check if the extensible array is open */ if (idx_info->storage->u.earray.ea) { |