Skip to content

Commit

Permalink
Committing clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jan 28, 2025
1 parent 47c01f3 commit 44068c3
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 49 deletions.
2 changes: 1 addition & 1 deletion src/H5CX.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ herr_t
H5CX__init_package(void)
{
H5P_genplist_t *dx_plist; /* Data transfer property list */
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *la_plist; /* Link access property list */
H5P_genplist_t *dcpl; /* Dataset creation property list */
H5P_genplist_t *dapl; /* Dataset access property list */
Expand Down
4 changes: 2 additions & 2 deletions src/H5Dint.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ H5D__close_cb(H5VL_object_t *dset_vol_obj, void **request)
*-------------------------------------------------------------------------
*/
H5D_t *
H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space, H5P_genplist_t *lcpl,
H5P_genplist_t *dcpl, H5P_genplist_t *dapl)
H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space,
H5P_genplist_t *lcpl, H5P_genplist_t *dcpl, H5P_genplist_t *dapl)
{
H5O_obj_create_t ocrt_info; /* Information for object creation */
H5D_obj_create_t dcrt_info; /* Information for dataset creation */
Expand Down
3 changes: 2 additions & 1 deletion src/H5Gpkg.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ H5FL_EXTERN(H5G_shared_t);
* General group routines
*/
H5_DLL H5G_t *H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info);
H5_DLL H5G_t *H5G__create_named(const H5G_loc_t *loc, const char *name, H5P_genplist_t *lcpl, H5P_genplist_t *gcpl);
H5_DLL H5G_t *H5G__create_named(const H5G_loc_t *loc, const char *name, H5P_genplist_t *lcpl,
H5P_genplist_t *gcpl);
H5_DLL H5G_t *H5G__open_name(const H5G_loc_t *loc, const char *name);
H5_DLL herr_t H5G__get_info_by_name(const H5G_loc_t *loc, const char *name, H5G_info_t *grp_info);
H5_DLL herr_t H5G__get_info_by_idx(const H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
Expand Down
29 changes: 16 additions & 13 deletions src/H5Lint.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ typedef struct {
/* User data for path traversal callback to creating a link */
struct H5L_trav_cr_t {
H5F_t *file; /* Pointer to the file */
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *lcpl; /* Link creation property list */
H5G_name_t *path; /* Path to object being linked */
H5O_obj_create_t *ocrt_info; /* Pointer to object creation info */
H5O_link_t *lnk; /* Pointer to link information to insert */
Expand Down Expand Up @@ -139,7 +139,8 @@ static int H5L__find_class_idx(H5L_type_t id);
static herr_t H5L__link_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
static herr_t H5L__create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *obj_path,
H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, H5P_genplist_t *lcpl);
H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info,
H5P_genplist_t *lcpl);
static herr_t H5L__get_val_real(const H5O_link_t *lnk, void *buf, size_t size);
static herr_t H5L__get_val_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
Expand Down Expand Up @@ -497,7 +498,8 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc, H5P
*-------------------------------------------------------------------------
*/
herr_t
H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, H5O_obj_create_t *ocrt_info, H5P_genplist_t *lcpl)
H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, H5O_obj_create_t *ocrt_info,
H5P_genplist_t *lcpl)
{
H5O_link_t lnk; /* Link to insert */
herr_t ret_value = SUCCEED; /* Return value */
Expand Down Expand Up @@ -708,10 +710,10 @@ static herr_t
H5L__create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *obj_path, H5F_t *obj_file,
H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, H5P_genplist_t *lcpl)
{
char *norm_link_name = NULL; /* Pointer to normalized link name */
unsigned target_flags = H5G_TARGET_NORMAL; /* Flags to pass to group traversal function */
H5L_trav_cr_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
char *norm_link_name = NULL; /* Pointer to normalized link name */
unsigned target_flags = H5G_TARGET_NORMAL; /* Flags to pass to group traversal function */
H5L_trav_cr_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE

Expand Down Expand Up @@ -753,7 +755,7 @@ H5L__create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *o
* inserting it in the callback.
*/
udata.file = obj_file;
udata.lcpl = lcpl;
udata.lcpl = lcpl;
udata.path = obj_path;
udata.ocrt_info = ocrt_info;
udata.lnk = lnk;
Expand Down Expand Up @@ -849,7 +851,8 @@ H5L__create_hard(H5G_loc_t *cur_loc, const char *cur_name, const H5G_loc_t *link
*-------------------------------------------------------------------------
*/
herr_t
H5L__create_soft(const char *target_path, const H5G_loc_t *link_loc, const char *link_name, H5P_genplist_t *lcpl)
H5L__create_soft(const char *target_path, const H5G_loc_t *link_loc, const char *link_name,
H5P_genplist_t *lcpl)
{
char *norm_target = NULL; /* Pointer to normalized current name */
H5O_link_t lnk; /* Link to insert */
Expand Down Expand Up @@ -1567,10 +1570,10 @@ herr_t
H5L__move(const H5G_loc_t *src_loc, const char *src_name, const H5G_loc_t *dst_loc, const char *dst_name,
bool copy_flag, H5P_genplist_t *lcpl)
{
unsigned dst_target_flags = H5G_TARGET_NORMAL;
H5T_cset_t char_encoding = H5F_DEFAULT_CSET; /* Character encoding for link */
H5L_trav_mv_t udata; /* User data for traversal */
herr_t ret_value = SUCCEED; /* Return value */
unsigned dst_target_flags = H5G_TARGET_NORMAL;
H5T_cset_t char_encoding = H5F_DEFAULT_CSET; /* Character encoding for link */
H5L_trav_mv_t udata; /* User data for traversal */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE

Expand Down
3 changes: 2 additions & 1 deletion src/H5Lprivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ typedef struct H5L_trav_cr_t H5L_trav_cr_t;

/* General operations on links */
H5_DLL herr_t H5L_init(void);
H5_DLL herr_t H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc, H5P_genplist_t *lcpl);
H5_DLL herr_t H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
H5P_genplist_t *lcpl);
H5_DLL herr_t H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, H5O_obj_create_t *ocrt_info,
H5P_genplist_t *lcpl);
H5_DLL herr_t H5L_exists_tolerant(const H5G_loc_t *loc, const char *name, bool *exists);
Expand Down
6 changes: 4 additions & 2 deletions src/H5Ocopy.c
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,8 @@ H5O__copy_free_addrmap_cb(void *_item, void H5_ATTR_UNUSED *key, void H5_ATTR_UN
*-------------------------------------------------------------------------
*/
static herr_t
H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t ocpypl_id, H5P_genplist_t *lcpl)
H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t ocpypl_id,
H5P_genplist_t *lcpl)
{
H5O_copy_t cpy_info; /* Information for copying object */
H5P_genplist_t *ocpy_plist; /* Object copy property list created */
Expand Down Expand Up @@ -1025,7 +1026,8 @@ H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t
*-------------------------------------------------------------------------
*/
static herr_t
H5O__copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_t ocpypl_id, H5P_genplist_t *lcpl)
H5O__copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_t ocpypl_id,
H5P_genplist_t *lcpl)
{
H5G_name_t new_path; /* Copied object group hier. path */
H5O_loc_t new_oloc; /* Copied object object location */
Expand Down
2 changes: 1 addition & 1 deletion src/H5Oprivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ typedef struct H5O_copy_t {
void *shared_fo; /* The shared pointer for the src object */
H5O_mcdt_search_cb_t mcdt_cb; /* The callback to invoke before searching the global list of committed
datatypes at destination */
void *mcdt_ud; /* User data passed to callback */
void *mcdt_ud; /* User data passed to callback */
H5P_genplist_t *lcpl; /* LCPL for callbacks' use */
} H5O_copy_t;

Expand Down
3 changes: 2 additions & 1 deletion src/H5Tcommit.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, h
*-------------------------------------------------------------------------
*/
herr_t
H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, H5P_genplist_t *lcpl, H5P_genplist_t *tcpl)
H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, H5P_genplist_t *lcpl,
H5P_genplist_t *tcpl)
{
H5O_obj_create_t ocrt_info; /* Information for object creation */
H5T_obj_create_t tcrt_info; /* Information for named datatype creation */
Expand Down
10 changes: 5 additions & 5 deletions src/H5Tpkg.h
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,11 @@ H5_DLL herr_t H5T__visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op, voi
H5_DLL herr_t H5T__upgrade_version(H5T_t *dt, unsigned new_version);

/* Committed / named datatype routines */
H5_DLL herr_t H5T__commit_anon(H5F_t *file, H5T_t *type, H5P_genplist_t *tcpl);
H5_DLL herr_t H5T__commit(H5F_t *file, H5T_t *type, H5P_genplist_t *tcpl);
H5_DLL herr_t H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, H5P_genplist_t *lcpl,
H5P_genplist_t *tcpl);
H5_DLL H5T_t *H5T__open_name(const H5G_loc_t *loc, const char *name);
H5_DLL herr_t H5T__commit_anon(H5F_t *file, H5T_t *type, H5P_genplist_t *tcpl);
H5_DLL herr_t H5T__commit(H5F_t *file, H5T_t *type, H5P_genplist_t *tcpl);
H5_DLL herr_t H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, H5P_genplist_t *lcpl,
H5P_genplist_t *tcpl);
H5_DLL H5T_t *H5T__open_name(const H5G_loc_t *loc, const char *name);
H5_DLL H5P_genplist_t *H5T__get_create_plist(const H5T_t *type);

/* Bit twiddling functions */
Expand Down
2 changes: 1 addition & 1 deletion src/H5VLnative_dataset.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ H5VL__native_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, cons
} /* end if */
/* H5Dcreate2 */
else {
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *lcpl; /* Link creation property list */

/* Create the new dataset & get its ID */
if (NULL == (lcpl = H5I_object(lcpl_id)))
Expand Down
2 changes: 1 addition & 1 deletion src/H5VLnative_datatype.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ H5VL__native_datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, con

/* Commit the datatype */
if (NULL != name) {
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *lcpl; /* Link creation property list */

/* H5Tcommit */
if (NULL == (lcpl = H5I_object(lcpl_id)))
Expand Down
2 changes: 1 addition & 1 deletion src/H5VLnative_group.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const
} /* end if */
/* otherwise it's from H5Gcreate */
else {
H5P_genplist_t *lcpl; /* Link creation property list */
H5P_genplist_t *lcpl; /* Link creation property list */

/* Create the new group & get its ID */
if (NULL == (lcpl = H5I_object(lcpl_id)))
Expand Down
35 changes: 20 additions & 15 deletions src/H5VLnative_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ H5VL__native_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_lo
hid_t lcpl_id, hid_t H5_ATTR_UNUSED lapl_id, hid_t H5_ATTR_UNUSED dxpl_id,
void H5_ATTR_UNUSED **req)
{
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE

Expand Down Expand Up @@ -108,7 +108,8 @@ H5VL__native_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_lo
"source and destination should be in the same file.");

/* Create the link */
if (H5L__create_hard(cur_loc_p, cur_params->loc_data.loc_by_name.name, link_loc_p, loc_params->loc_data.loc_by_name.name, lcpl) < 0)
if (H5L__create_hard(cur_loc_p, cur_params->loc_data.loc_by_name.name, link_loc_p,
loc_params->loc_data.loc_by_name.name, lcpl) < 0)
HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link");
} /* end if */
else { /* H5Olink */
Expand All @@ -125,7 +126,8 @@ H5VL__native_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_lo

if (H5G_loc_real(obj, loc_params->obj_type, &link_loc) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object");
if (H5L__create_soft(args->args.soft.target, &link_loc, loc_params->loc_data.loc_by_name.name, lcpl) < 0)
if (H5L__create_soft(args->args.soft.target, &link_loc, loc_params->loc_data.loc_by_name.name,
lcpl) < 0)
HGOTO_ERROR(H5E_LINK, H5E_CANTCREATE, FAIL, "unable to create link");

break;
Expand All @@ -136,7 +138,8 @@ H5VL__native_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_lo

if (H5G_loc_real(obj, loc_params->obj_type, &link_loc) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object");
if (H5L__create_ud(&link_loc, loc_params->loc_data.loc_by_name.name, args->args.ud.buf, args->args.ud.buf_size, args->args.ud.type, lcpl) < 0)
if (H5L__create_ud(&link_loc, loc_params->loc_data.loc_by_name.name, args->args.ud.buf,
args->args.ud.buf_size, args->args.ud.type, lcpl) < 0)
HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link");

break;
Expand Down Expand Up @@ -164,10 +167,10 @@ H5VL__native_link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, void
const H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t H5_ATTR_UNUSED lapl_id,
hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
{
H5G_loc_t src_loc, *src_loc_p;
H5G_loc_t dst_loc, *dst_loc_p;
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */
H5G_loc_t src_loc, *src_loc_p;
H5G_loc_t dst_loc, *dst_loc_p;
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE

Expand All @@ -187,7 +190,8 @@ H5VL__native_link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, void
/* Copy the link */
if (NULL == (lcpl = H5I_object(lcpl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
if (H5L__move(src_loc_p, loc_params1->loc_data.loc_by_name.name, dst_loc_p, loc_params2->loc_data.loc_by_name.name, true, lcpl) < 0)
if (H5L__move(src_loc_p, loc_params1->loc_data.loc_by_name.name, dst_loc_p,
loc_params2->loc_data.loc_by_name.name, true, lcpl) < 0)
HGOTO_ERROR(H5E_LINK, H5E_CANTCOPY, FAIL, "unable to copy link");

done:
Expand All @@ -208,10 +212,10 @@ H5VL__native_link_move(void *src_obj, const H5VL_loc_params_t *loc_params1, void
const H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t H5_ATTR_UNUSED lapl_id,
hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
{
H5G_loc_t src_loc, *src_loc_p;
H5G_loc_t dst_loc, *dst_loc_p;
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */
H5G_loc_t src_loc, *src_loc_p;
H5G_loc_t dst_loc, *dst_loc_p;
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE

Expand All @@ -231,7 +235,8 @@ H5VL__native_link_move(void *src_obj, const H5VL_loc_params_t *loc_params1, void
/* Move the link */
if (NULL == (lcpl = H5I_object(lcpl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
if (H5L__move(src_loc_p, loc_params1->loc_data.loc_by_name.name, dst_loc_p, loc_params2->loc_data.loc_by_name.name, false, lcpl) < 0)
if (H5L__move(src_loc_p, loc_params1->loc_data.loc_by_name.name, dst_loc_p,
loc_params2->loc_data.loc_by_name.name, false, lcpl) < 0)
HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link");

done:
Expand Down
8 changes: 4 additions & 4 deletions src/H5VLnative_object.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ H5VL__native_object_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, co
hid_t ocpypl_id, hid_t lcpl_id, hid_t H5_ATTR_UNUSED dxpl_id,
void H5_ATTR_UNUSED **req)
{
H5G_loc_t src_loc; /* Source object group location */
H5G_loc_t dst_loc; /* Destination group location */
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = FAIL;
H5G_loc_t src_loc; /* Source object group location */
H5G_loc_t dst_loc; /* Destination group location */
H5P_genplist_t *lcpl; /* Link creation property list */
herr_t ret_value = FAIL;

FUNC_ENTER_PACKAGE

Expand Down

0 comments on commit 44068c3

Please sign in to comment.