diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2019-07-10 03:21:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2019-07-10 03:21:33 (GMT) |
| commit | 22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0 (patch) | |
| tree | 43f503fea615b405e03863e1befc1c91bd9f65ef /src/H5PLpath.c | |
| parent | c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6 (diff) | |
| parent | 73df02f13c2b1e0b256cdbff1c7c584e84548df4 (diff) | |
| download | hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.zip hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.tar.gz hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.tar.bz2 | |
Merge pull request #1788 in HDFFV/hdf5 from ~KOZIOL/hdf5:feature/update_gcc_flags to develop
* commit '73df02f13c2b1e0b256cdbff1c7c584e84548df4':
Updates to warnhist script, along with a few cleanups, and add some comments to warning cleanups that are a bit obscure.
Cleaned up code that genericizes warning output, and add "-u" option to leave unique types in warnings (i.e. don't genericize output). Also fixed the '-S' option to work correctly.
Added GCC9 flags to CMake build
Add support for GCC9, update warnhist script, and clean up warnings.
Diffstat (limited to 'src/H5PLpath.c')
| -rw-r--r-- | src/H5PLpath.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5PLpath.c b/src/H5PLpath.c index 04248b5..44d9cb9 100644 --- a/src/H5PLpath.c +++ b/src/H5PLpath.c @@ -673,12 +673,12 @@ H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *fo size_t len; /* Allocate & initialize the path name */ - len = HDstrlen(dir) + HDstrlen(H5PL_PATH_SEPARATOR) + HDstrlen(dp->d_name) + 1 /*\0*/; + len = HDstrlen(dir) + HDstrlen(H5PL_PATH_SEPARATOR) + HDstrlen(dp->d_name) + 1 /*\0*/ + 4; /* Extra "+4" to quiet GCC warning - 2019/07/05, QAK */ if (NULL == (path = (char *)H5MM_calloc(len))) HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path") - HDsnprintf(path, len, "%s/%s", dir, dp->d_name); + HDsnprintf(path, len, "%s%s%s", dir, H5PL_PATH_SEPARATOR, dp->d_name); /* Get info for directory entry */ if (HDstat(path, &my_stat) == -1) |