summaryrefslogtreecommitdiffstats
path: root/src/H5Gpkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-27 18:00:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-27 18:00:08 (GMT)
commitd219ff86a8e5ce698f73f89d5f9596ee910bcf82 (patch)
tree085f937cb4ca5640dca22bfc743b67c10744973d /src/H5Gpkg.h
parent59208d8a9b3e0c00cb604acfb153113789e66a28 (diff)
downloadhdf5-d219ff86a8e5ce698f73f89d5f9596ee910bcf82.zip
hdf5-d219ff86a8e5ce698f73f89d5f9596ee910bcf82.tar.gz
hdf5-d219ff86a8e5ce698f73f89d5f9596ee910bcf82.tar.bz2
[svn-r12977] Description:
Added H5Gget_info[_by_idx] routines and deprecated H5Gget_num_objs routine. Tested on: Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2)
Diffstat (limited to 'src/H5Gpkg.h')
-rw-r--r--src/H5Gpkg.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index 8b23cd5..fdc0515 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -65,14 +65,14 @@
* points). This datatype determines what (if anything) is cached in the
* symbol table entry.
*/
-typedef enum H5G_type_t {
+typedef enum H5G_cache_type_t {
H5G_CACHED_ERROR = -1, /*force enum to be signed */
H5G_NOTHING_CACHED = 0, /*nothing is cached, must be 0 */
H5G_CACHED_STAB = 1, /*symbol table, `stab' */
H5G_CACHED_SLINK = 2, /*symbolic link */
H5G_NCACHED /*THIS MUST BE LAST */
-} H5G_type_t;
+} H5G_cache_type_t;
/*
* A symbol table entry caches these parameters from object header
@@ -100,7 +100,7 @@ typedef union H5G_cache_t {
*/
typedef struct H5G_entry_t {
hbool_t dirty; /*entry out-of-date? */
- H5G_type_t type; /*type of information cached */
+ H5G_cache_type_t type; /*type of information cached */
H5G_cache_t cache; /*cached data from object header */
size_t name_off; /*offset of name within name heap */
haddr_t header; /*file address of object header */
@@ -510,8 +510,7 @@ H5_DLL herr_t H5G_obj_insert(H5O_loc_t *grp_oloc, const char *name,
H5_DLL herr_t H5G_obj_iterate(hid_t loc_id, const char *group_name,
H5L_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_obj,
H5G_link_iterate_t *lnk_op, void *op_data, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_count(struct H5O_loc_t *oloc, hsize_t *num_objs,
- hid_t dxpl_id);
+H5_DLL herr_t H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id);
H5_DLL ssize_t H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5L_index_t idx_type,
H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id);
H5_DLL H5G_obj_t H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,