diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-08-12 13:33:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-08-12 13:33:42 (GMT) |
| commit | 5112232ddf96f7b8b7dca86ce91dc05f3470c682 (patch) | |
| tree | 239a5e8982540789ec643ec2292a324e296409c8 /src/H5FDsrb.c | |
| parent | 694e9bb380925e38a0711b803bf7dd86f219a07f (diff) | |
| download | hdf5-5112232ddf96f7b8b7dca86ce91dc05f3470c682.zip hdf5-5112232ddf96f7b8b7dca86ce91dc05f3470c682.tar.gz hdf5-5112232ddf96f7b8b7dca86ce91dc05f3470c682.tar.bz2 | |
[svn-r5871] Purpose:
Code cleanup
Description:
Combined H5P_isa_class and H5I_object functionality into a new internal
H5P API function: H5P_object_verify, which checks that a property list is
the appropriate class and then returns the property list object associated
with the property list ID.
This reduces the source code by about 200 LOC and trims the library binary
some more.
Platforms tested:
FreeBSD 4.6 (sleipnir)
Diffstat (limited to 'src/H5FDsrb.c')
| -rw-r--r-- | src/H5FDsrb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index 7408c5b..4dde148 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -210,7 +210,7 @@ H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info) FUNC_ENTER_API(H5Pset_fapl_srb, FAIL); /*NO TRACE*/ - if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) + if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); /*connect to SRB server */ @@ -261,7 +261,7 @@ H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/) FUNC_ENTER_API(H5Pget_fapl_srb, FAIL); H5TRACE2("e","ix",fapl_id,info); - if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) + if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); if(H5FD_SRB != H5P_get_driver(plist)) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver"); @@ -316,7 +316,7 @@ H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) if (ADDR_OVERFLOW(maxaddr)) HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr"); - if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) + if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list"); if(H5P_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(plist)) { HDmemset((void*)&_fa, 0, sizeof(H5FD_srb_fapl_t)); |