From 4f83a2bb598e9f113b2f6bbd65f7354ef9aa175b Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 3 Jan 2023 23:40:38 -0500 Subject: [PATCH] Removed trailing semi on all H5_BEGIN_TAG uses, it is not a function-like macro --- src/H5Aint.c | 2 +- src/H5Dbtree2.c | 2 +- src/H5Dchunk.c | 2 +- src/H5Dearray.c | 2 +- src/H5Dfarray.c | 2 +- src/H5Dnone.c | 2 +- src/H5Dsingle.c | 2 +- src/H5Gnode.c | 2 +- src/H5Gtest.c | 2 +- src/H5Gtraverse.c | 2 +- src/H5Oainfo.c | 2 +- src/H5Ocopy.c | 2 +- src/H5Oint.c | 2 +- src/H5Olinfo.c | 2 +- src/H5Oshared.c | 2 +- src/H5Ostab.c | 2 +- src/H5Otest.c | 6 +++--- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/H5Aint.c b/src/H5Aint.c index e188e11a55c..ad6e0768981 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -2566,7 +2566,7 @@ H5A__dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset attribute sharing") /* Set COPIED tag for destination object's metadata */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Insert attribute into dense storage */ if (H5A__dense_insert(udata->file, udata->ainfo, attr_dst) < 0) diff --git a/src/H5Dbtree2.c b/src/H5Dbtree2.c index 9cb464a75e9..135c564f4a9 100644 --- a/src/H5Dbtree2.c +++ b/src/H5Dbtree2.c @@ -1321,7 +1321,7 @@ H5D__bt2_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk_id HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open v2 B-tree") /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Create v2 B-tree that describes the chunked dataset in the destination file */ if (H5D__bt2_idx_create(idx_info_dst) < 0) diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 5fd058e953a..0087e70ab2e 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -6885,7 +6885,7 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to write raw data to file") /* Set metadata tag in API context */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Insert chunk record into index */ if (need_insert && udata->idx_info_dst->storage->ops->insert) diff --git a/src/H5Dearray.c b/src/H5Dearray.c index 5662c08aeb8..36c3dbc7815 100644 --- a/src/H5Dearray.c +++ b/src/H5Dearray.c @@ -1577,7 +1577,7 @@ H5D__earray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open extensible array") /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Create the extensible array that describes chunked storage in the dest. file */ if (H5D__earray_idx_create(idx_info_dst) < 0) diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index bcb4106534f..e215230172e 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -1435,7 +1435,7 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array") /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Create the fixed array that describes chunked storage in the dest. file */ if (H5D__farray_idx_create(idx_info_dst) < 0) diff --git a/src/H5Dnone.c b/src/H5Dnone.c index f4a6b26e4b1..eb2a137f89d 100644 --- a/src/H5Dnone.c +++ b/src/H5Dnone.c @@ -385,7 +385,7 @@ H5D__none_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_inf HDassert(idx_info_dst->storage); /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Allocate dataset chunks in the dest. file */ if (H5D__none_idx_create(idx_info_dst) < 0) diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c index 8c144e8e876..9566a5c32cd 100644 --- a/src/H5Dsingle.c +++ b/src/H5Dsingle.c @@ -442,7 +442,7 @@ H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_i HDassert(idx_info_dst->storage); /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Set up information at the destination file */ if (H5D__single_idx_create(idx_info_dst) < 0) diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 2b6786081e0..101604fcd42 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1300,7 +1300,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get source object name") /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Insert the new object in the destination file's group */ /* (Don't increment the link count - that's already done above for hard links) */ diff --git a/src/H5Gtest.c b/src/H5Gtest.c index fb78775e839..2299fdc1b7f 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -424,7 +424,7 @@ H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count) api_ctx_pushed = TRUE; /* Set metadata tag in API context */ - H5_BEGIN_TAG(grp->oloc.addr); + H5_BEGIN_TAG(grp->oloc.addr) /* Get the link info */ if (H5G__obj_get_linfo(&(grp->oloc), &linfo) < 0) diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c index 1e6fe201006..24a9cb87bab 100644 --- a/src/H5Gtraverse.c +++ b/src/H5Gtraverse.c @@ -829,7 +829,7 @@ H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traver * shouldn't be during the traversal. Note that for best tagging assertion * coverage, setting H5C_DO_TAGGING_SANITY_CHECKS is advised. */ - H5_BEGIN_TAG(H5AC__INVALID_TAG); + H5_BEGIN_TAG(H5AC__INVALID_TAG) /* Go perform "real" traversal */ if (H5G__traverse_real(loc, name, target, op, op_data) < 0) diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index 30c41804d35..b5e21efb540 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -428,7 +428,7 @@ H5O__ainfo_copy_file(H5F_t H5_ATTR_NDEBUG_UNUSED *file_src, void *mesg_src, H5F_ /* Prepare to copy dense attributes - actual copy in post_copy */ /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) if (H5A__dense_create(file_dst, ainfo_dst) < 0) HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINIT, NULL, "unable to create dense storage for attributes") diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 8d39800ddb4..9da56c732c0 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -745,7 +745,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "unable to re-tag metadata entries") /* Set metadata tag for destination object's object header */ - H5_BEGIN_TAG(oloc_dst->addr); + H5_BEGIN_TAG(oloc_dst->addr) /* Insert destination object header in cache */ if (H5AC_insert_entry(oloc_dst->file, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0) diff --git a/src/H5Oint.c b/src/H5Oint.c index 4f5fb52b56f..f262545a0f2 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -517,7 +517,7 @@ H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t init } /* Set metadata tag in API context */ - H5_BEGIN_TAG(oh_addr); + H5_BEGIN_TAG(oh_addr) /* Cache object header */ if (H5AC_insert_entry(f, H5AC_OHDR, oh_addr, oh, insert_flags) < 0) diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c index afe601661cd..0330f21dc74 100644 --- a/src/H5Olinfo.c +++ b/src/H5Olinfo.c @@ -458,7 +458,7 @@ H5O__linfo_post_copy_file_cb(const H5O_link_t *src_lnk, void *_udata) dst_lnk_init = TRUE; /* Set metadata tag in API context */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Insert the new object in the destination file's group */ /* (Doesn't increment the link count - that's already been taken care of for hard links) */ diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 22d71a07f39..a6af84ee081 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -602,7 +602,7 @@ H5O__shared_copy_file(H5F_t H5_ATTR_NDEBUG_UNUSED *file_src, H5F_t *file_dst, if (shared_src->type != H5O_SHARE_TYPE_COMMITTED) { /* Simulate trying to share new message in the destination file. */ /* Set copied metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) if (H5SM_try_share(file_dst, NULL, H5SM_DEFER, mesg_type->id, _native_dst, mesg_flags) < 0) HGOTO_ERROR_TAG(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to determine if message should be shared") diff --git a/src/H5Ostab.c b/src/H5Ostab.c index 4a94485069f..3b7417d3ef8 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -307,7 +307,7 @@ H5O__stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size") /* Set copy metadata tag */ - H5_BEGIN_TAG(H5AC__COPIED_TAG); + H5_BEGIN_TAG(H5AC__COPIED_TAG) /* Create components of symbol table message */ if (H5G__stab_create_components(file_dst, stab_dst, size_hint) < 0) diff --git a/src/H5Otest.c b/src/H5Otest.c index 687d7c6f55a..f3e67453153 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -197,7 +197,7 @@ H5O__is_attr_empty_test(hid_t oid) HDassert(nattrs == 0); /* Set metadata tag in API context */ - H5_BEGIN_TAG(loc->addr); + H5_BEGIN_TAG(loc->addr) /* Open the name index v2 B-tree */ if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL))) @@ -299,7 +299,7 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs) HDassert(obj_nattrs == 0); /* Set metadata tag in API context */ - H5_BEGIN_TAG(loc->addr); + H5_BEGIN_TAG(loc->addr) /* Open the name index v2 B-tree */ if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL))) @@ -376,7 +376,7 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) api_ctx_pushed = TRUE; /* Set metadata tag in API context */ - H5_BEGIN_TAG(loc->addr); + H5_BEGIN_TAG(loc->addr) /* Get the object header */ if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))