[svn-r7057] Purpose:

    Bug fix, refactored code

Description:
    Fixed closing objects for "strong" file degree, which previously would
sometime attempt to close the same object twice (when a named datatype and
a dataset which used it were both left open before the file was closed).

    Stopped datatype iteration from querying for the group entry of non-named
datatypes.

    Added attributes to the list of objects that can be queried by
H5Fget_obj_count and H5Fget_obj_ids, since they can hold open a file also.

    Took a suggestion from Robb to return the number of open objects
in the return values of H5Fget_obj_count and H5Fget_obj_ids.

    Also, added a "max_objs" parameter to the H5Fget_obj_ids function, so that
it can work well with staticly allocated arrays.


Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

1 files changed, 2 insertions, 3 deletions

diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index ac5ba2d..53dc8ad 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -381,9 +381,8 @@ H5_DLL herr_t H5F_init(void);
 H5_DLL hid_t H5F_get_driver_id(const H5F_t *f);
 H5_DLL unsigned H5F_get_intent(const H5F_t *f);
 H5_DLL herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum);
-H5_DLL herr_t H5F_get_obj_count(H5F_t *f, unsigned types,
-                                 unsigned *obj_id_count);
-H5_DLL herr_t H5F_get_obj_ids(H5F_t *f, unsigned types, hid_t *obj_id_list);
+H5_DLL int H5F_get_obj_count(H5F_t *f, unsigned types);
+H5_DLL int H5F_get_obj_ids(H5F_t *f, unsigned types, int max_objs, hid_t *obj_id_list);
 H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f);
 
 /* Functions than check file mounting information */