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/H5L.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/H5L.c')
| -rw-r--r-- | src/H5L.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1311,19 +1311,18 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Lvisit(hid_t uid, H5_index_t idx_type, H5_iter_order_t order, +H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data) { H5I_type_t id_type; /* Type of ID */ - H5VL_id_wrapper_t *id_wrapper; /* user id structure */ - hid_t grp_id; herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) H5TRACE5("e", "iIiIox*x", grp_id, idx_type, order, op, op_data); - id_type = H5I_get_type(uid); + id_type = H5I_get_type(grp_id); +#if 0 if (H5I_FILE_PUBLIC == id_type) { if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(uid))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") @@ -1333,9 +1332,10 @@ H5Lvisit(hid_t uid, H5_index_t idx_type, H5_iter_order_t order, else { grp_id = uid; } +#endif /* Check args */ - if(!(H5I_GROUP == id_type || H5I_FILE == id_type)) + if(!(H5I_GROUP_PUBLIC == id_type || H5I_FILE_PUBLIC == id_type)) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument") if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified") |