diff options
| author | vchoi <vchoi@jelly.ad.hdfgroup.org> | 2022-05-06 19:56:10 (GMT) |
|---|---|---|
| committer | vchoi <vchoi@jelly.ad.hdfgroup.org> | 2022-05-06 19:56:10 (GMT) |
| commit | 3b312e260675af5d1431b8da101085e78de83826 (patch) | |
| tree | d7740e8c8919e1cec9aece58eeb2b4ba74552796 | |
| parent | 080b6d04052eb455290c0d9d48d3391dc7bee003 (diff) | |
| parent | fd3e7a178123dbe1c8ef0a50863ae9bd82c2a668 (diff) | |
| download | hdf5-3b312e260675af5d1431b8da101085e78de83826.zip hdf5-3b312e260675af5d1431b8da101085e78de83826.tar.gz hdf5-3b312e260675af5d1431b8da101085e78de83826.tar.bz2 | |
Merge branch 'new_vds_feature_vfd_swmr' of https://github.com/vchoi-hdfgroup/hdf5 into new_vds_feature_vfd_swmr
| -rw-r--r-- | src/H5FDvfd_swmr.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5FDvfd_swmr.c b/src/H5FDvfd_swmr.c index 8902d93..892d084 100644 --- a/src/H5FDvfd_swmr.c +++ b/src/H5FDvfd_swmr.c @@ -285,8 +285,9 @@ done: * *------------------------------------------------------------------------- */ -static herr_t -H5FD__vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf5_filename, char *name /*out*/) +static herr_t +H5FD__vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf5_filename, + char *name /*out*/) { size_t tot_len = 0; size_t tmp_len = 0; @@ -303,14 +304,14 @@ H5FD__vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf HDstrcat(name, "/"); } - if((tmp_len = HDstrlen(config->md_file_name)) != 0) { - if((tot_len += tmp_len) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN) + if ((tmp_len = HDstrlen(config->md_file_name)) != 0) { + if ((tot_len += tmp_len) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN) HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name exceeds maximum"); HDstrcat(name, config->md_file_name); } else { /* Automatic generation of metadata file name based on hdf5_filename + '.md' */ - if((tot_len += (HDstrlen(hdf5_filename) + 3)) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN) + if ((tot_len += (HDstrlen(hdf5_filename) + 3)) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN) HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name maximum"); HDstrcat(name, hdf5_filename); @@ -354,7 +355,7 @@ H5FD__vfd_swmr_create_make_believe_data(H5FD_vfd_swmr_t *_file) FUNC_LEAVE_NOAPI_VOID -} /* H5FD__vfd_swmr_create_make_believe_data() */ +} /* H5FD__vfd_swmr_create_make_believe_data() */ /*------------------------------------------------------------------------- * Function: H5FD__vfd_swmr_open @@ -418,7 +419,7 @@ H5FD__vfd_swmr_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t max file->hdf5_filename[sizeof(file->hdf5_filename) - 1] = '\0'; /* Retain a copy of the metadata file name */ - if(H5FD__vfd_swmr_build_md_path_name(vfd_swmr_config, name, file->md_file_path_name) < 0) + if (H5FD__vfd_swmr_build_md_path_name(vfd_swmr_config, name, file->md_file_path_name) < 0) HGOTO_ERROR(H5E_VFL, H5E_OPENERROR, NULL, "building md_file_path and md_file_name failed") file->md_file_path_name[sizeof(file->md_file_path_name) - 1] = '\0'; |