summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-04-25 12:10:44 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-04-25 12:10:44 (GMT)
commit0462c0bc2c4ebd0fc2b6343dee0c019d39777efc (patch)
tree6e40644e4b8fac169d5386c3a4734a3cafe069ac /src
parentf023da1e3f9f46142786b95c25ec2e46d0f1b350 (diff)
downloadhdf5-0462c0bc2c4ebd0fc2b6343dee0c019d39777efc.zip
hdf5-0462c0bc2c4ebd0fc2b6343dee0c019d39777efc.tar.gz
hdf5-0462c0bc2c4ebd0fc2b6343dee0c019d39777efc.tar.bz2
[svn-r6752] Purpose:
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.
Diffstat (limited to 'src')
-rw-r--r--src/H5G.c5
-rw-r--r--src/H5Gpublic.h12
2 files changed, 2 insertions, 15 deletions
diff --git a/src/H5G.c b/src/H5G.c
index 2b9c043..fb11f8d 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -2525,7 +2525,6 @@ static H5G_obj_t
H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id)
{
H5G_obj_t ret_value = H5G_UNKNOWN;
- herr_t ret;
H5G_bt_ud3_t udata;
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;
/* Iterate over the group members */
- if ((ret = H5B_iterate (H5G_fileof(grp), dxpl_id, H5B_SNODE,
- H5G_node_type, grp->ent.cache.stab.btree_addr, &udata))<0)
+ if (H5B_iterate (H5G_fileof(grp), dxpl_id, H5B_SNODE,
+ H5G_node_type, grp->ent.cache.stab.btree_addr, &udata)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed");
ret_value = udata.type;
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index febb6c7..88b6c45 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -52,17 +52,6 @@ typedef enum H5G_link_t {
* application is running. An object may satisfy the `isa' function for more
* 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 {
H5G_UNKNOWN = -1, /* Unknown object type */
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_7 /* Reserved for future use */
} H5G_obj_t;
-#endif /*TRY*/
#define H5G_NTYPES 256 /* Max possible number of types */
#define H5G_NLIBTYPES 8 /* Number of internal types */