summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2014-08-05 14:10:53 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2014-08-05 14:10:53 (GMT)
commit68067443e04f352aeca5b41243e77e4aacc4cd98 (patch)
treebe59edd69a4fdf699759c732daac387d9e1a0474
parent61c0d0813f6de1e75606d3cbf5a185962c0ece1c (diff)
downloadhdf5-68067443e04f352aeca5b41243e77e4aacc4cd98.zip
hdf5-68067443e04f352aeca5b41243e77e4aacc4cd98.tar.gz
hdf5-68067443e04f352aeca5b41243e77e4aacc4cd98.tar.bz2
[svn-r25511] fix bug in native implementation of H5Oopen_by_idx.
-rw-r--r--src/H5O.c3
-rw-r--r--src/H5VLnative.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/H5O.c b/src/H5O.c
index 3fb600c..8a87ecf 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -332,7 +332,8 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
/* Open the object through the VOL */
- if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
+ if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type,
+ H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
if ((ret_value = H5VL_object_register(opened_obj, opened_type, vol_plugin, TRUE)) < 0)
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index 14b6284..a351b14 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -3086,7 +3086,7 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope
H5G_name_t obj_path; /* Opened object group hier. path */
H5O_loc_t obj_oloc; /* Opened object object location */
hbool_t loc_found = FALSE; /* Entry at 'name' found */
- hid_t temp_id = FAIL;
+ hid_t temp_id = FAIL;
void *ret_value = NULL;
FUNC_ENTER_NOAPI_NOINIT
@@ -3120,8 +3120,8 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope
loc_found = TRUE;
/* Open the object */
- if((temp_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_name.lapl_id,
- H5AC_dxpl_id, TRUE)) < 0)
+ if((temp_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_idx.lapl_id,
+ H5AC_dxpl_id, TRUE)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object")
break;
}
@@ -3140,7 +3140,7 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope
/* Open the object */
if((temp_id = H5O_open_by_loc(&obj_loc, H5P_LINK_ACCESS_DEFAULT,
- H5AC_dxpl_id, TRUE)) < 0)
+ H5AC_dxpl_id, TRUE)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object")
break;
}