Skip to content

Commit

Permalink
Removed trailing semi on all H5_BEGIN_TAG uses, it is not a function-…
Browse files Browse the repository at this point in the history
…like macro
  • Loading branch information
seanm committed Jun 13, 2023
1 parent 72c7de1 commit 4f83a2b
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/H5Aint.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dbtree2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dchunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dearray.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dfarray.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dnone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Dsingle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Gnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down
2 changes: 1 addition & 1 deletion src/H5Gtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Gtraverse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Oainfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/H5Ocopy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Oint.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/H5Olinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down
2 changes: 1 addition & 1 deletion src/H5Oshared.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/H5Ostab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/H5Otest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down Expand Up @@ -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)))
Expand Down Expand Up @@ -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)))
Expand Down

0 comments on commit 4f83a2b

Please sign in to comment.