diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-01-16 21:29:34 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:31:50 (GMT) |
| commit | 3e6a192e9cef92ee1e0cf1842d05995da83efd27 (patch) | |
| tree | 3cd0e18b9a50af6fc00a30a7da24d016b07efbb7 /src/H5Gprivate.h | |
| parent | 335fc0096c4287c1121c45c85085e67e5735c47d (diff) | |
| download | hdf5-3e6a192e9cef92ee1e0cf1842d05995da83efd27.zip hdf5-3e6a192e9cef92ee1e0cf1842d05995da83efd27.tar.gz hdf5-3e6a192e9cef92ee1e0cf1842d05995da83efd27.tar.bz2 | |
Squashed commit of the token_refactoring branch:
Diffstat (limited to 'src/H5Gprivate.h')
| -rw-r--r-- | src/H5Gprivate.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index b735dbd..19b120c 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -174,7 +174,7 @@ typedef struct { #ifndef H5_NO_DEPRECATED_SYMBOLS H5G_iterate_t op_old; /* "Old" application callback for each link */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ - H5L_iterate_t op_new; /* "New" application callback for each link */ + H5L_iterate2_t op_new; /* "New" application callback for each link */ } op_func; } H5G_link_iterate_t; @@ -214,12 +214,12 @@ H5_DLL herr_t H5G_iterate(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, const H5G_link_iterate_t *lnk_op, void *op_data); H5_DLL herr_t H5G_visit(H5G_loc_t *loc, const char *group_name, - H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data); + H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op, void *op_data); /* * Functions that understand links in groups */ -H5_DLL herr_t H5G_link_to_info(const struct H5O_link_t *lnk, H5L_info_t *linfo); +H5_DLL herr_t H5G_link_to_info(const struct H5O_loc_t *link_loc, const struct H5O_link_t *lnk, H5L_info2_t *linfo); /* * Functions that understand group objects @@ -279,7 +279,9 @@ H5_DLL herr_t H5G_loc_find_by_idx(const H5G_loc_t *loc, const char *group_name, H5G_loc_t *obj_loc/*out*/); H5_DLL htri_t H5G_loc_exists(const H5G_loc_t *loc, const char *name); H5_DLL herr_t H5G_loc_info(const H5G_loc_t *loc, const char *name, - H5O_info_t *oinfo/*out*/, unsigned fields); + H5O_info2_t *oinfo/*out*/, unsigned fields); +H5_DLL herr_t H5G_loc_native_info(const H5G_loc_t *loc, const char *name, + H5O_native_info_t *oinfo/*out*/, unsigned fields); H5_DLL herr_t H5G_loc_set_comment(const H5G_loc_t *loc, const char *name, const char *comment); H5_DLL ssize_t H5G_loc_get_comment(const H5G_loc_t *loc, const char *name, |