diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2019-07-31 16:03:51 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2019-07-31 16:03:51 (GMT) |
| commit | 452431960978a5693fb7c28096ee0f191a610b36 (patch) | |
| tree | 52516e8b861e33cff4cf22443356187a7b19a58c /src/H5system.c | |
| parent | 32e1c9f89d1685572445217d1293df2dcb0eeb13 (diff) | |
| parent | 3049d2c140b06d5b2b419562c3d4d1d1c66612e3 (diff) | |
| download | hdf5-452431960978a5693fb7c28096ee0f191a610b36.zip hdf5-452431960978a5693fb7c28096ee0f191a610b36.tar.gz hdf5-452431960978a5693fb7c28096ee0f191a610b36.tar.bz2 | |
Merge pull request #15 in ~VCHOI/my_third_fork from hdf5_1_10 to bugfix/110_HDFFV-10808-h5pset_file_space_strategy
* commit '3049d2c140b06d5b2b419562c3d4d1d1c66612e3':
A minor bug fix.
Updated the command for external_env and vds_env to the most recent changes.
1. Updated the commands for compiling two new tests (external_env.c and vds_env.c). 2. Changed the data file names for external.c and external_env.c to avoid potential name conflict.
HDFFV-10658: setting and getting properties in API context. Porting the changes to the develop branch into the 1.10 branch: mainly the external file prefix and VDS prefix.
Diffstat (limited to 'src/H5system.c')
| -rw-r--r-- | src/H5system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5system.c b/src/H5system.c index 186d8fa..41e2a48 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -1125,13 +1125,13 @@ H5_combine_path(const char* path1, const char* path2, char **full_name /*out*/) FUNC_ENTER_NOAPI_NOINIT - HDassert(path1); HDassert(path2); - path1_len = HDstrlen(path1); + if(path1) + path1_len = HDstrlen(path1); path2_len = HDstrlen(path2); - if(*path1 == '\0' || H5_CHECK_ABSOLUTE(path2)) { + if(path1 == NULL || *path1 == '\0' || H5_CHECK_ABSOLUTE(path2)) { /* If path1 is empty or path2 is absolute, simply use path2 */ if(NULL == (*full_name = (char *)H5MM_strdup(path2))) |