diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-07-31 19:17:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-07-31 19:17:12 (GMT) |
| commit | 5588db111c57b4a60de020e49e3411330bf8cf00 (patch) | |
| tree | 326710b2fb5ab935c5a5c76b0a1fd5855d54549e /src/H5Spoint.c | |
| parent | 17275779d07c094741039d0c263fdf055c32bfb6 (diff) | |
| download | hdf5-5588db111c57b4a60de020e49e3411330bf8cf00.zip hdf5-5588db111c57b4a60de020e49e3411330bf8cf00.tar.gz hdf5-5588db111c57b4a60de020e49e3411330bf8cf00.tar.bz2 | |
[svn-r5840] Purpose:
Code cleanup
Description:
Created a new H5I function which combined the some of the functionality of
H5I_get_type and H5I_object: H5I_object_verify.
Using this new function in the library trims another ~200 lines of code off
the library and makes the resulting binaries smaller and faster also.
Platforms tested:
FreeBSD 4.6 (sleipnir)
Diffstat (limited to 'src/H5Spoint.c')
| -rw-r--r-- | src/H5Spoint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 780ba75..c8e25cd 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -541,7 +541,7 @@ H5Sget_select_elem_npoints(hid_t spaceid) H5TRACE1("Hs","i",spaceid); /* Check args */ - if (H5I_DATASPACE != H5I_get_type(spaceid) || NULL == (space=H5I_object(spaceid))) + if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space"); if(space->select.type!=H5S_SEL_POINTS) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an element selection"); @@ -839,7 +839,7 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint /* Check args */ if(buf==NULL) HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer"); - if (H5I_DATASPACE != H5I_get_type(spaceid) || NULL == (space=H5I_object(spaceid))) + if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space"); if(space->select.type!=H5S_SEL_POINTS) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a point selection"); @@ -1073,7 +1073,7 @@ H5Sselect_elements (hid_t spaceid, H5S_seloper_t op, size_t num_elem, FUNC_ENTER_API(H5Sselect_elements, FAIL); /* Check args */ - if (H5I_DATASPACE != H5I_get_type(spaceid) || NULL == (space=H5I_object(spaceid))) + if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space"); if(coord==NULL || num_elem==0) HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "elements not specified"); |