mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6752] Purpose:

Browse Source 
Code cleanup

Description:
    Remove some cruft left over from the switch from int->H5G_obj_t

Platforms tested:
    FreeBSD 4.8 (sleipnir), triple check not necessary.
This commit is contained in:
Quincey Koziol 2003-04-25 07:10:44 -05:00
parent f023da1e3f
commit 0462c0bc2c
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/H5G.c
View File

@ -2525,7 +2525,6 @@ static H5G_obj_t
H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id) H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id)
{ {
H5G_obj_t ret_value = H5G_UNKNOWN; H5G_obj_t ret_value = H5G_UNKNOWN;
herr_t ret;
H5G_bt_ud3_t udata; H5G_bt_ud3_t udata;
FUNC_ENTER_NOAPI(H5G_get_objtype_by_idx, FAIL); FUNC_ENTER_NOAPI(H5G_get_objtype_by_idx, FAIL);
@ -2535,8 +2534,8 @@ H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id)
udata.group = grp; udata.group = grp;
/* Iterate over the group members */ /* Iterate over the group members */
if ((ret = H5B_iterate (H5G_fileof(grp), dxpl_id, H5B_SNODE, if (H5B_iterate (H5G_fileof(grp), dxpl_id, H5B_SNODE,
H5G_node_type, grp->ent.cache.stab.btree_addr, &udata))<0) H5G_node_type, grp->ent.cache.stab.btree_addr, &udata)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed"); HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed");
ret_value = udata.type; ret_value = udata.type;

12
src/H5Gpublic.h
View File

@ -52,17 +52,6 @@ typedef enum H5G_link_t {
* application is running. An object may satisfy the `isa' function for more * application is running. An object may satisfy the `isa' function for more
* than one type. * than one type.
*/ */
#ifdef TRY
#define H5G_UNKNOWN (-1) /* Unknown object type */
#define H5G_LINK 0 /* Object is a symbolic link */
#define H5G_GROUP 1 /* Object is a group */
#define H5G_DATASET 2 /* Object is a dataset */
#define H5G_TYPE 3 /* Object is a named data type */
#define H5G_RESERVED_4 4 /* Reserved for future use */
#define H5G_RESERVED_5 5 /* Reserved for future use */
#define H5G_RESERVED_6 6 /* Reserved for future use */
#define H5G_RESERVED_7 7 /* Reserved for future use */
#else
typedef enum H5G_obj_t { typedef enum H5G_obj_t {
H5G_UNKNOWN = -1, /* Unknown object type */ H5G_UNKNOWN = -1, /* Unknown object type */
H5G_LINK, /* Object is a symbolic link */ H5G_LINK, /* Object is a symbolic link */
@ -74,7 +63,6 @@ typedef enum H5G_obj_t {
H5G_RESERVED_6, /* Reserved for future use */ H5G_RESERVED_6, /* Reserved for future use */
H5G_RESERVED_7 /* Reserved for future use */ H5G_RESERVED_7 /* Reserved for future use */
} H5G_obj_t; } H5G_obj_t;
#endif /*TRY*/
#define H5G_NTYPES 256 /* Max possible number of types */ #define H5G_NTYPES 256 /* Max possible number of types */
#define H5G_NLIBTYPES 8 /* Number of internal types */ #define H5G_NLIBTYPES 8 /* Number of internal types */