diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-09-05 21:36:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-09-05 21:36:55 (GMT) |
| commit | 05d51c036140f94a07efb75aab9675b3b4bd5ef0 (patch) | |
| tree | 5fe046db1c355df5c771077164ba6d6c1f272866 /src/H5Gname.c | |
| parent | f2e6cec0728a75f5982e3b6d91f0ce823d1206a6 (diff) | |
| download | hdf5-05d51c036140f94a07efb75aab9675b3b4bd5ef0.zip hdf5-05d51c036140f94a07efb75aab9675b3b4bd5ef0.tar.gz hdf5-05d51c036140f94a07efb75aab9675b3b4bd5ef0.tar.bz2 | |
[svn-r25575] cleanup H5I usage in VOL by removing the use of the aux pointer and
make a higher level wrapper object around all VOL objects that
includes the VOL information.
Diffstat (limited to 'src/H5Gname.c')
| -rw-r--r-- | src/H5Gname.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/H5Gname.c b/src/H5Gname.c index f48234d..6f2c8ba 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -824,21 +824,12 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) break; case H5I_DATATYPE: - { - H5T_t *type = NULL; + /* Avoid non-named datatypes */ + if(!H5T_is_named((H5T_t*)obj_ptr)) + HGOTO_DONE(SUCCEED) /* Do not exit search over IDs */ - /* Get the actual datatype object that should be the vol_obj */ - if(NULL == (type = (H5T_t *)H5T_get_named_type((H5T_t*)obj_ptr))) - HGOTO_DONE(SUCCEED) /* Do not exit search over IDs */ - - /* Avoid non-named datatypes */ - if(!H5T_is_named(type)) - HGOTO_DONE(SUCCEED) /* Do not exit search over IDs */ - - oloc = H5T_oloc(type); - obj_path = H5T_nameof(type); - break; - } + oloc = H5T_oloc((H5T_t*)obj_ptr); + obj_path = H5T_nameof((H5T_t*)obj_ptr); break; case H5I_UNINIT: @@ -848,6 +839,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) case H5I_ATTR: case H5I_REFERENCE: case H5I_VFL: + case H5I_VOL: case H5I_GENPROP_CLS: case H5I_GENPROP_LST: case H5I_ERROR_CLASS: |