mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bring clang-format changes from develop (#3305)

Browse Source
This commit is contained in:
Dana Robinson 2023-07-28 07:09:34 -07:00 committed by GitHub
parent bab8acbe82
commit b1ab59d239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.clang-format
View File

@ -65,28 +65,32 @@ ObjCBlockIndentWidth: 4
ReflowComments: true
SortIncludes: false
StatementMacros:
- CATCH
- END_MEMBERS
- FUNC_ENTER_API
- FUNC_LEAVE_API
- FUNC_ENTER_NOAPI
- FUNC_ENTER_NOAPI_NOERR
- FUNC_ENTER_NOAPI_NOINIT
- FUNC_ENTER_NOAPI_NOINIT_NOERR
- FUNC_ENTER_PACKAGE
- FUNC_LEAVE_API
- FUNC_LEAVE_NOAPI
- H5_BEGIN_TAG
- HGOTO_DONE_TAG
- H5_END_TAG
- HSYS_DONE_ERROR
- HSYS_GOTO_ERROR
- HDONE_ERROR
- HERROR
- H5_LEAVE
- FUNC_LEAVE_NOAPI_NOFS
- H5E_END_TRY
- H5E_PRINTF
- H5E_THROW
- HGOTO_DONE
- HGOTO_ERROR
- HMPI_ERROR
- HMPI_DONE_ERROR
- HMPI_GOTO_ERROR
- H5_BEGIN_TAG
- H5_END_TAG
- H5_GCC_DIAG_OFF
- H5_GCC_DIAG_ON
- CATCH
- H5_LEAVE
- HGOTO_DONE
- HGOTO_ERROR
- HMPI_DONE_ERROR
- HMPI_ERROR
- HMPI_GOTO_ERROR
- HSYS_DONE_ERROR
- HSYS_GOTO_ERROR
#llvm10: TypenameMacros:
#llvm10: - STACK_OF
#llvm10: - LIST

6
src/H5Iint.c
View File

@ -465,9 +465,9 @@ H5I__destroy_type(H5I_type_t type)
}
H5E_END_TRY /* don't care about errors */
/* Check if we should release the ID class */
if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)
type_info->cls = H5MM_xfree_const(type_info->cls);
/* Check if we should release the ID class */
if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)
type_info->cls = H5MM_xfree_const(type_info->cls);
HASH_CLEAR(hh, type_info->hash_table);
type_info->hash_table = NULL;

44
test/ros3.c
View File

@ -1078,17 +1078,16 @@ test_H5FDread_without_eoa_set_fails(void)
* TEST *
********/
H5E_BEGIN_TRY{
/* mute stack trace on expected failure */
JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer),
"cannot read before eoa is set")} H5E_END_TRY JSVERIFY_STR("", buffer,
"buffer should remain untouched")
H5E_BEGIN_TRY{/* mute stack trace on expected failure */
JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer),
"cannot read before eoa is set")} H5E_END_TRY
JSVERIFY_STR("", buffer, "buffer should remain untouched")
/************
* TEARDOWN *
************/
/************
* TEARDOWN *
************/
FAIL_IF(FAIL == H5FDclose(file_shakespeare)) file_shakespeare = NULL;
FAIL_IF(FAIL == H5FDclose(file_shakespeare)) file_shakespeare = NULL;
FAIL_IF(FAIL == H5Pclose(fapl_id))
fapl_id = -1;
@ -1388,17 +1387,16 @@ test_noops_and_autofails(void)
H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data),
"write must fail")} H5E_END_TRY
H5E_BEGIN_TRY{
JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY
H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY
H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE),
"truncate must fail (closing)")} H5E_END_TRY
H5E_BEGIN_TRY{
JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY
/************
* TEARDOWN *
************/
/************
* TEARDOWN *
************/
FAIL_IF(FAIL == H5FDclose(file)) file = NULL;
FAIL_IF(FAIL == H5FDclose(file)) file = NULL;
FAIL_IF(FAIL == H5Pclose(fapl_id))
fapl_id = -1;
@ -1622,13 +1620,13 @@ test_H5F_integration(void)
*/
H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(url_h5_public, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY
/* H5Fcreate() is not allowed with this file driver.
*/
H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY
/* H5Fcreate() is not allowed with this file driver.
*/
H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY
/* Successful open.
*/
file = H5Fopen(url_h5_public, H5F_ACC_RDONLY, fapl_id);
/* Successful open.
*/
file = H5Fopen(url_h5_public, H5F_ACC_RDONLY, fapl_id);
FAIL_IF(file < 0)
/************