summaryrefslogtreecommitdiffstats
path: root/src/H5FDsrb.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-11-20 19:07:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-11-20 19:07:22 (GMT)
commit6ab0e9f0929738cdb3ba87fd409c68ad3db4178c (patch)
tree8142391516c53e90569f4e8ff4dcde376fcf16f9 /src/H5FDsrb.c
parent2e53165b47744ad71645492f74d4332371cc5179 (diff)
downloadhdf5-6ab0e9f0929738cdb3ba87fd409c68ad3db4178c.zip
hdf5-6ab0e9f0929738cdb3ba87fd409c68ad3db4178c.tar.gz
hdf5-6ab0e9f0929738cdb3ba87fd409c68ad3db4178c.tar.bz2
[svn-r4620] Purpose:
Code cleanup Description: Get rid of IDs from internal function calls and some small cleanups from the old-stype => generic property list conversion. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'src/H5FDsrb.c')
-rw-r--r--src/H5FDsrb.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c
index fb15d88..6031b5c 100644
--- a/src/H5FDsrb.c
+++ b/src/H5FDsrb.c
@@ -195,29 +195,28 @@ H5FD_srb_init(void)
herr_t
H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info)
{
- herr_t ret_value = FAIL;
H5FD_srb_fapl_t fa;
int srb_status;
+ H5P_genplist_t *plist; /* Property list pointer */
+ herr_t ret_value = FAIL;
FUNC_ENTER(H5Pset_fapl_srb, FAIL);
- if(H5I_GENPROP_LST != H5I_get_type(fapl_id) ||
- TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
- "not a file access property list");
+ if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id)))
+ HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
/*connect to SRB server */
fa.srb_conn = clConnect(info.srbHost, info.srbPort, info.srbAuth);
if((srb_status = clStatus(fa.srb_conn)) != CLI_CONNECTION_OK) {
fprintf(stderr,"%s",clErrorMessage(fa.srb_conn));
clFinish(fa.srb_conn);
+
/*not sure about first 2 parameters. */
- HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL,
- "Connection to srbMaster failed.");
+ HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "Connection to srbMaster failed.");
}
fa.info = info;
- ret_value = H5Pset_driver(fapl_id, H5FD_SRB, &fa);
+ ret_value = H5P_set_driver(plist, H5FD_SRB, &fa);
FUNC_LEAVE(ret_value);
}
@@ -245,18 +244,17 @@ H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info)
herr_t
H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/)
{
+ H5P_genplist_t *plist; /* Property list pointer */
H5FD_srb_fapl_t *fa;
FUNC_ENTER(H5Pget_fapl_srb, FAIL);
H5TRACE2("e","ix",fapl_id,info);
- if(H5I_GENPROP_LST != H5I_get_type(fapl_id) ||
- TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
- "not a file access property list");
- if(H5FD_SRB != H5P_get_driver(fapl_id))
+ if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id)))
+ HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
+ if(H5FD_SRB != H5P_get_driver(plist))
HRETURN_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver");
- if(NULL==(fa=H5Pget_driver_info(fapl_id)))
+ if(NULL==(fa=H5P_get_driver_info(plist)))
HRETURN_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info");
if(info)
@@ -292,6 +290,7 @@ H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
H5FD_srb_fapl_t _fa;
H5FD_srb_t *file;
int srb_fid;
+ H5P_genplist_t *plist; /* Property list pointer */
FUNC_ENTER(H5FD_srb_open, FAIL);
@@ -303,12 +302,14 @@ H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
if (ADDR_OVERFLOW(maxaddr))
HRETURN_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr");
- if(H5P_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(fapl_id)) {
+ if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id)))
+ HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
+ if(H5P_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(plist)) {
memset((void*)&_fa, 0, sizeof(H5FD_srb_fapl_t));
fa = &_fa;
}
else {
- fa = H5Pget_driver_info(fapl_id);
+ fa = H5P_get_driver_info(plist);
assert(fa);
}