diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-21 18:13:48 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-21 18:13:48 (GMT) |
| commit | 568f982ed26e88f8f8b9253b07cf8cd9bdebfcf6 (patch) | |
| tree | ddfaa30361568cdcd48c42c6589f7409f5144a20 /src/H5Dio.c | |
| parent | 0a7e0c3a356de568cbee182133accf947f8d337d (diff) | |
| download | hdf5-568f982ed26e88f8f8b9253b07cf8cd9bdebfcf6.zip hdf5-568f982ed26e88f8f8b9253b07cf8cd9bdebfcf6.tar.gz hdf5-568f982ed26e88f8f8b9253b07cf8cd9bdebfcf6.tar.bz2 | |
[svn-r25456] fixing a few things and more realignment with trunk.
Diffstat (limited to 'src/H5Dio.c')
| -rw-r--r-- | src/H5Dio.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index 788c305..94517a7 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -128,6 +128,9 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf); + /* check arguments */ + if(NULL == (dset = (void *)H5I_object_verify(dset_id, H5I_DATASET))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier") if(mem_space_id < 0 || file_space_id < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace") @@ -141,9 +144,6 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, /* get the plugin pointer */ if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(dset_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") - /* get the dataset object */ - if(NULL == (dset = (void *)H5I_object(dset_id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier") /* Read the data through the VOL */ if((ret_value = H5VL_dataset_read(dset, vol_plugin, mem_type_id, mem_space_id, @@ -202,6 +202,8 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, /* check arguments */ if(!dset_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset") + if(NULL == (dset = (void *)H5I_object_verify(dset_id, H5I_DATASET))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier") /* Get the default dataset transfer property list if the user didn't provide one */ if(H5P_DEFAULT == dxpl_id) @@ -213,9 +215,6 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, /* get the plugin pointer */ if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(dset_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") - /* get the dataset object */ - if(NULL == (dset = (void *)H5I_object(dset_id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier") /* Write the data through the VOL */ if((ret_value = H5VL_dataset_write(dset, vol_plugin, mem_type_id, mem_space_id, |