diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
| commit | a4069db8f48121ca11d0465b260d9cd81152581b (patch) | |
| tree | 37348ad7d71058a6f449255073d631db8c33794a /tools/lib/h5tools_utils.c | |
| parent | 1374654210854d005546459e48c482c5ea01cba2 (diff) | |
| download | hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.zip hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.gz hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.bz2 | |
[svn-r14131] Description:
Move H5Giterate() and H5G_iterate_t to deprecated symbols section,
replacing them with H5Literate and H5L_iterate_t respectively.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'tools/lib/h5tools_utils.c')
| -rw-r--r-- | tools/lib/h5tools_utils.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index bba2973..b04f3c6 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -46,7 +46,8 @@ static void dump_table(char* tablename, table_t *table); #endif /* H5DUMP_DEBUG */ static void add_obj(table_t *table, haddr_t objno, char *objname, hbool_t recorded); static char * build_obj_path_name(const char *prefix, const char *name); -static herr_t find_objs_cb(hid_t group, const char *name, void *op_data); +static herr_t find_objs_cb(hid_t group, const char *name, const H5L_info_t *info, + void *op_data); /*------------------------------------------------------------------------- @@ -480,7 +481,7 @@ build_obj_path_name(const char *prefix, const char *name) *------------------------------------------------------------------------- */ static herr_t -find_objs_cb(hid_t group, const char *name, void *op_data) +find_objs_cb(hid_t group, const char *name, const H5L_info_t UNUSED *linfo, void *op_data) { H5G_stat_t statbuf; find_objs_t *info = (find_objs_t*)op_data; @@ -508,7 +509,7 @@ find_objs_cb(hid_t group, const char *name, void *op_data) info->prefix = HDmalloc(tmp_len+1); HDstrcpy(info->prefix, tmp); - if(H5Giterate(group, name, NULL, find_objs_cb, (void *)info) < 0) + if(H5Literate(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT) < 0) ret_value = FAIL; info->prefix = old_prefix; @@ -625,7 +626,7 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table, /* Find all shared objects */ - return(H5Giterate(fid, "/", NULL, find_objs_cb, (void *)info)); + return(H5Literate(fid, "/", H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT)); } |