diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-11-05 04:31:26 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-11-05 04:31:26 (GMT) |
| commit | 8eaa0af30585adbbab29686541cd33e058abd6e8 (patch) | |
| tree | 3d018ce01937e899e08fd1845c9d7cb6a4cbdc4d /src/H5FDmulti.c | |
| parent | 2b5efccc302ee577daa59639109921456f787813 (diff) | |
| download | hdf5-8eaa0af30585adbbab29686541cd33e058abd6e8.zip hdf5-8eaa0af30585adbbab29686541cd33e058abd6e8.tar.gz hdf5-8eaa0af30585adbbab29686541cd33e058abd6e8.tar.bz2 | |
Changed the return type of H5Pget_driver_info() from void * to
const void *. Fixes HDFFV-10017.
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 38d0ae3..5e27c53 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -534,7 +534,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, hid_t *memb_fapl/*out*/, char **memb_name/*out*/, haddr_t *memb_addr/*out*/, hbool_t *relax) { - H5FD_multi_fapl_t *fa; + const H5FD_multi_fapl_t *fa; H5FD_mem_t mt; static const char *func="H5FDget_fapl_multi"; /* Function Name for error reporting */ @@ -548,7 +548,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list", -1) if(H5FD_MULTI != H5Pget_driver(fapl_id)) H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver", -1) - if(NULL == (fa= (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id))) + if(NULL == (fa= (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id))) H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "bad VFL driver info", -1) if (memb_map) @@ -992,7 +992,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, { H5FD_multi_t *file=NULL; hid_t close_fapl=-1; - H5FD_multi_fapl_t *fa; + const H5FD_multi_fapl_t *fa; H5FD_mem_t m; static const char *func="H5FD_multi_open"; /* Function Name for error reporting */ @@ -1018,7 +1018,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, if(H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE)<0) H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error) } - fa = (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id); + fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id); assert(fa); ALL_MEMBERS(mt) { file->fa.memb_map[mt] = fa->memb_map[mt]; |