diff options
| author | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-04 16:03:05 (GMT) |
|---|---|---|
| committer | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-04 16:03:05 (GMT) |
| commit | 50d9a397ab4bcbeaa6466eabe1c2ec6e2cf61f89 (patch) | |
| tree | e20fb6dd1745060836a29b020dd5d9bfcab84dd7 /src/H5Dint.c | |
| parent | e09e2fc4ad7aadef1a99573ee6d3cec9bea3becb (diff) | |
| download | hdf5-50d9a397ab4bcbeaa6466eabe1c2ec6e2cf61f89.zip hdf5-50d9a397ab4bcbeaa6466eabe1c2ec6e2cf61f89.tar.gz hdf5-50d9a397ab4bcbeaa6466eabe1c2ec6e2cf61f89.tar.bz2 | |
This commit basically has the following changes:
1. restored the datatype, dataspace, and LCPL of the dataset for VOL connector back to the properties.
2. splitted external.c and vds.c because they called HDsetenv in the program, instead using shell scripts to set the environment variables.
3. changed H5CX_get_vds_prefix and H5CX_get_ext_file_prefix to use H5P_peek instead of H5P_get.
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 7367613..bdd43cf 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -120,8 +120,8 @@ static hbool_t H5D_top_package_initialize_s = FALSE; /* Prefixes of VDS and external file from the environment variables * HDF5_EXTFILE_PREFIX and HDF5_VDS_PREFIX */ -static char *H5D_prefix_ext_env = NULL; -static char *H5D_prefix_vds_env = NULL; +const static char *H5D_prefix_ext_env = NULL; +const static char *H5D_prefix_vds_env = NULL; /*------------------------------------------------------------------------- @@ -1116,14 +1116,14 @@ H5D__build_file_prefix(const H5D_t *dset, H5D_prefix_type_t prefix_type, char ** * to be reentrant. */ if(H5D_PREFIX_TYPE_VDS == prefix_type) { - prefix = H5D_prefix_vds_env; + prefix = (char *)H5D_prefix_vds_env; if(prefix == NULL || *prefix == '\0') { if(H5CX_get_vds_prefix(&prefix) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get the prefix for vds file") } } else if(H5D_PREFIX_TYPE_EXT == prefix_type) { - prefix = H5D_prefix_ext_env; + prefix = (char *)H5D_prefix_ext_env; if(prefix == NULL || *prefix == '\0') { if(H5CX_get_ext_file_prefix(&prefix) < 0) |