[svn-r7391] Purpose:

    Bug fix

Description:
    H5Gget_num_objs, H5Gget_objname_by_idx and H5Gget_objtype_by_idx were
only accepting a group ID, instead of a location ID, as our documentation for
them stated.

Solution:
    Allow them to accept a location ID.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

1 files changed, 8 insertions, 5 deletions

diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index f1cd427..e599905 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -89,13 +89,13 @@ typedef struct H5G_bt_ud1_t {
 typedef struct H5G_bt_ud2_t {
     /* downward */
     hid_t	group_id;	/*group id to pass to iteration operator     */
-    struct H5G_t *group;	/*the group to which group_id points	     */
+    H5G_entry_t *ent;           /*the entry to which group_id points         */
     int		skip;		/*initial entries to skip		     */
     H5G_iterate_t op;		/*iteration operator			     */
     void	*op_data;	/*user-defined operator data		     */
 
     /* upward */
-    int		final_ent;  /*final entry looked at */
+    int		final_ent;	/*final entry looked at                      */
     
 } H5G_bt_ud2_t;
 
@@ -104,10 +104,13 @@ typedef struct H5G_bt_ud2_t {
  * H5B_iterate function.
  */
 typedef struct H5G_bt_ud3_t {
-    struct H5G_t *group;	/*the group to which group_id points	     */
-    hsize_t      idx;           /*index of group member to be querried       */
-    char         *name;         /*member name to be returned                 */
+    /* downward */
+    H5G_entry_t *ent;           /*the entry of group being queried           */
+    hsize_t      idx;           /*index of group member to be queried        */
     hsize_t      num_objs;      /*the number of objects having been traversed*/
+
+    /* upward */
+    char         *name;         /*member name to be returned                 */
     H5G_obj_t    type;          /*member type to be returned                 */
 } H5G_bt_ud3_t;