diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2000-11-28 16:38:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2000-11-28 16:38:39 (GMT) |
| commit | c4162e5ce5d79d468a7e628b6dd4be0792e5a470 (patch) | |
| tree | e62edcd4fe0c1ec670de9b66ac10e8027be30a77 /src/H5FDfamily.c | |
| parent | f8d5c76ee70b6f644eaa67c4449065b4f5b68e47 (diff) | |
| download | hdf5-c4162e5ce5d79d468a7e628b6dd4be0792e5a470.zip hdf5-c4162e5ce5d79d468a7e628b6dd4be0792e5a470.tar.gz hdf5-c4162e5ce5d79d468a7e628b6dd4be0792e5a470.tar.bz2 | |
[svn-r3010] Purpose:
Bug fix
Description:
When the v1.2 compatibility code was turned on, internal functions in the
library were getting confused.
Solution:
Separated guts of H5Pget_driver call into an API function (the definition
of which depends on the compatibility switch) and an internal function
which always behaves like the v1.3/4 function. Replaced API function calls
in the library code with the internal function.
Platforms tested:
FreeBSD 4.2 (hawkwind)
Diffstat (limited to 'src/H5FDfamily.c')
| -rw-r--r-- | src/H5FDfamily.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 6b6881d..0211829 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -223,7 +223,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/, if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id)) HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl"); - if (H5FD_FAMILY!=H5Pget_driver(fapl_id)) + if (H5FD_FAMILY!=H5P_get_driver(fapl_id)) HRETURN_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver"); if (NULL==(fa=H5Pget_driver_info(fapl_id))) HRETURN_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info"); @@ -828,7 +828,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hs * Get the member data transfer property list. If the transfer property * list does not belong to this driver then assume defaults */ - if (H5P_DEFAULT!=dxpl_id && H5FD_FAMILY==H5Pget_driver(dxpl_id)) { + if (H5P_DEFAULT!=dxpl_id && H5FD_FAMILY==H5P_get_driver(dxpl_id)) { H5FD_family_dxpl_t *dx = H5Pget_driver_info(dxpl_id); assert(H5P_DATASET_XFER==H5Pget_class(dxpl_id)); @@ -891,7 +891,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, h * Get the member data transfer property list. If the transfer property * list does not belong to this driver then assume defaults. */ - if (H5P_DEFAULT!=dxpl_id && H5FD_FAMILY==H5Pget_driver(dxpl_id)) { + if (H5P_DEFAULT!=dxpl_id && H5FD_FAMILY==H5P_get_driver(dxpl_id)) { H5FD_family_dxpl_t *dx = H5Pget_driver_info(dxpl_id); assert(H5P_DATASET_XFER==H5Pget_class(dxpl_id)); |