[svn-r6744]

Purpose: A little code rewriting

Description: object types were defined as macros in H5Gpublic.h

Solution: changed them to enumerate type

Platforms tested: h5committtest

1 files changed, 10 insertions, 9 deletions

diff --git a/src/H5G.c b/src/H5G.c
index a3eb9b5..2b9c043 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -156,7 +156,7 @@ static herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name,
 static herr_t H5G_unlink(H5G_entry_t *loc, const char *name, hid_t dxpl_id);
 static herr_t H5G_get_num_objs(H5G_t *grp, hsize_t *num_objs, hid_t dxpl_id);
 static ssize_t H5G_get_objname_by_idx(H5G_t *grp, hsize_t idx, char* name, size_t size, hid_t dxpl_id);
-static int H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id);
+static H5G_obj_t H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id);
 static herr_t H5G_replace_ent(void *obj_ptr, hid_t obj_id, const void *key);
 static herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/,
                   H5G_entry_t *obj_ent/*in,out*/, int *nlinks/*in,out*/, hid_t dxpl_id);
@@ -511,12 +511,12 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-int
+H5G_obj_t
 H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
 {
     H5G_t		*group = NULL;
     hsize_t             num_objs;
-    int		        ret_value = FAIL;
+    H5G_obj_t		ret_value = H5G_UNKNOWN;
     
     FUNC_ENTER_API(H5Gget_objtype_by_idx, FAIL);
     H5TRACE2("Is","ih",group_id,idx);
@@ -1003,7 +1003,7 @@ H5G_term_interface(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*, hid_t), const char *_desc)
+H5G_register_type(H5G_obj_t type, htri_t(*isa)(H5G_entry_t*, hid_t), const char *_desc)
 {
     char	*desc = NULL;
     size_t	i;
@@ -2298,7 +2298,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-int
+H5G_obj_t
 H5G_get_type(H5G_entry_t *ent, hid_t dxpl_id)
 {
     htri_t	isa;
@@ -2521,10 +2521,11 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static int 
+static H5G_obj_t 
 H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx, hid_t dxpl_id)
 {
-    int		        ret_value = FAIL;
+    H5G_obj_t		ret_value = H5G_UNKNOWN;
+    herr_t              ret;
     H5G_bt_ud3_t	udata;
     
     FUNC_ENTER_NOAPI(H5G_get_objtype_by_idx, FAIL);
@@ -2534,7 +2535,7 @@ 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_value = H5B_iterate (H5G_fileof(grp), dxpl_id, H5B_SNODE,
+    if ((ret = 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");
     
@@ -3057,7 +3058,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_replace_name( int type, H5G_entry_t *loc,
+H5G_replace_name(H5G_obj_t type, H5G_entry_t *loc,
     H5RS_str_t *src_name, H5G_entry_t *src_loc,
     H5RS_str_t *dst_name, H5G_entry_t *dst_loc, H5G_names_op_t op )
 {