diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-18 20:50:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-18 20:50:22 (GMT) |
| commit | d0d6ef4a90180a6f471660d42e9dfdcb287f9927 (patch) | |
| tree | f71ed5488d40183956517e51314bbdca90d8fc24 /src/H5Fpublic.h | |
| parent | 4a4962dfef9e8de3c5a1766506e3a20caaefcb9e (diff) | |
| download | hdf5-d0d6ef4a90180a6f471660d42e9dfdcb287f9927.zip hdf5-d0d6ef4a90180a6f471660d42e9dfdcb287f9927.tar.gz hdf5-d0d6ef4a90180a6f471660d42e9dfdcb287f9927.tar.bz2 | |
[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
Diffstat (limited to 'src/H5Fpublic.h')
| -rw-r--r-- | src/H5Fpublic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 94b996d..02fd70b 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -54,7 +54,8 @@ #define H5F_OBJ_DATASET (0x0002u) #define H5F_OBJ_GROUP (0x0004u) #define H5F_OBJ_DATATYPE (0x0008u) -#define H5F_OBJ_ALL (H5F_OBJ_FILE|H5F_OBJ_DATASET|H5F_OBJ_GROUP|H5F_OBJ_DATATYPE) +#define H5F_OBJ_ATTR (0x0010u) +#define H5F_OBJ_ALL (H5F_OBJ_FILE|H5F_OBJ_DATASET|H5F_OBJ_GROUP|H5F_OBJ_DATATYPE|H5F_OBJ_ATTR) #ifdef H5_HAVE_PARALLEL /* @@ -106,10 +107,9 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); H5_DLL herr_t H5Fclose (hid_t file_id); H5_DLL hid_t H5Fget_create_plist (hid_t file_id); H5_DLL hid_t H5Fget_access_plist (hid_t file_id); -H5_DLL herr_t H5Fget_obj_count(hid_t file_id, unsigned types, - unsigned *obj_id_count); +H5_DLL int H5Fget_obj_count(hid_t file_id, unsigned types); +H5_DLL int H5Fget_obj_ids(hid_t file_id, unsigned types, int max_objs, hid_t *obj_id_list); H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void** file_handle); -H5_DLL herr_t H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *obj_id_list); H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); H5_DLL herr_t H5Funmount(hid_t loc, const char *name); |