diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2013-04-10 14:38:55 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2013-04-10 14:38:55 (GMT) |
commit | 17c32a8ca14df72d56a4d7f648318115fa858ed5 (patch) | |
tree | f4c5e6543b0bc38b94d393681c36117757c84e2d | |
parent | e8a57439fa282960c44b70847df3a7cd3d708651 (diff) | |
download | hdf5-17c32a8ca14df72d56a4d7f648318115fa858ed5.zip hdf5-17c32a8ca14df72d56a4d7f648318115fa858ed5.tar.gz hdf5-17c32a8ca14df72d56a4d7f648318115fa858ed5.tar.bz2 |
[svn-r23570] Merged r23508 from the trunk.
This removes some dead code that belonged to the multi dxpl functions
that were removed in HDF5 1.8.11.
Tested on: jam w/ C++ (minor change)
-rw-r--r-- | src/H5FDmulti.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 00d02bc..18835a4 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -73,10 +73,6 @@ #define END_MEMBERS }} - -#define H5FD_MULTI_DXPL_PROP_NAME "H5FD_MULTI_DXPL" -#define H5FD_MULTI_DXPL_PROP_SIZE sizeof(H5FD_multi_dxpl_t) - #define H5FD_MULT_MAX_FILE_NAME_LEN 1024 /* The driver identification number, initialized at runtime */ @@ -1791,18 +1787,6 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); - /* Get the data transfer properties */ - if(H5P_FILE_ACCESS_DEFAULT != dxpl_id) { - /* Check for existence of multi VFD DXPL property in DXPL */ - if((prop_exists = H5Pexist(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME)) < 0) - H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't check for multi VFD property", -1) - - /* Get the DXPL value, if it exists */ - if(prop_exists) - if(H5Pget(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, &dx) < 0) - H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't get property value", -1) - } /* end if */ - /* Find the file to which this address belongs */ for(mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) { mmt = file->fa.memb_map[mt]; @@ -1855,18 +1839,6 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); - /* Get the data transfer properties */ - if(H5P_FILE_ACCESS_DEFAULT != dxpl_id) { - /* Check for existence of multi VFD DXPL property in DXPL */ - if((prop_exists = H5Pexist(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME)) < 0) - H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't check for multi VFD property", -1) - - /* Get the DXPL value, if it exists */ - if(prop_exists) - if(H5Pget(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, &dx) < 0) - H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't get property value", -1) - } /* end if */ - /* Find the file to which this address belongs */ for(mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) { mmt = file->fa.memb_map[mt]; |