summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5Gdense.c2
-rw-r--r--src/H5Gdeprec.c6
-rw-r--r--src/H5Glink.c2
-rw-r--r--src/H5Gnode.c2
-rw-r--r--src/H5Gpkg.h4
-rw-r--r--src/H5Gpublic.h31
-rw-r--r--src/H5Gstab.c2
7 files changed, 32 insertions, 17 deletions
diff --git a/src/H5Gdense.c b/src/H5Gdense.c
index 070d551..98e216c 100644
--- a/src/H5Gdense.c
+++ b/src/H5Gdense.c
@@ -906,10 +906,12 @@ H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
/* Check which type of callback to make */
switch(bt2_udata->lnk_op->op_type) {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
case H5G_LINK_OP_OLD:
/* Make the old-type application callback */
ret_value = (bt2_udata->lnk_op->u.old_op)(bt2_udata->gid, fh_udata.lnk->name, bt2_udata->op_data);
break;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
case H5G_LINK_OP_APP:
{
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 2ce8aa3..9145b3b 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -273,7 +273,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, const char *new_name)
+H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new_name)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -318,7 +318,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type,
+H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
hid_t new_loc_id, const char *new_name)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -719,7 +719,6 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
done:
FUNC_LEAVE_API(ret_value)
} /* end H5Gget_comment() */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
/*-------------------------------------------------------------------------
@@ -788,6 +787,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
done:
FUNC_LEAVE_API(ret_value)
} /* end H5Giterate() */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
/*-------------------------------------------------------------------------
diff --git a/src/H5Glink.c b/src/H5Glink.c
index fef0514..608cef2 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -623,10 +623,12 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
for(; u < ltable->nlinks && !ret_value; u++) {
/* Check which kind of callback to make */
switch(lnk_op->op_type) {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
case H5G_LINK_OP_OLD:
/* Make the old-type application callback */
ret_value = (lnk_op->u.old_op)(gid, ltable->lnks[u].name, op_data);
break;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
case H5G_LINK_OP_APP:
{
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index a1884ac..eaa426f 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -1437,10 +1437,12 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
/* Check which type of callback to make */
switch(udata->lnk_op->op_type) {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
case H5G_LINK_OP_OLD:
/* Make the old-type application callback */
ret_value = (udata->lnk_op->u.old_op)(udata->group_id, name, udata->op_data);
break;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
case H5G_LINK_OP_APP:
{
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index b17a54d..427dec4 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -133,12 +133,16 @@ typedef herr_t (*H5G_lib_iterate_t)(const H5O_link_t *lnk, void *op_data);
/* Describe kind of callback to make for each link */
typedef struct {
enum {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_LINK_OP_OLD, /* Old application callback */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5G_LINK_OP_APP, /* Application callback */
H5G_LINK_OP_LIB /* Library internal callback */
} op_type;
union {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_iterate_t old_op; /* Old application callback for each link */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5L_iterate_t app_op; /* Application callback for each link */
H5G_lib_iterate_t lib_op; /* Library internal callback for each link */
} u;
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 26baf8b..6e6560c 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -47,12 +47,6 @@
#define H5G_NUSERTYPES (H5G_NTYPES-H5G_NLIBTYPES)
#define H5G_USERTYPE(X) (8+(X)) /* User defined types */
-#define H5G_LINK_ERROR H5L_TYPE_ERROR
-#define H5G_LINK_HARD H5L_TYPE_HARD
-#define H5G_LINK_SOFT H5L_TYPE_SOFT
-#define H5G_link_t H5L_type_t
-#define H5G_SAME_LOC H5L_SAME_LOC
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -109,9 +103,6 @@ typedef struct H5G_stat_t {
H5O_stat_t ohdr; /* Object header information */
} H5G_stat_t;
-/* Prototype for H5Giterate() operator */
-typedef herr_t (*H5G_iterate_t)(hid_t group, const char *name, void *op_data);
-
/********************/
/* Public Variables */
/********************/
@@ -139,8 +130,6 @@ H5_DLL herr_t H5Gclose(hid_t group_id);
*/
H5_DLL ssize_t H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char* name,
size_t size);
-H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
- H5G_iterate_t op, void *op_data);
H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name,
hbool_t follow_link, H5G_stat_t *statbuf/*out*/);
@@ -151,14 +140,28 @@ H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
*/
#ifndef H5_NO_DEPRECATED_SYMBOLS
+/* Macros */
+
+/* Link definitions */
+#define H5G_SAME_LOC H5L_SAME_LOC
+#define H5G_LINK_ERROR H5L_TYPE_ERROR
+#define H5G_LINK_HARD H5L_TYPE_HARD
+#define H5G_LINK_SOFT H5L_TYPE_SOFT
+#define H5G_link_t H5L_type_t
+
+
/* Typedefs */
+/* Prototype for H5Giterate() operator */
+typedef herr_t (*H5G_iterate_t)(hid_t group, const char *name, void *op_data);
+
+
/* Function prototypes */
H5_DLL hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint);
H5_DLL hid_t H5Gopen1(hid_t loc_id, const char *name);
-H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name,
+H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name,
const char *new_name);
-H5_DLL herr_t H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type,
+H5_DLL herr_t H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
hid_t new_loc_id, const char *new_name);
H5_DLL herr_t H5Gmove(hid_t src_loc_id, const char *src_name,
const char *dst_name);
@@ -170,6 +173,8 @@ H5_DLL herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size,
H5_DLL herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
H5_DLL int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize,
char *buf);
+H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
+ H5G_iterate_t op, void *op_data);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 2bc525c..269c224 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -494,7 +494,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
/* Sanity check */
HDassert(oloc);
- HDassert(lnk_op && lnk_op->u.old_op);
+ HDassert(lnk_op && lnk_op->u.app_op);
/* Get the B-tree info */
if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
generated by cgit v0.12 at 2024-11-02 16:30:10 (GMT)