diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-09 22:17:52 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-09 22:17:52 (GMT) |
| commit | 0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541 (patch) | |
| tree | 6c6a2d732b70389e350f4f01b3920211e186de36 /src/H5Gloc.c | |
| parent | 7d7842302b1dcf0da0067b30c49da59b8f766cb3 (diff) | |
| download | hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.zip hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.tar.gz hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.tar.bz2 | |
[svn-r22271] unwrap the high level ids in several places
add some workarounds for named datatypes in test cases and H5T routines
fix some iterate bugs with UD links
Diffstat (limited to 'src/H5Gloc.c')
| -rw-r--r-- | src/H5Gloc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/H5Gloc.c b/src/H5Gloc.c index d5b0d21..1080add 100644 --- a/src/H5Gloc.c +++ b/src/H5Gloc.c @@ -157,16 +157,14 @@ static herr_t H5G_loc_get_comment_cb(H5G_loc_t *grp_loc, const char *name, *------------------------------------------------------------------------- */ herr_t -H5G_loc(hid_t id, H5G_loc_t *loc) +H5G_loc(hid_t loc_id, H5G_loc_t *loc) { - H5VL_id_wrapper_t *id_wrapper; /* user id structure */ - hid_t loc_id; H5I_type_t id_type; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) - id_type = H5I_get_type(id); + id_type = H5I_get_type(loc_id); /* get the actual ID from an upper ID level */ /* MSC - this is a workaround to allow the test suite to pass and at some point needs to be removed once all high level operations @@ -174,13 +172,12 @@ H5G_loc(hid_t id, H5G_loc_t *loc) if (H5I_FILE_PUBLIC == id_type || H5I_GROUP_PUBLIC == id_type || H5I_DATASET_PUBLIC == id_type || H5I_DATATYPE_PUBLIC == id_type || H5I_ATTR_PUBLIC == id_type) { - if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(id))) + H5VL_id_wrapper_t *id_wrapper; /* user id structure */ + if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(loc_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") loc_id = id_wrapper->obj_id; } - else { - loc_id = id; - } + switch(H5I_get_type(loc_id)) { case H5I_FILE: { |