diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2021-04-01 20:14:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 20:14:21 (GMT) |
| commit | 87d18137ceed7eae1ca7009dda6f4cf2841ff195 (patch) | |
| tree | 291983f4bc5f9230bf53564e8555272319d382aa /hl/src | |
| parent | df75d35cc5295b03dc305ca7e5495fece5737d30 (diff) | |
| download | hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.zip hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.gz hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.bz2 | |
Hdf5 merge issue 487 v110 (#533)
* Cleans up a couple of MSVC warnings in testhdf5 (#475)
* Fixes a few testhdf5 warnings raised in Visual Studio
Visual Studio is grumpier about treating pointers like integers than
gcc.
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix typos and grammar errors. (#476)
* Suppresses the tcheck_version test's abort dialog on Windows (#477)
* Suppresses the tcheck_version test's abort dialog on Windows
Windows raises a modal abort/retry/ignore dialog box when CRT
calls abort(). This change installs a report hook that suppresses
the dialog so that the CMake tests don't time out waiting for a
nonexistent user to click a dialog box.
* Committing clang-format changes
* Removes __cdecl from callback
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Committing clang-format changes
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5DS.c | 5 | ||||
| -rw-r--r-- | hl/src/H5LD.c | 5 | ||||
| -rw-r--r-- | hl/src/H5LT.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index c7626c6..6eb3d8b 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -2167,7 +2167,10 @@ H5DS_get_REFLIST_type(void) return ntid_t; out: - H5E_BEGIN_TRY { H5Tclose(ntid_t); } + H5E_BEGIN_TRY + { + H5Tclose(ntid_t); + } H5E_END_TRY; return FAIL; } diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c index 1307fda..8bfd0d6 100644 --- a/hl/src/H5LD.c +++ b/hl/src/H5LD.c @@ -303,7 +303,10 @@ H5LD_get_dset_dims(hid_t did, hsize_t *cur_dims) ret_value = SUCCEED; done: - H5E_BEGIN_TRY { H5Sclose(sid); } + H5E_BEGIN_TRY + { + H5Sclose(sid); + } H5E_END_TRY; return (ret_value); diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 18af730..0288ac6 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -907,7 +907,10 @@ H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags) return file_id; out: - H5E_BEGIN_TRY { H5Pclose(fapl); } + H5E_BEGIN_TRY + { + H5Pclose(fapl); + } H5E_END_TRY; return -1; } /* end H5LTopen_file_image() */ |