summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2021-04-01 20:14:21 (GMT)
committerGitHub <noreply@github.com>2021-04-01 20:14:21 (GMT)
commit87d18137ceed7eae1ca7009dda6f4cf2841ff195 (patch)
tree291983f4bc5f9230bf53564e8555272319d382aa /test
parentdf75d35cc5295b03dc305ca7e5495fece5737d30 (diff)
downloadhdf5-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 'test')
-rw-r--r--test/btree2.c115
-rw-r--r--test/cache_api.c75
-rw-r--r--test/cache_image.c5
-rw-r--r--test/cork.c45
-rw-r--r--test/cross_read.c15
-rw-r--r--test/dangle.c5
-rw-r--r--test/direct_chunk.c10
-rw-r--r--test/dsets.c185
-rw-r--r--test/dt_arith.c5
-rw-r--r--test/dtransform.c5
-rw-r--r--test/dtypes.c365
-rw-r--r--test/earray.c65
-rw-r--r--test/efc.c5
-rw-r--r--test/enc_dec_plist.c5
-rw-r--r--test/enum.c40
-rw-r--r--test/error_test.c5
-rw-r--r--test/evict_on_close.c20
-rw-r--r--test/external.c50
-rw-r--r--test/farray.c30
-rw-r--r--test/fheap.c50
-rw-r--r--test/file_image.c30
-rw-r--r--test/fillval.c14
-rw-r--r--test/filter_fail.c10
-rw-r--r--test/filter_plugin.c30
-rw-r--r--test/flush1.c5
-rw-r--r--test/freespace.c5
-rw-r--r--test/getname.c5
-rw-r--r--test/gheap.c30
-rw-r--r--test/h5test.c10
-rw-r--r--test/hdfs.c40
-rw-r--r--test/lheap.c5
-rw-r--r--test/links.c275
-rw-r--r--test/links_env.c5
-rw-r--r--test/mf.c130
-rw-r--r--test/mount.c120
-rw-r--r--test/objcopy.c9
-rw-r--r--test/ohdr.c35
-rw-r--r--test/page_buffer.c30
-rw-r--r--test/reserved.c10
-rw-r--r--test/ros3.c55
-rw-r--r--test/set_extent.c25
-rw-r--r--test/stab.c15
-rw-r--r--test/swmr.c290
-rw-r--r--test/tarray.c10
-rw-r--r--test/tcheck_version.c23
-rw-r--r--test/tfile.c255
-rw-r--r--test/th5o.c35
-rw-r--r--test/th5s.c75
-rw-r--r--test/titerate.c25
-rw-r--r--test/tmisc.c220
-rw-r--r--test/trefer.c30
-rw-r--r--test/trefstr.c4
-rw-r--r--test/tselect.c99
-rw-r--r--test/tvltypes.c25
-rw-r--r--test/unlink.c50
-rw-r--r--test/unregister.c10
-rw-r--r--test/vds.c15
-rw-r--r--test/version_bounds_1_10.c25
-rw-r--r--test/vfd.c85
59 files changed, 2618 insertions, 651 deletions
diff --git a/test/btree2.c b/test/btree2.c
index 4a9a062..58c45e2 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -672,7 +672,10 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
/* Attempt to index record in B-tree with no records */
idx = 0;
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -715,7 +718,10 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
/* Attempt to index non-existant record in B-tree with 1 record */
idx = 0;
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -771,7 +777,10 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
/* Attempt to index non-existant record in B-tree with several records */
idx = 0;
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3068,12 +3077,18 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
} /* end for */
/* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3104,7 +3119,10 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
TEST_ERROR
record = INSERT_MANY / 2;
- H5E_BEGIN_TRY { ret = H5B2_insert(bt2, &record); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_insert(bt2, &record);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3223,7 +3241,10 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
TEST_ERROR
/* Attempt to index non-existant record in B-tree with 1 record */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3285,7 +3306,10 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
TEST_ERROR
/* Attempt to index non-existant record in B-tree with 1 record */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3353,7 +3377,10 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
TEST_ERROR
/* Attempt to index non-existant record in B-tree with several records */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -3438,7 +3465,10 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
TEST_ERROR
/* Attempt to index non-existant record in B-tree with several records */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -5044,12 +5074,18 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
} /* end for */
/* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -5187,7 +5223,10 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
/* Attempt to remove a record from a B-tree with no records */
record = 0;
- H5E_BEGIN_TRY { ret = H5B2_remove(bt2, &record, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_remove(bt2, &record, NULL, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -5224,7 +5263,10 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
/* Attempt to remove a non-existant record from a B-tree with 1 record */
record = 0;
- H5E_BEGIN_TRY { ret = H5B2_remove(bt2, &record, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_remove(bt2, &record, NULL, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -5305,7 +5347,10 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
TEST_ERROR
record = 0;
- H5E_BEGIN_TRY { ret = H5B2_remove(bt2, &record, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_remove(bt2, &record, NULL, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -5507,7 +5552,10 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
/* Attempt to remove a non-existant record from a B-tree with 1 record */
record = (INSERT_SPLIT_ROOT_NREC * 2) + 1;
- H5E_BEGIN_TRY { ret = H5B2_remove(bt2, &record, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_remove(bt2, &record, NULL, NULL);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9086,7 +9134,10 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
/* Attempt to find record B-tree less than a value */
search = 0;
- H5E_BEGIN_TRY { ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9163,7 +9214,10 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
/* Attempt to find record B-tree less than a value */
search = (FIND_NEIGHBOR * 2) + 1;
- H5E_BEGIN_TRY { ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9577,7 +9631,10 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
/* Attempt to modify a non-existant record */
record = 3;
modify = 4;
- H5E_BEGIN_TRY { ret = H5B2_modify(bt2, &record, modify_cb, &modify); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9622,7 +9679,10 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
/* Attempt to find original record */
record = 4330;
found = HSIZET_MAX;
- H5E_BEGIN_TRY { ret = H5B2_modify(bt2, &record, modify_cb, &modify); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9667,7 +9727,10 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
/* Attempt to find original record */
record = 5350;
found = 5350;
- H5E_BEGIN_TRY { ret = H5B2_modify(bt2, &record, modify_cb, &modify); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -9712,7 +9775,10 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
/* Attempt to find original record */
record = 9445;
found = 9445;
- H5E_BEGIN_TRY { ret = H5B2_modify(bt2, &record, modify_cb, &modify); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+ }
H5E_END_TRY;
/* Should fail */
if (ret != FAIL)
@@ -10032,7 +10098,10 @@ main(void)
error:
puts("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/cache_api.c b/test/cache_api.c
index 6e68973..051ff24 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -1699,7 +1699,10 @@ check_fapl_mdc_api_errs(void)
scratch.version = H5C__CURR_AUTO_SIZE_CTL_VER;
if (pass) {
- H5E_BEGIN_TRY { result = H5Pget_mdc_config((hid_t)-1, &scratch); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pget_mdc_config((hid_t)-1, &scratch);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1734,7 +1737,10 @@ check_fapl_mdc_api_errs(void)
if (pass) {
- H5E_BEGIN_TRY { result = H5Pget_mdc_config(fapl_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pget_mdc_config(fapl_id, NULL);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1749,7 +1755,10 @@ check_fapl_mdc_api_errs(void)
scratch.version = -1; /* a convenient, invalid value */
if (pass) {
- H5E_BEGIN_TRY { result = H5Pget_mdc_config(fapl_id, &scratch); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pget_mdc_config(fapl_id, &scratch);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1765,7 +1774,10 @@ check_fapl_mdc_api_errs(void)
scratch.version = H5C__CURR_AUTO_SIZE_CTL_VER;
if (pass) {
- H5E_BEGIN_TRY { result = H5Pset_mdc_config((hid_t)-1, &default_config); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pset_mdc_config((hid_t)-1, &default_config);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1777,7 +1789,10 @@ check_fapl_mdc_api_errs(void)
if (pass) {
- H5E_BEGIN_TRY { result = H5Pset_mdc_config(fapl_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pset_mdc_config(fapl_id, NULL);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1789,7 +1804,10 @@ check_fapl_mdc_api_errs(void)
i = 0;
while ((pass) && (i < NUM_INVALID_CONFIGS)) {
- H5E_BEGIN_TRY { result = H5Pset_mdc_config(fapl_id, &(invalid_configs[i])); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Pset_mdc_config(fapl_id, &(invalid_configs[i]));
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1914,7 +1932,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fget_mdc_config((hid_t)-1, &scratch); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fget_mdc_config((hid_t)-1, &scratch);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1931,7 +1952,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fget_mdc_config(file_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fget_mdc_config(file_id, NULL);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1949,7 +1973,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fget_mdc_config(file_id, &scratch); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fget_mdc_config(file_id, &scratch);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1969,7 +1996,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fset_mdc_config((hid_t)-1, &default_config); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fset_mdc_config((hid_t)-1, &default_config);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -1986,7 +2016,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fset_mdc_config(file_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fset_mdc_config(file_id, NULL);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -2003,7 +2036,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fset_mdc_config() with invalid config %d.\n", FUNC, i);
}
- H5E_BEGIN_TRY { result = H5Fset_mdc_config(file_id, &(invalid_configs[i])); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fset_mdc_config(file_id, &(invalid_configs[i]));
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -2028,7 +2064,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fget_mdc_hit_rate((hid_t)-1, &hit_rate); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fget_mdc_hit_rate((hid_t)-1, &hit_rate);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -2045,7 +2084,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Fget_mdc_hit_rate(file_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Fget_mdc_hit_rate(file_id, NULL);
+ }
H5E_END_TRY;
if (result >= 0) {
@@ -2063,7 +2105,10 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", FUNC);
}
- H5E_BEGIN_TRY { result = H5Freset_mdc_hit_rate_stats((hid_t)-1); }
+ H5E_BEGIN_TRY
+ {
+ result = H5Freset_mdc_hit_rate_stats((hid_t)-1);
+ }
H5E_END_TRY;
if (result >= 0) {
diff --git a/test/cache_image.c b/test/cache_image.c
index 966b22a..dd6175a 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -940,7 +940,10 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
}
else {
- H5E_BEGIN_TRY { file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl_id);
+ }
H5E_END_TRY;
}
diff --git a/test/cork.c b/test/cork.c
index c356041..1b24ab3 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -1469,19 +1469,28 @@ verify_multiple_cork(hbool_t swmr)
TEST_ERROR
/* Should fail to cork the attribute: aidg2; not an object */
- H5E_BEGIN_TRY { ret = H5Odisable_mdc_flushes(aidg2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Odisable_mdc_flushes(aidg2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
/* Should fail to uncork the attribute: aidd1; not an object */
- H5E_BEGIN_TRY { ret = H5Odisable_mdc_flushes(aidd1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Odisable_mdc_flushes(aidd1);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
/* Should fail to check cork status of the attribute: aidt2; not an object */
- H5E_BEGIN_TRY { ret = H5Oare_mdc_flushes_disabled(aidt2, &corked); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oare_mdc_flushes_disabled(aidt2, &corked);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1511,7 +1520,10 @@ verify_multiple_cork(hbool_t swmr)
TEST_ERROR
/* Should fail to uncork the file: fid2; not an object */
- H5E_BEGIN_TRY { ret = H5Oenable_mdc_flushes(fid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oenable_mdc_flushes(fid2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1646,7 +1658,10 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
TEST_ERROR
/* Should fail to cork the datatype: not an object */
- H5E_BEGIN_TRY { ret = H5Odisable_mdc_flushes(tid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Odisable_mdc_flushes(tid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1682,7 +1697,10 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
TEST_ERROR
/* Should fail to uncork the dataspace: not an object */
- H5E_BEGIN_TRY { ret = H5Oenable_mdc_flushes(sid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oenable_mdc_flushes(sid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1696,7 +1714,10 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
TEST_ERROR
/* Should fail to check cork status of the attribute: not an object */
- H5E_BEGIN_TRY { ret = H5Oare_mdc_flushes_disabled(aid, &corked); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oare_mdc_flushes_disabled(aid, &corked);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1736,7 +1757,10 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
TEST_ERROR
/* Should fail to cork the group again */
- H5E_BEGIN_TRY { ret = H5Odisable_mdc_flushes(gid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Odisable_mdc_flushes(gid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1758,7 +1782,10 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
TEST_ERROR
/* Should fail to un-cork the named datatype that is not corked yet */
- H5E_BEGIN_TRY { ret = H5Oenable_mdc_flushes(tid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oenable_mdc_flushes(tid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
diff --git a/test/cross_read.c b/test/cross_read.c
index d2f74b6..386c0da 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -121,7 +121,10 @@ check_data_i(const char *dsetname, hid_t fid)
return 0;
error:
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY;
return 1;
} /* end check_data_i() */
@@ -192,7 +195,10 @@ check_data_f(const char *dsetname, hid_t fid)
return 0;
error:
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY;
return 1;
} /* end check_data_f() */
@@ -321,7 +327,10 @@ check_file(char *filename)
return nerrors;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return nerrors;
} /* end check_file() */
diff --git a/test/dangle.c b/test/dangle.c
index d48f0b5..e6cb8af 100644
--- a/test/dangle.c
+++ b/test/dangle.c
@@ -176,7 +176,10 @@ test_dangle_group(H5F_close_degree_t degree)
TEST_ERROR;
/* Try creating duplicate group */
- H5E_BEGIN_TRY { gid = H5Gcreate2(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gcreate2(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0)
TEST_ERROR
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 14cf561..7db7242 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -2026,7 +2026,10 @@ test_read_unallocated_chunk(hid_t file)
offset[1] = j * CHUNK_NY;
/* Read a non-existant chunk using the direct read function. */
- H5E_BEGIN_TRY { status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf);
+ }
H5E_END_TRY;
/* Check that the chunk read call does not succeed. */
@@ -2035,7 +2038,10 @@ test_read_unallocated_chunk(hid_t file)
/* Query the size of the non-existant chunk */
direct_chunk_nbytes = ULONG_MAX;
- H5E_BEGIN_TRY { status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes);
+ }
H5E_END_TRY;
/* Check that the chunk storage size call does not succeed. */
diff --git a/test/dsets.c b/test/dsets.c
index a4c6115..0d4e90c 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -434,7 +434,10 @@ test_create(hid_t file)
* cannot be created with this function. Temporarily turn off error
* reporting.
*/
- H5E_BEGIN_TRY { dataset = H5Dopen2(file, "does_not_exist", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dataset = H5Dopen2(file, "does_not_exist", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (dataset >= 0) {
H5_FAILED();
@@ -929,7 +932,10 @@ test_compact_io(hid_t fapl)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -1450,7 +1456,10 @@ test_conv_buffer(hid_t fid)
if (H5Pset_buffer(xfer_list, size, NULL, NULL) < 0)
goto error;
- H5E_BEGIN_TRY { status = H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -1981,7 +1990,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (corrupted) {
/* Default behavior is failure when data is corrupted. */
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -1996,7 +2008,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (H5Pset_filter_callback(write_dxpl, filter_cb_fail, NULL) < 0)
TEST_ERROR;
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2042,7 +2057,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (corrupted) {
/* Default behavior is failure when data is corrupted. */
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2057,7 +2075,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (H5Pset_filter_callback(write_dxpl, filter_cb_fail, NULL) < 0)
TEST_ERROR;
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2100,7 +2121,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (corrupted) {
/* Default behavior is failure when data is corrupted. */
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2116,7 +2140,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
TEST_ERROR;
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2161,7 +2188,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (corrupted) {
/* Default behavior is failure when data is corrupted. */
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2176,7 +2206,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
if (H5Pset_filter_callback(write_dxpl, filter_cb_fail, NULL) < 0)
TEST_ERROR;
/* (Use the "write" DXPL in order to make certain corruption is seen) */
- H5E_BEGIN_TRY { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR;
@@ -2317,7 +2350,10 @@ test_filter_noencoder(const char *dset_name)
* allocation.
*/
dims = 20; /* Dataset is originally of size 10 */
- H5E_BEGIN_TRY { err = H5Dset_extent(dset_id, &dims); }
+ H5E_BEGIN_TRY
+ {
+ err = H5Dset_extent(dset_id, &dims);
+ }
H5E_END_TRY
if (err >= 0)
@@ -2326,7 +2362,10 @@ test_filter_noencoder(const char *dset_name)
/* Attempt to write to the dataset. This should fail because
* the filter does not have an encoder.
*/
- H5E_BEGIN_TRY { err = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, test_ints); }
+ H5E_BEGIN_TRY
+ {
+ err = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, test_ints);
+ }
H5E_END_TRY
if (err >= 0)
@@ -2419,7 +2458,10 @@ test_get_filter_info(void)
/* Verify that get_filter_info throws an error when given a bad filter */
/* (Depends on 1.6 compatibility flag) */
- H5E_BEGIN_TRY { err = H5Zget_filter_info(-1, &flags); }
+ H5E_BEGIN_TRY
+ {
+ err = H5Zget_filter_info(-1, &flags);
+ }
H5E_END_TRY;
if (err >= 0)
TEST_ERROR
@@ -2966,7 +3008,10 @@ test_missing_filter(hid_t file)
} /* end if */
/* Read data (should fail, since deflate filter is missing) */
- H5E_BEGIN_TRY { ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -6281,7 +6326,10 @@ test_can_apply_szip(hid_t
/* Set (invalid at property set time) szip parameters */
szip_pixels_per_block = 3;
- H5E_BEGIN_TRY { ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -6291,7 +6339,10 @@ test_can_apply_szip(hid_t
/* Set (invalid at property set time) szip parameters */
szip_pixels_per_block = 512;
- H5E_BEGIN_TRY { ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -7044,7 +7095,10 @@ test_filter_delete(hid_t file)
} /* end if */
/* try to delete the deflate filter again */
- H5E_BEGIN_TRY { ret = H5Premove_filter(dcpl1, H5Z_FILTER_DEFLATE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Premove_filter(dcpl1, H5Z_FILTER_DEFLATE);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -7327,7 +7381,10 @@ test_zero_dims(hid_t file)
} /* end if */
/* Try creating chunked dataset with zero-sized chunk dimensions */
- H5E_BEGIN_TRY { ret = H5Pset_chunk(dcpl, 1, &dzero); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_chunk(dcpl, 1, &dzero);
+ }
H5E_END_TRY;
if (ret > 0)
FAIL_PUTS_ERROR("set zero-sized chunk dimensions")
@@ -7405,7 +7462,10 @@ test_zero_dims(hid_t file)
} /* end if */
/* Try creating chunked dataset with zero-sized chunk dimensions */
- H5E_BEGIN_TRY { ret = H5Pset_chunk(dcpl2, 2, dzero2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_chunk(dcpl2, 2, dzero2);
+ }
H5E_END_TRY;
if (ret > 0)
FAIL_PUTS_ERROR("set zero-sized chunk dimensions")
@@ -8374,7 +8434,10 @@ test_deprec(hid_t file)
* dataset can only be created once. Temporarily turn off error
* reporting.
*/
- H5E_BEGIN_TRY { dataset = H5Dcreate1(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dataset = H5Dcreate1(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (dataset >= 0) {
H5_FAILED();
@@ -8396,7 +8459,10 @@ test_deprec(hid_t file)
* cannot be created with this function. Temporarily turn off error
* reporting.
*/
- H5E_BEGIN_TRY { dataset = H5Dopen1(file, "does_not_exist"); }
+ H5E_BEGIN_TRY
+ {
+ dataset = H5Dopen1(file, "does_not_exist");
+ }
H5E_END_TRY;
if (dataset >= 0) {
H5_FAILED();
@@ -8571,7 +8637,10 @@ test_huge_chunks(hid_t fapl)
/* Try to set too large of a chunk for 1-D dataset (# of elements) */
chunk_dim = TOO_HUGE_CHUNK_DIM;
- H5E_BEGIN_TRY { ret = H5Pset_chunk(dcpl, 1, &chunk_dim); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_chunk(dcpl, 1, &chunk_dim);
+ }
H5E_END_TRY;
if (ret >= 0)
FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions.")
@@ -8580,7 +8649,10 @@ test_huge_chunks(hid_t fapl)
chunk_dim2[0] = TOO_HUGE_CHUNK_DIM2_0;
chunk_dim2[1] = TOO_HUGE_CHUNK_DIM2_1;
chunk_dim2[2] = TOO_HUGE_CHUNK_DIM2_2;
- H5E_BEGIN_TRY { ret = H5Pset_chunk(dcpl, 3, chunk_dim2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_chunk(dcpl, 3, chunk_dim2);
+ }
H5E_END_TRY;
if (ret >= 0)
FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions.")
@@ -11814,7 +11886,10 @@ test_zero_dim_dset(hid_t fapl)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds before opening the file */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -13068,7 +13143,10 @@ test_power2up(hid_t fapl)
ext_dims[1] = dims[1] + 5;
/* Extend to (2^63)+ */
- H5E_BEGIN_TRY { status = H5Dset_extent(did, ext_dims); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dset_extent(did, ext_dims);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR
@@ -13404,7 +13482,10 @@ test_scatter(void)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(sid);
+ }
H5E_END_TRY;
return FAIL;
} /* end test_scatter() */
@@ -13768,7 +13849,10 @@ test_gather(void)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(sid);
+ }
H5E_END_TRY;
return FAIL;
} /* end test_gather() */
@@ -13872,14 +13956,20 @@ test_scatter_error(void)
*/
scatter_info.src_buf = src_buf;
scatter_info.size = 6;
- H5E_BEGIN_TRY { ret = H5Dscatter(NULL, NULL, H5T_NATIVE_INT, sid, dst_buf); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dscatter(NULL, NULL, H5T_NATIVE_INT, sid, dst_buf);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
scatter_info.src_buf = src_buf;
scatter_info.size = 6;
- H5E_BEGIN_TRY { ret = H5Dscatter((H5D_scatter_func_t)scatter_cb, &scatter_info, sid, sid, dst_buf); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dscatter((H5D_scatter_func_t)scatter_cb, &scatter_info, sid, sid, dst_buf);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
@@ -13992,7 +14082,10 @@ test_scatter_error(void)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(sid);
+ }
H5E_END_TRY;
return FAIL;
} /* end test_scatter_error() */
@@ -14094,14 +14187,20 @@ test_gather_error(void)
gather_info.expect_dst_buf = expect_dst_buf;
gather_info.last_call = FALSE;
- H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 0, dst_buf, gather_cb, &gather_info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 0, dst_buf, gather_cb, &gather_info);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
gather_info.expect_dst_buf = expect_dst_buf;
gather_info.last_call = FALSE;
- H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 1, dst_buf, gather_cb, &gather_info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 1, dst_buf, gather_cb, &gather_info);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
@@ -14149,7 +14248,10 @@ test_gather_error(void)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(sid);
+ }
H5E_END_TRY;
return FAIL;
} /* end test_gather_error() */
@@ -14510,7 +14612,10 @@ test_compact_open_close_dirty(hid_t fapl)
/* Verify the repeated open/close of the dataset will not fail */
for (i = 0; i < 20; i++) {
- H5E_BEGIN_TRY { did = H5Dopen2(fid, DSET_COMPACT_MAX_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(fid, DSET_COMPACT_MAX_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did < 0)
TEST_ERROR
@@ -14638,7 +14743,10 @@ test_versionbounds(void)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds, skip for invalid low/high combination */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -14793,7 +14901,10 @@ test_object_header_minimization_dcpl(void)
/* error cases
*/
- H5E_BEGIN_TRY { ret = H5Pget_dset_no_attrs_hint(-1, &minimize); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pget_dset_no_attrs_hint(-1, &minimize);
+ }
H5E_END_TRY;
if (ret == SUCCEED)
TEST_ERROR /* Invalid DCPL ID should fail */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 39f562a..1eafee2 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -864,7 +864,10 @@ test_particular_fp_integer(void)
error:
HDfflush(stdout);
- H5E_BEGIN_TRY { H5Pclose(dxpl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dxpl_id);
+ }
H5E_END_TRY;
if (buf1)
HDfree(buf1);
diff --git a/test/dtransform.c b/test/dtransform.c
index 33cce3f..c679d30 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -914,7 +914,10 @@ test_set(void)
error:
if (ptrgetTest)
HDfree(ptrgetTest);
- H5E_BEGIN_TRY { H5Pclose(dxpl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dxpl_id);
+ }
H5E_END_TRY
return -1;
diff --git a/test/dtypes.c b/test/dtypes.c
index e77fa8f..e342f03 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -312,7 +312,10 @@ test_copy(void)
goto error;
/* We should not be able to close a built-in byte */
- H5E_BEGIN_TRY { status = H5Tclose(H5T_NATIVE_SCHAR); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tclose(H5T_NATIVE_SCHAR);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -598,7 +601,10 @@ test_compound_1(void)
goto error;
/* Attempt to add the new compound datatype as a field within itself */
- H5E_BEGIN_TRY { ret = H5Tinsert(complex_id, "compound", (size_t)0, complex_id); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tinsert(complex_id, "compound", (size_t)0, complex_id);
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("Inserted compound datatype into itself?");
@@ -612,56 +618,83 @@ test_compound_1(void)
/* Test some functions that aren't supposed to work for compound type */
/* Tries to shrink the size and trail the last member */
- H5E_BEGIN_TRY { ret = H5Tset_size(complex_id, sizeof(double)); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_size(complex_id, sizeof(double));
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { size = H5Tget_precision(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_precision(complex_id);
+ }
H5E_END_TRY;
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
size = 128;
- H5E_BEGIN_TRY { ret = H5Tset_precision(complex_id, size); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_precision(complex_id, size);
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { ret = H5Tget_pad(complex_id, &lsb, &msb); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tget_pad(complex_id, &lsb, &msb);
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { size = H5Tget_ebias(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_ebias(complex_id);
+ }
H5E_END_TRY;
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { lsb = H5Tget_inpad(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ lsb = H5Tget_inpad(complex_id);
+ }
H5E_END_TRY;
if (lsb >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { cset = H5Tget_cset(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(complex_id);
+ }
H5E_END_TRY;
if (cset > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { strpad = H5Tget_strpad(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ strpad = H5Tget_strpad(complex_id);
+ }
H5E_END_TRY;
if (strpad > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { offset = H5Tget_offset(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ offset = H5Tget_offset(complex_id);
+ }
H5E_END_TRY;
if (offset >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
@@ -673,19 +706,28 @@ test_compound_1(void)
if (order != H5T_ORDER_LE && order != H5T_ORDER_BE)
FAIL_PUTS_ERROR("Wrong order for this type.");
- H5E_BEGIN_TRY { sign = H5Tget_sign(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ sign = H5Tget_sign(complex_id);
+ }
H5E_END_TRY;
if (sign > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { tag = H5Tget_tag(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ tag = H5Tget_tag(complex_id);
+ }
H5E_END_TRY;
if (tag) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { super = H5Tget_super(complex_id); }
+ H5E_BEGIN_TRY
+ {
+ super = H5Tget_super(complex_id);
+ }
H5E_END_TRY;
if (super >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
@@ -1347,7 +1389,10 @@ test_compound_7(void)
} /* end if */
/* Should not be able to insert field past end of compound datatype */
- H5E_BEGIN_TRY { ret = H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -1356,7 +1401,10 @@ test_compound_7(void)
} /* end if */
/* Should not be able to shrink size of compound datatype */
- H5E_BEGIN_TRY { ret = H5Tset_size(tid2, sizeof(struct s1) / 2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_size(tid2, sizeof(struct s1) / 2);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -1590,7 +1638,10 @@ test_compound_8(void)
} /* end if */
/* If the type is not packed, packing a locked type shouldn't work */
- H5E_BEGIN_TRY { ret = H5Tpack(tid3); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tpack(tid3);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -2498,7 +2549,10 @@ test_compound_12(void)
/* Tries to cut last member. Supposed to fail. */
size--;
- H5E_BEGIN_TRY { ret = H5Tset_size(complex_id, size); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_size(complex_id, size);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -3594,7 +3648,10 @@ test_compound_18(void)
HDassert(sid > 0);
/* Create a dataset with the bad compound datatype */
- H5E_BEGIN_TRY { did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did > 0) {
H5Dclose(did);
@@ -3606,7 +3663,10 @@ test_compound_18(void)
HDassert(gid > 0);
/* Create an attribute with the bad compound datatype */
- H5E_BEGIN_TRY { aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (aid > 0) {
H5Aclose(aid);
@@ -3614,7 +3674,10 @@ test_compound_18(void)
} /* end if */
/* Commit the datatype */
- H5E_BEGIN_TRY { ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("committed named datatype with bad compound datatype")
@@ -3636,7 +3699,10 @@ test_compound_18(void)
FAIL_STACK_ERROR
/* Try to open the datatype */
- H5E_BEGIN_TRY { tid = H5Topen2(file, "cmpnd", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tid = H5Topen2(file, "cmpnd", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (tid > 0) {
H5Tclose(tid);
@@ -3644,7 +3710,10 @@ test_compound_18(void)
} /* end if */
/* Try to open the dataset */
- H5E_BEGIN_TRY { did = H5Dopen2(file, "dataset", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(file, "dataset", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did > 0) {
H5Dclose(did);
@@ -3656,7 +3725,10 @@ test_compound_18(void)
TEST_ERROR
/* Try to open the dataset */
- H5E_BEGIN_TRY { aid = H5Aopen(gid, "attr", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ aid = H5Aopen(gid, "attr", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (aid > 0) {
H5Aclose(aid);
@@ -3958,14 +4030,20 @@ test_transient(hid_t fapl)
goto error;
/* Predefined types cannot be modified or closed */
- H5E_BEGIN_TRY { status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
HDputs(" Predefined types should not be modifiable!");
goto error;
}
- H5E_BEGIN_TRY { status = H5Tclose(H5T_NATIVE_INT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tclose(H5T_NATIVE_INT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -3980,7 +4058,10 @@ test_transient(hid_t fapl)
goto error;
/* It should not be possible to create an attribute for a transient type */
- H5E_BEGIN_TRY { ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (ret_id >= 0) {
H5_FAILED();
@@ -3999,7 +4080,10 @@ test_transient(hid_t fapl)
/* The type returned from a dataset should not be modifiable */
if ((t2 = H5Dget_type(dset)) < 0)
goto error;
- H5E_BEGIN_TRY { status = H5Tset_precision(t2, (size_t)256); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tset_precision(t2, (size_t)256);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -4019,7 +4103,10 @@ test_transient(hid_t fapl)
goto error;
if ((t2 = H5Dget_type(dset)) < 0)
goto error;
- H5E_BEGIN_TRY { status = H5Tset_precision(t2, (size_t)256); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tset_precision(t2, (size_t)256);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -4127,7 +4214,10 @@ test_named(hid_t fapl)
}
/* We should not be able to modify a type after it has been committed. */
- H5E_BEGIN_TRY { status = H5Tset_precision(type, (size_t)256); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tset_precision(type, (size_t)256);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -4325,7 +4415,10 @@ test_named(hid_t fapl)
/* Verify that H5Tcommit_anon returns an error */
if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0)
goto error;
- H5E_BEGIN_TRY { status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -4935,37 +5028,55 @@ test_conv_str_3(void)
if (H5Tget_order(type) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { ret = H5Tset_precision(type, nelmts); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_precision(type, nelmts);
+ }
H5E_END_TRY;
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { size = H5Tget_ebias(type); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_ebias(type);
+ }
H5E_END_TRY;
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); }
+ H5E_BEGIN_TRY
+ {
+ inpad = H5Tget_inpad(type);
+ }
H5E_END_TRY;
if (inpad > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { sign = H5Tget_sign(type); }
+ H5E_BEGIN_TRY
+ {
+ sign = H5Tget_sign(type);
+ }
H5E_END_TRY;
if (sign > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { tag = H5Tget_tag(type); }
+ H5E_BEGIN_TRY
+ {
+ tag = H5Tget_tag(type);
+ }
H5E_END_TRY;
if (tag) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
- H5E_BEGIN_TRY { super = H5Tget_super(type); }
+ H5E_BEGIN_TRY
+ {
+ super = H5Tget_super(type);
+ }
H5E_END_TRY;
if (super >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
@@ -5298,7 +5409,10 @@ test_bitfield_funcs(void)
if ((ntype = H5Tget_native_type(type, H5T_DIR_ASCEND)) < 0)
goto error;
- H5E_BEGIN_TRY { size = H5Tget_ebias(type); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_ebias(type);
+ }
H5E_END_TRY;
if (size > 0) {
H5_FAILED();
@@ -5306,7 +5420,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); }
+ H5E_BEGIN_TRY
+ {
+ inpad = H5Tget_inpad(type);
+ }
H5E_END_TRY;
if (inpad > -1) {
H5_FAILED();
@@ -5314,7 +5431,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { cset = H5Tget_cset(type); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(type);
+ }
H5E_END_TRY;
if (cset > -1) {
H5_FAILED();
@@ -5322,7 +5442,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); }
+ H5E_BEGIN_TRY
+ {
+ strpad = H5Tget_strpad(type);
+ }
H5E_END_TRY;
if (strpad > -1) {
H5_FAILED();
@@ -5330,7 +5453,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { ret = H5Tset_sign(type, H5T_SGN_2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_sign(type, H5T_SGN_2);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -5338,7 +5464,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { tag = H5Tget_tag(type); }
+ H5E_BEGIN_TRY
+ {
+ tag = H5Tget_tag(type);
+ }
H5E_END_TRY;
if (tag) {
H5_FAILED();
@@ -5346,7 +5475,10 @@ test_bitfield_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { super = H5Tget_super(type); }
+ H5E_BEGIN_TRY
+ {
+ super = H5Tget_super(type);
+ }
H5E_END_TRY;
if (super >= 0) {
H5_FAILED();
@@ -5471,7 +5603,10 @@ opaque_check(int tag_it)
}
/* Make sure that we can't convert between the types yet */
- H5E_BEGIN_TRY { status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -5540,7 +5675,10 @@ opaque_long(void)
long_tag[16384] = '\0';
/* Set opaque type's tag */
- H5E_BEGIN_TRY { ret = H5Tset_tag(dt, long_tag); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_tag(dt, long_tag);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
@@ -5596,63 +5734,90 @@ opaque_funcs(void)
if ((size = H5Tget_size(type)) == 0)
goto error;
- H5E_BEGIN_TRY { ret = H5Tset_precision(type, (size_t)32); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_precision(type, (size_t)32);
+ }
H5E_END_TRY;
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
+ }
H5E_END_TRY;
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { size = H5Tget_ebias(type); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_ebias(type);
+ }
H5E_END_TRY;
if (size > 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); }
+ H5E_BEGIN_TRY
+ {
+ inpad = H5Tget_inpad(type);
+ }
H5E_END_TRY;
if (inpad > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { cset = H5Tget_cset(type); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(type);
+ }
H5E_END_TRY;
if (cset > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); }
+ H5E_BEGIN_TRY
+ {
+ strpad = H5Tget_strpad(type);
+ }
H5E_END_TRY;
if (strpad > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { ret = H5Tset_offset(type, (size_t)16); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_offset(type, (size_t)16);
+ }
H5E_END_TRY;
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { sign = H5Tget_sign(type); }
+ H5E_BEGIN_TRY
+ {
+ sign = H5Tget_sign(type);
+ }
H5E_END_TRY;
if (sign > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { super = H5Tget_super(type); }
+ H5E_BEGIN_TRY
+ {
+ super = H5Tget_super(type);
+ }
H5E_END_TRY;
if (super >= 0) {
HDprintf("Operation not allowed for this type.\n");
@@ -5810,7 +5975,10 @@ test_encode(void)
cmpd_buf = (unsigned char *)HDcalloc((size_t)1, cmpd_buf_size);
/* Try decoding bogus buffer */
- H5E_BEGIN_TRY { ret_id = H5Tdecode(cmpd_buf); }
+ H5E_BEGIN_TRY
+ {
+ ret_id = H5Tdecode(cmpd_buf);
+ }
H5E_END_TRY;
if (ret_id != FAIL) {
H5_FAILED();
@@ -6159,7 +6327,10 @@ test_encode(void)
} /* end if */
/* Make sure the decoded datatypes are already closed. */
- H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tclose(decoded_tid1);
+ }
H5E_END_TRY;
if (ret != FAIL) {
H5_FAILED();
@@ -6167,7 +6338,10 @@ test_encode(void)
goto error;
}
- H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tclose(decoded_tid2);
+ }
H5E_END_TRY;
if (ret != FAIL) {
H5_FAILED();
@@ -6175,7 +6349,10 @@ test_encode(void)
goto error;
}
- H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid3); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tclose(decoded_tid3);
+ }
H5E_END_TRY;
if (ret != FAIL) {
H5_FAILED();
@@ -6610,7 +6787,10 @@ test_int_float_except(void)
#if H5_SIZEOF_INT == 4 && H5_SIZEOF_FLOAT == 4
error:
- H5E_BEGIN_TRY { H5Pclose(dxpl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dxpl);
+ }
H5E_END_TRY;
return 1;
#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
@@ -7788,7 +7968,10 @@ test_deprec(hid_t fapl)
FAIL_STACK_ERROR
/* Predefined types cannot be committed */
- H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Predefined types should not be committable!")
@@ -7804,13 +7987,19 @@ test_deprec(hid_t fapl)
FAIL_PUTS_ERROR(" H5Tcommitted() returned false!")
/* We should not be able to modify a type after it has been committed. */
- H5E_BEGIN_TRY { status = H5Tset_precision(type, (size_t)256); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tset_precision(type, (size_t)256);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Committed type is not constant!")
/* We should not be able to re-commit a committed type */
- H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_2 (should not exist)", type); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Committed types should not be recommitted!")
@@ -7840,7 +8029,10 @@ test_deprec(hid_t fapl)
/* Verify that H5Tcommit2 returns an error */
if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0)
goto error;
- H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_3 (should not exist)", type); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tcommit1(file, "test_named_3 (should not exist)", type);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -7927,7 +8119,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Test conversion in memory */
- H5E_BEGIN_TRY { status = H5Tconvert(utf8_vtid, ascii_vtid, 1, (void *)utf8_w, NULL, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tconvert(utf8_vtid, ascii_vtid, 1, (void *)utf8_w, NULL, H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -7950,7 +8145,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Read the UTF8 string, as ASCII, supposed to fail */
- H5E_BEGIN_TRY { status = H5Dread(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_r); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_r);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -7963,7 +8161,10 @@ test_utf_ascii_conv(void)
* Test VL string conversion from ASCII to UTF8
************************************************/
/* Test conversion in memory */
- H5E_BEGIN_TRY { status = H5Tconvert(ascii_vtid, utf8_vtid, 1, (void *)ascii_w, NULL, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tconvert(ascii_vtid, utf8_vtid, 1, (void *)ascii_w, NULL, H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -7977,7 +8178,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Read the ASCII string, as UTF8, supposed to fail */
- H5E_BEGIN_TRY { status = H5Dread(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_r); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_r);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -8020,7 +8224,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Test conversion in memory */
- H5E_BEGIN_TRY { status = H5Tconvert(utf8_tid, ascii_tid, 1, utf8_2, NULL, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tconvert(utf8_tid, ascii_tid, 1, utf8_2, NULL, H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -8034,7 +8241,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Read the UTF8 string as ASCII, supposed to fail */
- H5E_BEGIN_TRY { status = H5Dread(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii2); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii2);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -8047,7 +8257,10 @@ test_utf_ascii_conv(void)
* Test fixed-length string conversion from ASCII to UTF8
**********************************************************/
/* Test conversion in memory */
- H5E_BEGIN_TRY { status = H5Tconvert(ascii_tid, utf8_tid, 1, ascii2, NULL, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tconvert(ascii_tid, utf8_tid, 1, ascii2, NULL, H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -8061,7 +8274,10 @@ test_utf_ascii_conv(void)
FAIL_STACK_ERROR
/* Read the UTF8 string as ASCII, supposed to fail */
- H5E_BEGIN_TRY { status = H5Dread(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_2); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dread(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_2);
+ }
H5E_END_TRY
if (status >= 0)
FAIL_STACK_ERROR
@@ -8437,7 +8653,10 @@ test_versionbounds(void)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
diff --git a/test/earray.c b/test/earray.c
index f283df2..8e3204f 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -611,7 +611,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
/* Set invalid element size */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.raw_elmt_size = 0;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -625,7 +628,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
/* Set invalid max. # of elements bits */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_nelmts_bits = 0;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -638,7 +644,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_nelmts_bits = 65;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -652,7 +661,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
/* Set invalid min. # of data block pointers in super blocks */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.sup_blk_min_data_ptrs = 0;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -664,7 +676,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
} /* end if */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.sup_blk_min_data_ptrs = 1;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -676,7 +691,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
} /* end if */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.sup_blk_min_data_ptrs = 6;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -690,7 +708,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
/* Set invalid min. # of elements per data block */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.data_blk_min_elmts = 0;
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -706,7 +727,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_dblk_page_nelmts_bits =
(uint8_t)(H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1);
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -720,7 +744,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_dblk_page_nelmts_bits = 4; /* corresponds to 16 elements in data block page, which is
less than the 64 elements for the default settings */
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -732,7 +759,10 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
} /* end if */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(test_cparam.max_nelmts_bits + 1);
- H5E_BEGIN_TRY { ea = H5EA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened extensible array */
@@ -1166,7 +1196,10 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
ea2 = NULL;
/* Try re-opening the array again (should fail, as array will be deleted) */
- H5E_BEGIN_TRY { ea2 = H5EA_open(f, ea_addr, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea2 = H5EA_open(f, ea_addr, NULL);
+ }
H5E_END_TRY;
if (ea2) {
/* Close opened array */
@@ -1186,7 +1219,10 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
TEST_ERROR
/* Try re-opening the array again (should fail, as array is now deleted) */
- H5E_BEGIN_TRY { ea = H5EA_open(f, ea_addr, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ea = H5EA_open(f, ea_addr, NULL);
+ }
H5E_END_TRY;
if (ea) {
/* Close opened array */
@@ -2556,7 +2592,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/efc.c b/test/efc.c
index f61631d..3749e25 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -2712,7 +2712,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl_id);
+ }
H5E_END_TRY
if (api_ctx_pushed)
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index fc0936d..7000140 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -54,7 +54,10 @@ error:
if (temp_buf)
HDfree(temp_buf);
- H5E_BEGIN_TRY { H5Pclose(pl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(pl);
+ }
H5E_END_TRY;
return (-1);
diff --git a/test/enum.c b/test/enum.c
index 810f2dc..47e7e1c 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -602,7 +602,10 @@ test_value_dsnt_exist(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Tclose(datatype_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Tclose(datatype_id);
+ }
H5E_END_TRY;
return 1;
}
@@ -661,7 +664,10 @@ test_funcs(void)
if (H5Tget_super(type) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -669,7 +675,10 @@ test_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { size = H5Tget_ebias(type); }
+ H5E_BEGIN_TRY
+ {
+ size = H5Tget_ebias(type);
+ }
H5E_END_TRY;
if (size > 0) {
H5_FAILED();
@@ -677,7 +686,10 @@ test_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); }
+ H5E_BEGIN_TRY
+ {
+ inpad = H5Tget_inpad(type);
+ }
H5E_END_TRY;
if (inpad > -1) {
H5_FAILED();
@@ -685,7 +697,10 @@ test_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { cset = H5Tget_cset(type); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(type);
+ }
H5E_END_TRY;
if (cset > -1) {
H5_FAILED();
@@ -694,7 +709,10 @@ test_funcs(void)
} /* end if */
size = 16;
- H5E_BEGIN_TRY { ret = H5Tset_offset(type, (size_t)size); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_offset(type, (size_t)size);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -702,7 +720,10 @@ test_funcs(void)
goto error;
} /* end if */
- H5E_BEGIN_TRY { ret = H5Tset_order(type, H5T_ORDER_BE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tset_order(type, H5T_ORDER_BE);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -717,7 +738,10 @@ test_funcs(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Tclose(type); }
+ H5E_BEGIN_TRY
+ {
+ H5Tclose(type);
+ }
H5E_END_TRY;
return 1;
}
diff --git a/test/error_test.c b/test/error_test.c
index c9cd1d1..5e74474 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -558,7 +558,10 @@ test_copy(void)
/* Try to close error stack copy. Should fail because
* the current H5Eset_current_stack closes the stack to be set.
*/
- H5E_BEGIN_TRY { ret = H5Eclose_stack(estack_id); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Eclose_stack(estack_id);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
diff --git a/test/evict_on_close.c b/test/evict_on_close.c
index 498ee8d..472da13 100644
--- a/test/evict_on_close.c
+++ b/test/evict_on_close.c
@@ -777,7 +777,10 @@ check_dset_scheme(hid_t fid, const char *dset_name)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY;
H5_FAILED();
@@ -840,13 +843,19 @@ check_evict_on_close_api(void)
TEST_ERROR;
/* ensure using an incorrect access plist fails */
- H5E_BEGIN_TRY { status = H5Pset_evict_on_close(dapl_id, evict_on_close); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Pset_evict_on_close(dapl_id, evict_on_close);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR("H5Pset_evict_on_close() accepted invalid access plist.");
/* ensure an invalid plist fails */
- H5E_BEGIN_TRY { status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR("H5Pget_evict_on_close() accepted invalid hid_t.");
@@ -993,7 +1002,10 @@ check_evict_on_close_parallel_fail(void)
/* Set the evict on close property (should fail)*/
evict_on_close = TRUE;
- H5E_BEGIN_TRY { status = H5Pset_evict_on_close(fapl_id, evict_on_close); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Pset_evict_on_close(fapl_id, evict_on_close);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR("H5Pset_evict_on_close() did not fail in parallel HDF5.");
diff --git a/test/external.c b/test/external.c
index efea3a9..19a11e7 100644
--- a/test/external.c
+++ b/test/external.c
@@ -134,7 +134,10 @@ test_non_extendible(hid_t file)
FAIL_STACK_ERROR
/* Test dataset address. Should be undefined. */
- H5E_BEGIN_TRY { dset_addr = H5Dget_offset(dset); }
+ H5E_BEGIN_TRY
+ {
+ dset_addr = H5Dget_offset(dset);
+ }
H5E_END_TRY;
if (dset_addr != HADDR_UNDEF)
FAIL_STACK_ERROR
@@ -220,7 +223,10 @@ test_too_small(hid_t file)
if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external file succeeded instead of failing.");
@@ -332,7 +338,10 @@ test_large_enough_current_not_eventual(hid_t file)
if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external file succeeded instead of failing.");
@@ -547,7 +556,10 @@ test_multiple_files(hid_t file)
FAIL_STACK_ERROR;
}
- H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external files succeeded instead of failing.");
@@ -599,7 +611,10 @@ test_add_to_unlimited(void)
if (H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed.");
@@ -615,7 +630,10 @@ test_add_to_unlimited(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Pclose(dcpl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dcpl);
+ }
H5E_END_TRY;
return 1;
} /* end test_add_to_unlimited() */
@@ -647,7 +665,10 @@ test_overflow(void)
if (H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED - 1) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed.");
@@ -659,7 +680,10 @@ test_overflow(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Pclose(dcpl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dcpl);
+ }
H5E_END_TRY;
return 1;
} /* end test_overflow() */
@@ -1187,7 +1211,10 @@ test_path_relative_cwd(hid_t fapl)
/* Reopen dataset with different efile_prefix property */
if (H5Pset_efile_prefix(dapl, "//") < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { dset3 = H5Dopen2(file, "dset1", dapl); }
+ H5E_BEGIN_TRY
+ {
+ dset3 = H5Dopen2(file, "dset1", dapl);
+ }
H5E_END_TRY;
if (dset3 >= 0)
FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
@@ -1221,7 +1248,10 @@ test_path_relative_cwd(hid_t fapl)
/* Reopen dataset with different efile_prefix property */
if (H5Pset_efile_prefix(dapl, NULL) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { dset3 = H5Dopen2(file, "dset1", dapl); }
+ H5E_BEGIN_TRY
+ {
+ dset3 = H5Dopen2(file, "dset1", dapl);
+ }
H5E_END_TRY;
if (dset3 >= 0)
FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
diff --git a/test/farray.c b/test/farray.c
index 3127aa5..7254654 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -439,7 +439,10 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
/* Set invalid element size */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.raw_elmt_size = 0;
- H5E_BEGIN_TRY { fa = H5FA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ fa = H5FA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (fa) {
/* Close opened fixed array */
@@ -453,7 +456,10 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
/* Set invalid max. # of elements bits */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.max_dblk_page_nelmts_bits = 0;
- H5E_BEGIN_TRY { fa = H5FA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ fa = H5FA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (fa) {
/* Close opened fixed array */
@@ -467,7 +473,10 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
/* Set invalid max. # of elements */
HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
test_cparam.nelmts = 0;
- H5E_BEGIN_TRY { fa = H5FA_create(f, &test_cparam, NULL); }
+ H5E_BEGIN_TRY
+ {
+ fa = H5FA_create(f, &test_cparam, NULL);
+ }
H5E_END_TRY;
if (fa) {
/* Close opened fixed array */
@@ -884,7 +893,10 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
fa2 = NULL;
/* Try re-opening the array again (should fail, as array will be deleted) */
- H5E_BEGIN_TRY { fa2 = H5FA_open(f, fa_addr, NULL); }
+ H5E_BEGIN_TRY
+ {
+ fa2 = H5FA_open(f, fa_addr, NULL);
+ }
H5E_END_TRY;
if (fa2) {
/* Close opened array */
@@ -904,7 +916,10 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
TEST_ERROR
/* Try re-opening the array again (should fail, as array is now deleted) */
- H5E_BEGIN_TRY { fa = H5FA_open(f, fa_addr, NULL); }
+ H5E_BEGIN_TRY
+ {
+ fa = H5FA_open(f, fa_addr, NULL);
+ }
H5E_END_TRY;
if (fa) {
/* Close opened array */
@@ -1782,7 +1797,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/fheap.c b/test/fheap.c
index 0fde197..b1558db 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -2358,7 +2358,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
fh2 = NULL;
/* Try re-opening the heap again (should fail, as heap will be deleted) */
- H5E_BEGIN_TRY { fh2 = H5HF_open(f, fh_addr); }
+ H5E_BEGIN_TRY
+ {
+ fh2 = H5HF_open(f, fh_addr);
+ }
H5E_END_TRY;
if (fh2) {
/* Close opened heap */
@@ -2395,7 +2398,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
} /* end if */
/* Try re-opening the heap again (should fail, as heap is now deleted) */
- H5E_BEGIN_TRY { fh = H5HF_open(f, fh_addr); }
+ H5E_BEGIN_TRY
+ {
+ fh = H5HF_open(f, fh_addr);
+ }
H5E_END_TRY;
if (fh) {
/* Close opened heap */
@@ -2582,7 +2588,10 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
tmp_cparam.id_len = 3;
/* Create absolute heap */
- H5E_BEGIN_TRY { fh = H5HF_create(f, &tmp_cparam); }
+ H5E_BEGIN_TRY
+ {
+ fh = H5HF_create(f, &tmp_cparam);
+ }
H5E_END_TRY;
if (NULL != fh)
FAIL_STACK_ERROR
@@ -2743,7 +2752,10 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
tmp_cparam.id_len = H5HF_MAX_ID_LEN + 1;
/* Create absolute heap */
- H5E_BEGIN_TRY { fh = H5HF_create(f, &tmp_cparam); }
+ H5E_BEGIN_TRY
+ {
+ fh = H5HF_create(f, &tmp_cparam);
+ }
H5E_END_TRY;
if (NULL != fh)
FAIL_STACK_ERROR
@@ -3230,7 +3242,10 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
TESTING("inserting 'weird' sized objects into absolute heap");
/* Attempt to insert 0-sized object into heap */
- H5E_BEGIN_TRY { ret = H5HF_insert(fh, (size_t)0, shared_wobj_g, heap_id); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_insert(fh, (size_t)0, shared_wobj_g, heap_id);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -6457,7 +6472,10 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
heap_id[u] = (unsigned char)(HDrandom() + 1);
/* Try removing bogus heap ID from empty heap */
- H5E_BEGIN_TRY { ret = H5HF_remove(fh, heap_id); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_remove(fh, heap_id);
+ }
H5E_END_TRY;
if (ret >= 0)
FAIL_STACK_ERROR
@@ -6483,14 +6501,20 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
} /* end while */
/* Try removing bogus heap ID from heap w/objects */
- H5E_BEGIN_TRY { ret = H5HF_remove(fh, heap_id); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_remove(fh, heap_id);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
H5Eclear2(H5E_DEFAULT);
/* Try reading bogus heap ID from heap w/objects */
- H5E_BEGIN_TRY { ret = H5HF_read(fh, heap_id, shared_robj_g); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_read(fh, heap_id, shared_robj_g);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -15945,7 +15969,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
FAIL_STACK_ERROR
/* Verify that writing to 'huge' objects works for un-filtered heaps */
- H5E_BEGIN_TRY { ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g);
+ }
H5E_END_TRY;
HDassert(!id_changed);
if (tparam->comp == FHEAP_TEST_COMPRESS) {
@@ -15958,7 +15985,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
} /* end else */
/* Verify that writing to 'tiny' objects return failure (for now) */
- H5E_BEGIN_TRY { ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g);
+ }
H5E_END_TRY;
HDassert(!id_changed);
if (ret >= 0)
diff --git a/test/file_image.c b/test/file_image.c
index 7fa4155..1c3f973 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -1063,21 +1063,30 @@ test_get_file_image_error_rejection(void)
VERIFY(image_ptr != NULL, "HDmalloc(1) failed.");
/* load the image of the file into the buffer */
- H5E_BEGIN_TRY { bytes_read = H5Fget_file_image(file_id, image_ptr, (size_t)(image_size - 1)); }
+ H5E_BEGIN_TRY
+ {
+ bytes_read = H5Fget_file_image(file_id, image_ptr, (size_t)(image_size - 1));
+ }
H5E_END_TRY;
VERIFY(bytes_read < 0, "H5Fget_file_image(2 -- test 1) succeeded.");
/* Call H5Fget_file_image() with good buffer and buffer size,
* but non-existant file_id. Should fail.
*/
- H5E_BEGIN_TRY { bytes_read = H5Fget_file_image((hid_t)0, image_ptr, (size_t)(image_size)); }
+ H5E_BEGIN_TRY
+ {
+ bytes_read = H5Fget_file_image((hid_t)0, image_ptr, (size_t)(image_size));
+ }
H5E_END_TRY;
VERIFY(bytes_read < 0, "H5Fget_file_image(3 -- test 1) succeeded.");
/* Call H5Fget_file_image() with good buffer and buffer size,
* but a file_id of the wrong type. Should fail.
*/
- H5E_BEGIN_TRY { bytes_read = H5Fget_file_image(dset_id, image_ptr, (size_t)(image_size)); }
+ H5E_BEGIN_TRY
+ {
+ bytes_read = H5Fget_file_image(dset_id, image_ptr, (size_t)(image_size));
+ }
H5E_END_TRY;
VERIFY(bytes_read < 0, "H5Fget_file_image(4 -- test 1) succeeded.");
@@ -1178,7 +1187,10 @@ test_get_file_image_error_rejection(void)
VERIFY(err >= 0, "H5Fflush failed");
/* attempt to get the size of the file -- should fail */
- H5E_BEGIN_TRY { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); }
+ H5E_BEGIN_TRY
+ {
+ image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
+ }
H5E_END_TRY;
VERIFY(image_size == -1, "H5Fget_file_image(5) succeeded.");
@@ -1237,7 +1249,10 @@ test_get_file_image_error_rejection(void)
VERIFY(err >= 0, "H5Fflush failed");
/* attempt to get the size of the file -- should fail */
- H5E_BEGIN_TRY { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); }
+ H5E_BEGIN_TRY
+ {
+ image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
+ }
H5E_END_TRY;
VERIFY(image_size == -1, "H5Fget_file_image(6) succeeded.");
@@ -1294,7 +1309,10 @@ test_get_file_image_error_rejection(void)
VERIFY(err >= 0, "H5Fflush failed");
/* attempt to get the size of the file -- should fail */
- H5E_BEGIN_TRY { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); }
+ H5E_BEGIN_TRY
+ {
+ image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
+ }
H5E_END_TRY;
VERIFY(image_size == -1, "H5Fget_file_image(7) succeeded.");
diff --git a/test/fillval.c b/test/fillval.c
index 8755d9c..bfba392 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -86,7 +86,10 @@ create_compound_type(void)
return ret_value;
error:
- H5E_BEGIN_TRY { H5Tclose(ret_value); }
+ H5E_BEGIN_TRY
+ {
+ H5Tclose(ret_value);
+ }
H5E_END_TRY;
return -1;
}
@@ -197,7 +200,10 @@ test_getset(void)
* Reading the fill value from a dataset creation property list that has
* no fill value should result in a failure.
*/
- H5E_BEGIN_TRY { H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i); }
+ H5E_BEGIN_TRY
+ {
+ H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i);
+ }
H5E_END_TRY;
if (fill_i != 0) {
H5_FAILED();
@@ -380,7 +386,9 @@ test_getset_vl(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY {}
+ H5E_BEGIN_TRY
+ {
+ }
H5E_END_TRY;
return 1;
} /* end test_getset_vl() */
diff --git a/test/filter_fail.c b/test/filter_fail.c
index 5b5d38f..e701130 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -167,7 +167,10 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled)
}
else {
/* Data writing should fail */
- H5E_BEGIN_TRY { ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, points); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, points);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -185,7 +188,10 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled)
/* Close dataset. If the chunk cache is enabled, the flushing of chunks should fail
* during H5Dclose. If it is diabled, H5Dwrite should fail but H5Dclose should succeed. */
if (cache_enabled) {
- H5E_BEGIN_TRY { ret = H5Dclose(dataset); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dclose(dataset);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index af3ebf7..60f7171 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -566,7 +566,10 @@ test_dataset_write_with_filters(hid_t fid)
error:
/* Clean up objects used for this test */
- H5E_BEGIN_TRY { H5Pclose(dcpl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dcpl_id);
+ }
H5E_END_TRY
return FAIL;
@@ -703,7 +706,10 @@ test_dataset_read_with_filters(hid_t fid)
error:
/* Clean up objects used for this test */
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY
return FAIL;
@@ -728,7 +734,10 @@ ensure_data_read_fails(hid_t did)
TEST_ERROR;
/* Read the dataset back (should fail) */
- H5E_BEGIN_TRY { ret = H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, *check); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, *check);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -998,7 +1007,10 @@ test_path_api_calls(void)
TESTING(" remove (index 0 in empty table)");
/* Try to remove index zero in an empty list (SHOULD FAIL) */
- H5E_BEGIN_TRY { ret = H5PLremove(0); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5PLremove(0);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1029,7 +1041,10 @@ test_path_api_calls(void)
TESTING(" remove (index too high)");
/* Try to remove a path where the index is beyond the table capacity (SHOULD FAIL) */
- H5E_BEGIN_TRY { ret = H5PLremove(n_starting_paths); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5PLremove(n_starting_paths);
+ }
H5E_END_TRY
if (ret >= 0)
@@ -1087,7 +1102,10 @@ test_path_api_calls(void)
TESTING(" get (index too high)");
/* Get path at the last + 1 index (SHOULD FAIL) */
- H5E_BEGIN_TRY { path_len = H5PLget(n_starting_paths, NULL, 0); }
+ H5E_BEGIN_TRY
+ {
+ path_len = H5PLget(n_starting_paths, NULL, 0);
+ }
H5E_END_TRY
if (path_len > 0)
TEST_ERROR;
diff --git a/test/flush1.c b/test/flush1.c
index 700286d..456f5f4 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -327,7 +327,10 @@ main(void)
HD_exit(EXIT_SUCCESS);
error:
- H5E_BEGIN_TRY { H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl_id);
+ }
H5E_END_TRY;
HDexit(EXIT_FAILURE);
diff --git a/test/freespace.c b/test/freespace.c
index 4b4f537..51f0dc1 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -2910,7 +2910,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/getname.c b/test/getname.c
index ade67b6..51f274b 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -3794,7 +3794,10 @@ main(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file_id);
+ }
H5E_END_TRY;
puts("***** GET NAME TESTS FAILED *****");
diff --git a/test/gheap.c b/test/gheap.c
index ad18852..07312f6 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -148,7 +148,10 @@ test_1(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (obj)
HDfree(obj);
@@ -245,7 +248,10 @@ test_2(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (obj)
HDfree(obj);
@@ -332,7 +338,10 @@ test_3(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (obj)
HDfree(obj);
@@ -425,7 +434,10 @@ test_4(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (obj)
HDfree(obj);
@@ -541,7 +553,10 @@ test_ooo_indices(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (obj)
HDfree(obj);
@@ -596,7 +611,10 @@ main(void)
HDexit(EXIT_SUCCESS);
error:
- H5E_BEGIN_TRY { H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl_id);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/h5test.c b/test/h5test.c
index 1b91fb6..7e869b1 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1616,7 +1616,10 @@ h5_verify_cached_stabs(const char *base_name[], hid_t fapl)
if (h5_fixname(base_name[i], fapl, filename, sizeof(filename)) == NULL)
continue;
- H5E_BEGIN_TRY { file = H5Fopen(filename, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY
if (file < 0) {
i++;
@@ -1637,7 +1640,10 @@ h5_verify_cached_stabs(const char *base_name[], hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return -1;
diff --git a/test/hdfs.c b/test/hdfs.c
index 548bceb..d24e7aa 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -586,7 +586,10 @@ error:
***********/
if (fapl_id < 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
return 1;
@@ -669,7 +672,10 @@ test_hdfs_fapl(void)
return 0;
error:
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
return 1;
@@ -854,7 +860,10 @@ test_vfd_open(void)
HDfprintf(stderr, "testing: %s\n", T.message);
#endif /* HDFS_TEST_DEBUG */
- H5E_BEGIN_TRY { fd = H5FDopen(T.url, T.flags, fapl_id, T.maxaddr); }
+ H5E_BEGIN_TRY
+ {
+ fd = H5FDopen(T.url, T.flags, fapl_id, T.maxaddr);
+ }
H5E_END_TRY;
if (NULL != fd) {
if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) {
@@ -1035,7 +1044,10 @@ error:
(void)H5FDclose(fd_shakespeare);
}
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1132,7 +1144,10 @@ error:
(void)H5FDclose(file_shakespeare);
}
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1336,7 +1351,10 @@ error:
(void)H5FDclose(file_raven);
}
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1457,7 +1475,10 @@ error:
***********/
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
if (file != NULL) {
@@ -1600,7 +1621,10 @@ error:
#endif /* HDFS_TEST_DEBUG */
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
if (file > 0) {
diff --git a/test/lheap.c b/test/lheap.c
index 0fd1349..a2691ee 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -211,7 +211,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/links.c b/test/links.c
index 3681f16..ee370de 100644
--- a/test/links.c
+++ b/test/links.c
@@ -634,14 +634,20 @@ cklinks(hid_t fapl, hbool_t new_format)
FAIL_STACK_ERROR
if (H5Lexists(file, "/grp1/hard", H5P_DEFAULT) != TRUE)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
HDputs(" H5Lexists() should have failed for a path with missing components.");
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { status = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -1036,7 +1042,10 @@ toomany(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through too deep soft link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "soft17", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "soft17", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -1381,7 +1390,10 @@ test_move(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Verify that the group is no longer in the original location */
- H5E_BEGIN_TRY { moved_grp = H5Gopen2(grp_1, "group_move", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ moved_grp = H5Gopen2(grp_1, "group_move", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (moved_grp >= 0) {
H5_FAILED();
@@ -2255,7 +2267,10 @@ external_link_root(hid_t fapl, hbool_t new_format)
if ((fid = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
TEST_ERROR
- H5E_BEGIN_TRY { gid = H5Gcreate2(fid, "ext_link/readonly_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gcreate2(fid, "ext_link/readonly_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY
if (gid >= 0)
TEST_ERROR
@@ -3049,7 +3064,10 @@ external_link_toomany(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "link1", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "link1", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -3156,7 +3174,10 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
TEST_ERROR;
/* Open object through dangling file external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "no_file", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "no_file", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -3165,7 +3186,10 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
}
/* Open object through dangling object external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "no_object", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "no_object", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -3273,7 +3297,10 @@ external_link_prefix(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", gapl_id); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", gapl_id);
+ }
H5E_END_TRY;
/* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */
@@ -3367,7 +3394,10 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file from absolute path set for main file */
@@ -3452,7 +3482,10 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file from the main file's relative pathname */
@@ -3542,7 +3575,10 @@ external_link_cwd(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file from the current working directory */
@@ -3637,7 +3673,10 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file with abolute path */
@@ -3732,7 +3771,10 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file from main file's current working directory */
@@ -3904,7 +3946,10 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (HDchdir("..") < 0)
@@ -4536,7 +4581,10 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
TEST_ERROR
/* Attempt to create a group through the external link using gapl (should fail) */
- H5E_BEGIN_TRY { group = H5Gcreate2(file1, "/ext_link/group", H5P_DEFAULT, H5P_DEFAULT, gapl); }
+ H5E_BEGIN_TRY
+ {
+ group = H5Gcreate2(file1, "/ext_link/group", H5P_DEFAULT, H5P_DEFAULT, gapl);
+ }
H5E_END_TRY;
if (group != FAIL)
TEST_ERROR
@@ -4584,25 +4632,40 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
TEST_ERROR
/* Attempt to set invalid flags on gapl */
- H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_TRUNC); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_TRUNC);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_EXCL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_EXCL);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_CREAT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_CREAT);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
/* SWMR reader with write access */
- H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR | H5F_ACC_SWMR_READ); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR | H5F_ACC_SWMR_READ);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
/* SWMR writer with read-only access */
- H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE);
+ }
H5E_END_TRY;
if (ret != FAIL)
TEST_ERROR
@@ -4715,19 +4778,31 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
} /* end if */
/* Verify that H5Fcreate and H5Fopen reject H5F_ACC_DEFAULT */
- H5E_BEGIN_TRY { file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
+ }
H5E_END_TRY;
if (file1 != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { file1 = H5Fcreate(filename1, H5F_ACC_TRUNC | H5F_ACC_DEFAULT, H5P_DEFAULT, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file1 = H5Fcreate(filename1, H5F_ACC_TRUNC | H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
+ }
H5E_END_TRY;
if (file1 != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { file1 = H5Fopen(filename1, H5F_ACC_DEFAULT, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file1 = H5Fopen(filename1, H5F_ACC_DEFAULT, fapl);
+ }
H5E_END_TRY;
if (file1 != FAIL)
TEST_ERROR
- H5E_BEGIN_TRY { file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_DEFAULT, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_DEFAULT, fapl);
+ }
H5E_END_TRY;
if (file1 != FAIL)
TEST_ERROR
@@ -4908,7 +4983,10 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
op_data.code = 1;
/* Attempt to reopen group2 (should fail) */
- H5E_BEGIN_TRY { group = H5Gopen2(file1, "/group1/ext_link/group2", gapl); }
+ H5E_BEGIN_TRY
+ {
+ group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
+ }
H5E_END_TRY;
if (group != FAIL)
TEST_ERROR
@@ -4917,7 +4995,10 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
op_data.code = 2;
/* Attempt to reopen group2 (should fail) */
- H5E_BEGIN_TRY { group = H5Gopen2(file1, "/group1/ext_link/group2", gapl); }
+ H5E_BEGIN_TRY
+ {
+ group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
+ }
H5E_END_TRY;
if (group != FAIL)
TEST_ERROR
@@ -5002,7 +5083,10 @@ external_reset_register(void)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return FAIL;
} /* end external_reset_register() */
@@ -5071,7 +5155,10 @@ external_link_win1(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via main file's CWD*/
@@ -5165,7 +5252,10 @@ external_link_win2(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file directly */
@@ -5256,7 +5346,10 @@ external_link_win3(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file directly */
@@ -5344,7 +5437,10 @@ external_link_win4(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via main file's absolute drive/relative path */
@@ -5442,7 +5538,10 @@ external_link_win5(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via main file's rel drive/abs path */
@@ -5537,7 +5636,10 @@ external_link_win6(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via target file's rel path in current drive */
@@ -5629,7 +5731,10 @@ external_link_win7(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via main file's local host/main drive*/
@@ -5726,7 +5831,10 @@ external_link_win8(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file directly */
@@ -5818,7 +5926,10 @@ external_link_win9(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* should be able to find the target file via main file's local host/main drive*/
@@ -5890,7 +6001,10 @@ external_link_recursive(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through dangling file external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "recursive", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "recursive", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -7731,7 +7845,10 @@ external_dont_fail_to_source(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Attempt to open the object the link points to. This should fail */
- H5E_BEGIN_TRY { oid = H5Oopen(fid, "link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ oid = H5Oopen(fid, "link", H5P_DEFAULT);
+ }
H5E_END_TRY
if (oid >= 0)
FAIL_PUTS_ERROR("Succeeded in opening target of invalid external link")
@@ -10110,7 +10227,10 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Try opening through what is now too many soft links */
- H5E_BEGIN_TRY { gid = H5Oopen(fid, "soft5", plist); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Oopen(fid, "soft5", plist);
+ }
H5E_END_TRY;
if (gid >= 0) {
H5_FAILED();
@@ -10433,7 +10553,10 @@ check_all_closed(hid_t fapl, hbool_t new_format, int stopat)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return FAIL;
} /* end check_all_closed() */
@@ -10559,7 +10682,10 @@ build_visit_file(hid_t fapl)
return (fid);
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return FAIL;
} /* end build_visit_file() */
@@ -11026,7 +11152,10 @@ obj_visit_stop(hid_t fapl, hbool_t new_format)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return FAIL;
} /* end obj_visit_stop() */
@@ -11536,7 +11665,10 @@ obj_exists(hid_t fapl, hbool_t new_format)
/* Hard links */
/* Verify that H5Oexists_by_name() fails for non-existent link in root group */
- H5E_BEGIN_TRY { status = H5Oexists_by_name(fid, "foo", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Oexists_by_name(fid, "foo", H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
TEST_ERROR
@@ -11552,7 +11684,10 @@ obj_exists(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Verify that H5Oexists_by_name() fails for non-existent link in non-root group */
- H5E_BEGIN_TRY { status = H5Oexists_by_name(fid, "group/foo", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Oexists_by_name(fid, "group/foo", H5P_DEFAULT);
+ }
H5E_END_TRY
if (status >= 0)
TEST_ERROR
@@ -11866,7 +12001,10 @@ corder_create_empty(hid_t fapl)
TEST_ERROR
/* Setting invalid combination of a group order creation order indexing on should fail */
- H5E_BEGIN_TRY { ret = H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_INDEXED); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_INDEXED);
+ }
H5E_END_TRY;
if (ret > 0) {
H5_FAILED();
@@ -14290,7 +14428,10 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
/* Check for iteration routine indicating failure */
skip = 0;
- H5E_BEGIN_TRY { ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_fail_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_fail_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -14453,7 +14594,10 @@ link_iterate(hid_t fapl)
/* Check for out of bound iteration on compact group */
skip = (hsize_t)u;
- H5E_BEGIN_TRY { ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -14483,7 +14627,10 @@ link_iterate(hid_t fapl)
/* Check for out of bound iteration on dense group */
skip = (hsize_t)u;
- H5E_BEGIN_TRY { ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -14774,20 +14921,29 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
/* Check for iteration routine indicating failure */
skip = 0;
- H5E_BEGIN_TRY { ret = H5Literate(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
/* Check for iteration w/bad location ID */
skip = 0;
- H5E_BEGIN_TRY { ret = H5Literate((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
#ifndef H5_NO_DEPRECATED_SYMBOLS
- H5E_BEGIN_TRY { ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_cb, iter_info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_cb, iter_info);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -14877,7 +15033,10 @@ link_iterate_old(hid_t fapl)
/* Check for out of bound iteration on old-style group */
skip = (hsize_t)u;
- H5E_BEGIN_TRY { ret = H5Literate(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, NULL);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -15361,7 +15520,10 @@ open_by_idx_old(hid_t fapl)
TEST_ERROR
/* Try to open on object in an empty group */
- H5E_BEGIN_TRY { ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -15397,7 +15559,10 @@ open_by_idx_old(hid_t fapl)
TEST_ERROR
/* Check for out of bound open by index */
- H5E_BEGIN_TRY { ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
diff --git a/test/links_env.c b/test/links_env.c
index 58d39a3..aca84dd 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -106,7 +106,10 @@ external_link_env(hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Open object through external link */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
+ }
H5E_END_TRY;
/* Should be able to find the target file from pathnames set via HDF5_EXT_PREFIX */
diff --git a/test/mf.c b/test/mf.c
index 51bf06b..1483621 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -931,17 +931,26 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Reading & writing with a temporary address value should fail */
- H5E_BEGIN_TRY { status = H5F_block_read(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf); }
+ H5E_BEGIN_TRY
+ {
+ status = H5F_block_read(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR
- H5E_BEGIN_TRY { status = H5F_block_write(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf); }
+ H5E_BEGIN_TRY
+ {
+ status = H5F_block_write(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR
/* Freeing a temporary address value should fail */
- H5E_BEGIN_TRY { status = H5MF_xfree(f, H5FD_MEM_SUPER, tmp_addr, (hsize_t)TBLOCK_SIZE30); }
+ H5E_BEGIN_TRY
+ {
+ status = H5MF_xfree(f, H5FD_MEM_SUPER, tmp_addr, (hsize_t)TBLOCK_SIZE30);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR
@@ -979,13 +988,19 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Test that pushing temporary space allocation into normal space fails */
- H5E_BEGIN_TRY { check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3)); }
+ H5E_BEGIN_TRY
+ {
+ check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3));
+ }
H5E_END_TRY;
if (H5F_addr_defined(check_addr))
TEST_ERROR
/* Test that pushing normal space allocation into temporary space fails */
- H5E_BEGIN_TRY { check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3)); }
+ H5E_BEGIN_TRY
+ {
+ check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3));
+ }
H5E_END_TRY;
if (H5F_addr_defined(check_addr))
TEST_ERROR
@@ -1016,7 +1031,10 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_tmp() */
@@ -2126,7 +2144,10 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_fs_absorb() */
@@ -2411,7 +2432,10 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc2() */
@@ -2574,7 +2598,10 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc3() */
@@ -2739,7 +2766,10 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc4() */
@@ -2862,7 +2892,10 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc5() */
@@ -3022,7 +3055,10 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc6() */
@@ -3211,7 +3247,10 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_alloc7() */
@@ -3507,7 +3546,10 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_extend() */
@@ -3744,7 +3786,10 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_aggr_absorb() */
@@ -4032,7 +4077,10 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_eoa() */
@@ -4323,7 +4371,10 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_fs() */
@@ -4595,7 +4646,10 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_alloc1() */
@@ -4885,7 +4939,10 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_alloc2() */
@@ -5267,7 +5324,10 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_alloc3() */
@@ -5479,7 +5539,10 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_alloc4() */
@@ -5705,7 +5768,10 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_align_alloc5() */
@@ -6016,7 +6082,10 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return 1;
} /* test_mf_align_alloc6() */
@@ -6185,7 +6254,10 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_mf_bug1() */
@@ -7651,7 +7723,10 @@ test_dichotomy(hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return (1);
} /* test_dichotomy() */
@@ -8562,7 +8637,10 @@ test_page_large(const char *env_h5_drvr, hid_t fapl)
return (0);
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return (1);
diff --git a/test/mount.c b/test/mount.c
index ddb926d..1841889 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -96,7 +96,10 @@ setup(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return -1;
} /* end setup() */
@@ -197,7 +200,10 @@ test_illegal(hid_t fapl)
FAIL_STACK_ERROR
/* Try mounting a file on itself */
- H5E_BEGIN_TRY { status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -214,7 +220,10 @@ test_illegal(hid_t fapl)
FAIL_STACK_ERROR
if (H5Fmount(mnt, ".", file2, H5P_DEFAULT) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Fmount(mnt, ".", file3, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(mnt, ".", file3, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -236,7 +245,10 @@ test_illegal(hid_t fapl)
FAIL_STACK_ERROR
if (H5Fmount(mnt, ".", file3, H5P_DEFAULT) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -251,7 +263,10 @@ test_illegal(hid_t fapl)
/* Try to create a "weak" cycle */
if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -353,7 +368,10 @@ test_samefile(hid_t fapl)
FAIL_STACK_ERROR
if (!grp_info.mounted)
FAIL_PUTS_ERROR(" Group should have 'mounted' flag set.")
- H5E_BEGIN_TRY { status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Mounting different files at one mount point should have failed.")
@@ -389,7 +407,10 @@ test_samefile(hid_t fapl)
FAIL_STACK_ERROR
if (!grp_info.mounted)
FAIL_PUTS_ERROR(" Group should have 'mounted' flag set.")
- H5E_BEGIN_TRY { status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Mounting same files at one mount point should have failed.")
@@ -469,7 +490,10 @@ test_hide(hid_t fapl)
FAIL_STACK_ERROR
/* Original names under file1:/mnt1 should not be accessible */
- H5E_BEGIN_TRY { grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (grp >= 0) {
H5_FAILED();
@@ -931,7 +955,10 @@ test_unlink(hid_t fapl)
FAIL_STACK_ERROR
if (H5Oget_info_by_name2(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -949,7 +976,10 @@ test_unlink(hid_t fapl)
*/
if (H5Oget_info_by_name2(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -972,14 +1002,20 @@ test_unlink(hid_t fapl)
* the mount point because the name doesn't exist anymore. We must
* supply the mount point directly.
*/
- H5E_BEGIN_TRY { status = H5Funmount(file1, "/mnt_unlink"); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Funmount(file1, "/mnt_unlink");
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__);
TEST_ERROR
} /* end if */
- H5E_BEGIN_TRY { status = H5Funmount(file2, "/"); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Funmount(file2, "/");
+ }
H5E_END_TRY;
if (status >= 0) {
H5_FAILED();
@@ -2385,7 +2421,10 @@ test_fcdegree_same(hid_t fapl)
TEST_ERROR
/* Try mounting file with different file close degree (should fail) */
- H5E_BEGIN_TRY { ret = H5Fmount(gidA, ".", fid2, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fmount(gidA, ".", fid2, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2538,7 +2577,10 @@ test_fcdegree_semi(hid_t fapl)
TEST_ERROR
/* Try closing file #2 (should fail, since there are still objects open) */
- H5E_BEGIN_TRY { ret = H5Fclose(fid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fclose(fid2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2548,7 +2590,10 @@ test_fcdegree_semi(hid_t fapl)
TEST_ERROR
/* Try closing file #2 (should still fail, since there are still objects open in child file) */
- H5E_BEGIN_TRY { ret = H5Fclose(fid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fclose(fid2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2686,11 +2731,17 @@ test_fcdegree_strong(hid_t fapl)
TEST_ERROR
/* Check that objects are closed */
- H5E_BEGIN_TRY { ret = H5Oget_info2(gidA, &oinfo, H5O_INFO_BASIC); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oget_info2(gidA, &oinfo, H5O_INFO_BASIC);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5Oget_info2(gidAM, &oinfo, H5O_INFO_BASIC); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oget_info2(gidAM, &oinfo, H5O_INFO_BASIC);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2824,11 +2875,17 @@ test_acc_perm(hid_t fapl)
TEST_ERROR
/* Attempt to create objects in read only file (should fail) */
- H5E_BEGIN_TRY { bad_id = H5Gcreate2(gidAM, "Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ bad_id = H5Gcreate2(gidAM, "Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (bad_id >= 0)
TEST_ERROR
- H5E_BEGIN_TRY { bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (bad_id >= 0)
TEST_ERROR
@@ -2868,7 +2925,10 @@ test_acc_perm(hid_t fapl)
TEST_ERROR
/* Attempt to create objects in read only file again (should fail) */
- H5E_BEGIN_TRY { bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (bad_id >= 0)
TEST_ERROR
@@ -3267,7 +3327,10 @@ test_nested_survive(hid_t fapl)
TEST_ERROR
/* Open object in file #3 through file #1 mount path (should fail) */
- H5E_BEGIN_TRY { gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gidAMS >= 0)
TEST_ERROR
@@ -3781,7 +3844,10 @@ test_cut_graph(hid_t fapl)
TEST_ERROR
/* Attempt to open an object in file #4, from file #1 */
- H5E_BEGIN_TRY { gidK = H5Gopen2(gidQ, "/A/D/K", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gidK = H5Gopen2(gidQ, "/A/D/K", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gidK >= 0)
TEST_ERROR
@@ -3801,7 +3867,10 @@ test_cut_graph(hid_t fapl)
TEST_ERROR
/* Attempt to open an object in file #6, from file #5 */
- H5E_BEGIN_TRY { gidO = H5Gopen2(gidM, "/B/H/O", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gidO = H5Gopen2(gidM, "/B/H/O", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gidO >= 0)
TEST_ERROR
@@ -4012,7 +4081,10 @@ test_symlink(hid_t fapl)
TEST_ERROR
/* Attempt to open an object in file #3 (should fail) */
- H5E_BEGIN_TRY { gidL = H5Gopen2(fid1, "L", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gidL = H5Gopen2(fid1, "L", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (gidL >= 0)
TEST_ERROR
diff --git a/test/objcopy.c b/test/objcopy.c
index 6c09e70..a1ca06b 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -1703,7 +1703,9 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags)
return TRUE;
error:
- H5E_BEGIN_TRY {}
+ H5E_BEGIN_TRY
+ {
+ }
H5E_END_TRY;
return FALSE;
} /* end compare_groups() */
@@ -2500,7 +2502,10 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl_dst, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl_dst, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
diff --git a/test/ohdr.c b/test/ohdr.c
index c2fa950..0fb75bb 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -295,7 +295,10 @@ test_ohdr_cache(char *filename, hid_t fapl)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
return FAIL;
@@ -548,7 +551,10 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
TESTING("object in r/o file with unknown header message & 'fail if unknown always' flag set");
/* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
- H5E_BEGIN_TRY { did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did >= 0) {
H5Dclose(did);
@@ -712,7 +718,10 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
/* Attempt to open the dataset with the unknown header message, and "fail if unknown and open for write"
* flag */
- H5E_BEGIN_TRY { did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did >= 0) {
H5Dclose(did);
@@ -724,7 +733,10 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
TESTING("object in r/w file with unknown header message & 'fail if unknown always' flag set");
/* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
- H5E_BEGIN_TRY { did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did >= 0) {
H5Dclose(did);
@@ -1773,7 +1785,10 @@ main(void)
char msg[80]; /* Message for file format version */
/* Set version bounds before opening the file */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -1966,7 +1981,10 @@ main(void)
if (ro != time_new)
TEST_ERROR
time_new = 33333333;
- H5E_BEGIN_TRY { ret = H5O_msg_write(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5O_msg_write(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2049,7 +2067,10 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
- H5E_BEGIN_TRY { H5Fclose(file); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/page_buffer.c b/test/page_buffer.c
index b555d2c..e493479 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -407,7 +407,10 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
if (H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0)
TEST_ERROR;
- H5E_BEGIN_TRY { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
if (file_id >= 0)
@@ -425,7 +428,10 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
if (H5Pset_page_buffer_size(fapl, 511, 0, 0) < 0)
TEST_ERROR;
- H5E_BEGIN_TRY { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
if (file_id >= 0)
@@ -434,7 +440,10 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
/* Test setting a page buffer with sum of min meta and raw
* data percentage > 100 - should fail
*/
- H5E_BEGIN_TRY { ret = H5Pset_page_buffer_size(fapl, 512, 50, 51); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_page_buffer_size(fapl, 512, 50, 51);
+ }
H5E_END_TRY;
if (ret >= 0)
@@ -2053,7 +2062,10 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
FAIL_STACK_ERROR;
/* try to create the file -- should fail */
- H5E_BEGIN_TRY { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
if (file_id >= 0)
@@ -2082,7 +2094,10 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
/* try to open the file using the fapl prepared above which enables
* page buffering. Should fail.
*/
- H5E_BEGIN_TRY { file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
if (file_id >= 0)
@@ -2194,7 +2209,10 @@ main(void)
error:
HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
if (api_ctx_pushed)
diff --git a/test/reserved.c b/test/reserved.c
index 1286893..1ea73a6 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -65,7 +65,10 @@ rsrv_heap(void)
* should throw an error.
*/
for (i = 0; i < 200; i++) {
- H5E_BEGIN_TRY { dataspace_id = H5Screate_simple(1, dims, dims); }
+ H5E_BEGIN_TRY
+ {
+ dataspace_id = H5Screate_simple(1, dims, dims);
+ }
H5E_END_TRY
HDsprintf(dset_name, "Dset %d", i);
@@ -80,7 +83,10 @@ rsrv_heap(void)
if (dataset_id < 0)
break;
- H5E_BEGIN_TRY { H5Dwrite(dataset_id, H5T_NATIVE_INT, dataspace_id, dataspace_id, H5P_DEFAULT, &i); }
+ H5E_BEGIN_TRY
+ {
+ H5Dwrite(dataset_id, H5T_NATIVE_INT, dataspace_id, dataspace_id, H5P_DEFAULT, &i);
+ }
H5E_END_TRY
if (H5Dclose(dataset_id) < 0)
diff --git a/test/ros3.c b/test/ros3.c
index 42fc904..aae2dd2 100644
--- a/test/ros3.c
+++ b/test/ros3.c
@@ -613,7 +613,10 @@ error:
***********/
if (fapl_id < 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
return 1;
@@ -687,7 +690,10 @@ test_ros3_fapl(void)
return 0;
error:
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
return 1;
@@ -855,7 +861,10 @@ test_vfd_open(void)
else if (T.which_fapl == FAPL_ROS3_ANON)
_fapl_id = fapl_id;
- H5E_BEGIN_TRY { fd = H5FDopen(T.url, T.flags, _fapl_id, T.maxaddr); }
+ H5E_BEGIN_TRY
+ {
+ fd = H5FDopen(T.url, T.flags, _fapl_id, T.maxaddr);
+ }
H5E_END_TRY;
if (NULL != fd)
JSVERIFY(1, 0, T.message); /* wrapper to print message and fail */
@@ -896,11 +905,17 @@ error:
(void)H5FDclose(fd);
}
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
if (fapl_file_access >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_file_access); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_file_access);
+ }
H5E_END_TRY;
}
if (curl_ready == TRUE) {
@@ -1031,7 +1046,10 @@ error:
if (TRUE == curl_ready)
curl_global_cleanup();
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1126,7 +1144,10 @@ error:
(void)H5FDclose(file_shakespeare);
}
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1326,7 +1347,10 @@ error:
if (file_raven)
(void)H5FDclose(file_raven);
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1445,7 +1469,10 @@ error:
***********/
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
if (file) {
@@ -1576,7 +1603,10 @@ error:
if (TRUE == curl_ready)
curl_global_cleanup();
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
@@ -1682,7 +1712,10 @@ error:
fflush(stdout);
if (fapl_id >= 0) {
- H5E_BEGIN_TRY { (void)H5Pclose(fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ (void)H5Pclose(fapl_id);
+ }
H5E_END_TRY;
}
if (file > 0)
diff --git a/test/set_extent.c b/test/set_extent.c
index 9743728..3927408 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -388,7 +388,10 @@ do_ranks(hid_t fapl, hbool_t new_format)
return 0;
error:
- H5E_BEGIN_TRY { H5Pclose(dcpl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dcpl);
+ }
H5E_END_TRY
return -1;
@@ -414,7 +417,10 @@ do_layouts(hid_t fapl)
new_fapl = H5Pcopy(fapl);
/* Set version bounds */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -440,7 +446,10 @@ do_layouts(hid_t fapl)
return 0;
error:
- H5E_BEGIN_TRY { H5Pclose(new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(new_fapl);
+ }
H5E_END_TRY;
return -1;
}
@@ -2075,7 +2084,10 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
*-------------------------------------------------------------------------
*/
- H5E_BEGIN_TRY { ret = H5Dset_extent(did, dims_e); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dset_extent(did, dims_e);
+ }
H5E_END_TRY;
if (ret >= 0)
@@ -2121,7 +2133,10 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
*-------------------------------------------------------------------------
*/
- H5E_BEGIN_TRY { ret = H5Dset_extent(did, dims_s); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dset_extent(did, dims_s);
+ }
H5E_END_TRY;
if (ret >= 0)
diff --git a/test/stab.c b/test/stab.c
index 4a0d589..2ac0b1c 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -148,12 +148,18 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
TEST_ERROR
/* Check that creating groups with no-op names isn't allowed */
- H5E_BEGIN_TRY { g1 = H5Gcreate2(fid, "/", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ g1 = H5Gcreate2(fid, "/", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY
if (g1 >= 0)
TEST_ERROR
- H5E_BEGIN_TRY { g1 = H5Gcreate2(fid, "./././", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ g1 = H5Gcreate2(fid, "./././", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY
if (g1 >= 0)
TEST_ERROR
@@ -1358,7 +1364,10 @@ corrupt_stab_msg(void)
TEST_ERROR
/* Verify that an error is thrown when we try to access the dataset */
- H5E_BEGIN_TRY { did = H5Dopen2(fid, CORRUPT_STAB_DSET, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(fid, CORRUPT_STAB_DSET, H5P_DEFAULT);
+ }
H5E_END_TRY
if (did >= 0)
TEST_ERROR
diff --git a/test/swmr.c b/test/swmr.c
index 6112b86..0764ae4 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -162,7 +162,10 @@ test_metadata_read_attempts(hid_t in_fapl)
TEST_ERROR
/* Set the # of read attempts to 0--should fail */
- H5E_BEGIN_TRY { ret = H5Pset_metadata_read_attempts(fapl, 0); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_metadata_read_attempts(fapl, 0);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1648,7 +1651,10 @@ test_start_swmr_write(hid_t in_fapl, hbool_t new_format)
/* Should fail to enable SWMR for non-latest-format */
/* Should succeed in enabling SWMR for latest format */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (new_format) {
if (ret < 0)
@@ -1973,7 +1979,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
fid = H5Fcreate(filename, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl);
/* Should fail to enable SWMR writing when the file is already in SWMR writing mode */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -1996,7 +2005,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing when there is an opened named datatype */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2020,7 +2032,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
TEST_ERROR
/* Should fail to enable SWMR writing because the file's superblock version is not at least 3 */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2046,7 +2061,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing when the file is already in SWMR writing mode */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2062,7 +2080,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing when the file is opened with read only access */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2078,7 +2099,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing when the file is opened with SWMR read access only */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2108,7 +2132,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing when there are opened named datatype and attribute */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2118,7 +2145,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Still fail to enable SWMR writing when the attribute is still opened */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2163,7 +2193,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
TEST_ERROR
/* Should fail for a second call to enable SWMR writing mode */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2187,7 +2220,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing mode for fid2 */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2213,7 +2249,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
TEST_ERROR
/* Should fail to enable SWMR writing for fid2 */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid2);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2240,7 +2279,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
/* Should fail to open the file with SWMR write + latest format due to superblock version not at least
* 3 */
- H5E_BEGIN_TRY { bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, new_fapl);
+ }
H5E_END_TRY;
if (bad_fid >= 0)
TEST_ERROR
@@ -2249,7 +2291,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
/* Should fail to open the file with SWMR write + non-latest-format due to superblock version not at
* least 3 */
- H5E_BEGIN_TRY { bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (bad_fid >= 0)
TEST_ERROR
@@ -2261,7 +2306,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing due to superblock version not at least 3 */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2276,7 +2324,10 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Should fail to enable SWMR writing because the file's superblock version is not at least 3 */
- H5E_BEGIN_TRY { ret = H5Fstart_swmr_write(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fstart_swmr_write(fid);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -2731,7 +2782,10 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
}
/* Should fail in opening the test file */
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -2804,7 +2858,10 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
}
/* Should fail in opening the test file */
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -2881,7 +2938,10 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
}
/* Should fail in opening the test file */
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -3169,7 +3229,10 @@ test_object_flush_cb(hid_t in_fapl)
* To verify the failure condition in setting object flush property
*/
/* Should fail if the callback function is not defined but user data is defined */
- H5E_BEGIN_TRY { ret = H5Pset_object_flush_cb(fapl, NULL, &flush_ct); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_object_flush_cb(fapl, NULL, &flush_ct);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -3470,19 +3533,28 @@ test_append_flush_generic(void)
FAIL_STACK_ERROR
/* Invalid dataset rank: zero value */
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, 0, NULL, NULL, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, 0, NULL, NULL, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
/* Invalid dataset rank: > H5S_MAX_RANK */
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, H5S_MAX_RANK + 1, NULL, NULL, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, H5S_MAX_RANK + 1, NULL, NULL, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
/* No boundary specified */
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, 2, NULL, NULL, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, 2, NULL, NULL, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -3492,7 +3564,10 @@ test_append_flush_generic(void)
boundary[1] = 1;
/* Undefined callback function but defined user data */
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, 2, boundary, NULL, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, 2, boundary, NULL, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -3500,7 +3575,10 @@ test_append_flush_generic(void)
/* Invalid boundary size: negative value */
boundary[0] = (hsize_t)-1;
boundary[1] = 1;
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -3508,7 +3586,10 @@ test_append_flush_generic(void)
/* Invalid boundary size: H5S_UNLIMITED */
boundary[0] = 1;
boundary[1] = H5S_UNLIMITED;
- H5E_BEGIN_TRY { ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count);
+ }
H5E_END_TRY;
if (ret >= 0)
TEST_ERROR
@@ -3551,7 +3632,10 @@ test_append_flush_generic(void)
return 0;
error:
- H5E_BEGIN_TRY { H5Pclose(dapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(dapl);
+ }
H5E_END_TRY;
return -1;
@@ -3669,7 +3753,10 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
FAIL_STACK_ERROR
/* Should fail to Create the dataset */
- H5E_BEGIN_TRY { did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl); }
+ H5E_BEGIN_TRY
+ {
+ did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl);
+ }
H5E_END_TRY;
if (did2 >= 0)
TEST_ERROR
@@ -3680,7 +3767,10 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
FAIL_STACK_ERROR
/* Should fail to create the dataset */
- H5E_BEGIN_TRY { did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl); }
+ H5E_BEGIN_TRY
+ {
+ did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl);
+ }
H5E_END_TRY;
if (did2 >= 0)
TEST_ERROR
@@ -3692,7 +3782,10 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
FAIL_STACK_ERROR;
/* Should fail to open the dataset */
- H5E_BEGIN_TRY { did2 = H5Dopen2(fid, "dataset2", dapl); }
+ H5E_BEGIN_TRY
+ {
+ did2 = H5Dopen2(fid, "dataset2", dapl);
+ }
H5E_END_TRY;
if (did2 >= 0)
TEST_ERROR
@@ -4331,7 +4424,10 @@ test_file_lock_same(hid_t in_fapl)
TEST_ERROR
/* Open file with RDWR should fail */
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4437,7 +4533,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
/*
* Case a: RDWR|SWRM_READ : should fail
*/
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
TEST_ERROR
@@ -4445,7 +4544,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
/*
* Case b: RDWR|SWMM_WRTE|SWMR_READ : should fail
*/
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
TEST_ERROR
@@ -4453,7 +4555,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
/*
* Case c: RDONLY|SWMM_WRITE : should fail
*/
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
TEST_ERROR
@@ -4461,7 +4566,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
/*
* Case d: RDONLY|SWMM_WRITE|SWMR_READ : should fail
*/
- H5E_BEGIN_TRY { fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
TEST_ERROR
@@ -4476,7 +4584,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
if ((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4569,7 +4680,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4584,7 +4698,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4631,7 +4748,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4646,7 +4766,10 @@ test_file_lock_swmr_same(hid_t in_fapl)
if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
if (fid2 >= 0)
TEST_ERROR
@@ -4757,7 +4880,10 @@ test_file_lock_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -4831,7 +4957,10 @@ test_file_lock_concur(hid_t in_fapl)
}
/* Opens the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -4906,7 +5035,10 @@ test_file_lock_concur(hid_t in_fapl)
}
/* Opens the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -4981,7 +5113,10 @@ test_file_lock_concur(hid_t in_fapl)
}
/* Opens the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY;
/* Should succeed */
@@ -5142,7 +5277,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5217,7 +5355,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5292,7 +5433,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5366,7 +5510,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5440,7 +5587,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
/* Should succeed */
@@ -5517,7 +5667,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5592,7 +5745,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5667,7 +5823,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5742,7 +5901,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
/* Should succeed */
@@ -5898,7 +6060,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
+ }
H5E_END_TRY;
/* Should fail */
@@ -5973,7 +6138,10 @@ test_file_lock_swmr_concur(hid_t in_fapl)
}
/* Open the test file */
- H5E_BEGIN_TRY { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); }
+ H5E_BEGIN_TRY
+ {
+ child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
+ }
H5E_END_TRY;
/* Should succeed */
@@ -6280,7 +6448,10 @@ test_different_lock_flags(hid_t in_fapl)
TEST_ERROR
/* Open the test file with different flags (should FAIL) */
- H5E_BEGIN_TRY { fid3 = H5Fopen(filename, H5F_ACC_RDWR, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ fid3 = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
+ }
H5E_END_TRY;
if (H5I_INVALID_HID != fid3)
FAIL_PUTS_ERROR("Should not have been able to open a file with different locking flags")
@@ -6348,7 +6519,10 @@ test_swmr_vfd_flag(void)
fid = -1;
h5_fixname(FILENAME[0], bad_fapl, filename, sizeof(filename));
- H5E_BEGIN_TRY { fid = H5Fcreate(filename, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, bad_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(filename, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, bad_fapl);
+ }
H5E_END_TRY;
if (fid >= 0)
TEST_ERROR;
diff --git a/test/tarray.c b/test/tarray.c
index 9842247..4fa4d1d 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -235,11 +235,17 @@ test_array_funcs(void)
ret = H5Tset_offset(type, (size_t)16);
CHECK(ret, FAIL, "H5Tset_offset");
- H5E_BEGIN_TRY { cset = H5Tget_cset(type); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(type);
+ }
H5E_END_TRY;
VERIFY(cset, FAIL, "H5Tget_cset");
- H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); }
+ H5E_BEGIN_TRY
+ {
+ strpad = H5Tget_strpad(type);
+ }
H5E_END_TRY;
VERIFY(strpad, FAIL, "H5Tget_strpad");
diff --git a/test/tcheck_version.c b/test/tcheck_version.c
index 49c86c2..bfc8daf 100644
--- a/test/tcheck_version.c
+++ b/test/tcheck_version.c
@@ -29,6 +29,10 @@
#include "h5test.h"
+#ifdef H5_HAVE_WIN32_API
+#include <crtdbg.h>
+#endif
+
#define progname "tcheck_version"
/* prototypes */
@@ -108,12 +112,31 @@ abort_intercept(int H5_ATTR_UNUSED sig)
HDexit(6);
}
+#ifdef H5_HAVE_WIN32_API
+/* Turns off the modal dialog that is raised when the Windows CRT calls abort().
+ *
+ * Returning TRUE here lets Windows know that we've handled the abort() and that there
+ * is no need to alert the user with a modal dialog box.
+ */
+int
+handle_crt_abort(int reportType, char *message, int *returnValue)
+{
+ return TRUE;
+}
+#endif
+
int
main(int ac, char **av)
{
+#ifdef H5_HAVE_WIN32_API
+ (void)_CrtSetReportHook2(_CRT_RPTHOOK_INSTALL, handle_crt_abort);
+#endif
parse(ac, av);
HDsignal(SIGABRT, &abort_intercept);
H5check_version(major, minor, release);
HDsignal(SIGABRT, SIG_DFL);
+#ifdef H5_HAVE_WIN32_API
+ (void)_CrtSetReportHook2(_CRT_RPTHOOK_REMOVE, handle_crt_abort);
+#endif
return 0;
}
diff --git a/test/tfile.c b/test/tfile.c
index efbfc73..250fced 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -308,25 +308,46 @@ test_file_create(void)
CHECK(tmpl1, FAIL, "H5Pcreate");
/* Try setting some bad userblock sizes */
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE1);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE2);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE3); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE3);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE4); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE4);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE5); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE5);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE6); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE6);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
- H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE7); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE7);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_userblock");
@@ -1281,7 +1302,10 @@ test_get_file_id(void)
plist = H5Pcreate(H5P_FILE_ACCESS);
CHECK(plist, FAIL, "H5Pcreate");
- H5E_BEGIN_TRY { fid2 = H5Iget_file_id(plist); }
+ H5E_BEGIN_TRY
+ {
+ fid2 = H5Iget_file_id(plist);
+ }
H5E_END_TRY;
VERIFY(fid2, FAIL, "H5Iget_file_id");
@@ -1538,7 +1562,10 @@ test_file_perm2(void)
CHECK(filero, FAIL, "H5Fopen");
/* Create a group with the read-only file handle (should fail) */
- H5E_BEGIN_TRY { group = H5Gcreate2(filero, "MY_GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ group = H5Gcreate2(filero, "MY_GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(group, FAIL, "H5Gcreate2");
@@ -1551,7 +1578,10 @@ test_file_perm2(void)
VERIFY(dset, FAIL, "H5Dcreate2");
/* Create an attribute with the read-only file handle (should fail) */
- H5E_BEGIN_TRY { attr = H5Acreate2(filero, "MY_ATTR", H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ attr = H5Acreate2(filero, "MY_ATTR", H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(attr, FAIL, "H5Acreate2");
@@ -1559,7 +1589,10 @@ test_file_perm2(void)
CHECK(type, FAIL, "H5Tcopy");
/* Commit a datatype with the read-only file handle (should fail) */
- H5E_BEGIN_TRY { ret = H5Tcommit2(filero, "MY_DTYPE", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tcommit2(filero, "MY_DTYPE", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Tcommit2");
@@ -1685,22 +1718,34 @@ test_file_open_dot(void)
CHECK(sid, FAIL, "H5Screate");
/* Create a dataset with no name using the file ID */
- H5E_BEGIN_TRY { did = H5Dcreate2(fid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dcreate2(fid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(did, FAIL, "H5Dcreate2");
/* Create a dataset with no name using the group ID */
- H5E_BEGIN_TRY { did = H5Dcreate2(gid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dcreate2(gid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(did, FAIL, "H5Dcreate2");
/* Open a dataset with no name using the file ID */
- H5E_BEGIN_TRY { did = H5Dopen2(fid, ".", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(fid, ".", H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(did, FAIL, "H5Dopen2");
/* Open a dataset with no name using the group ID */
- H5E_BEGIN_TRY { did = H5Dopen2(gid, ".", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(gid, ".", H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(did, FAIL, "H5Dopen2");
@@ -1709,32 +1754,50 @@ test_file_open_dot(void)
CHECK(tid, FAIL, "H5Tcopy");
/* Create a named datatype with no name using the file ID */
- H5E_BEGIN_TRY { ret = H5Tcommit2(fid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tcommit2(fid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Tcommit2");
/* Create a named datatype with no name using the group ID */
- H5E_BEGIN_TRY { ret = H5Tcommit2(gid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tcommit2(gid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Tcommit2");
/* Open a named datatype with no name using the file ID */
- H5E_BEGIN_TRY { tid2 = H5Topen2(fid, ".", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tid2 = H5Topen2(fid, ".", H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tid2, FAIL, "H5Topen2");
/* Open a named datatype with no name using the group ID */
- H5E_BEGIN_TRY { tid2 = H5Topen2(gid, ".", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tid2 = H5Topen2(gid, ".", H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tid2, FAIL, "H5Topen2");
/* Create a group with no name using the file ID */
- H5E_BEGIN_TRY { gid2 = H5Gcreate2(fid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid2 = H5Gcreate2(fid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(gid2, FAIL, "H5Gcreate2");
/* Create a group with no name using the group ID */
- H5E_BEGIN_TRY { gid2 = H5Gcreate2(gid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid2 = H5Gcreate2(gid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(gid2, FAIL, "H5Gcreate2");
@@ -1900,7 +1963,10 @@ test_file_getname(void)
/* Try get file name from data space. Supposed to fail because
* it's illegal operation. */
- H5E_BEGIN_TRY { name_len = H5Fget_name(space_id, name, (size_t)TESTA_NAME_BUF_SIZE); }
+ H5E_BEGIN_TRY
+ {
+ name_len = H5Fget_name(space_id, name, (size_t)TESTA_NAME_BUF_SIZE);
+ }
H5E_END_TRY;
VERIFY(name_len, FAIL, "H5Fget_name");
@@ -3011,7 +3077,10 @@ test_userblock_alignment(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3041,7 +3110,10 @@ test_userblock_alignment(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3214,7 +3286,10 @@ test_userblock_alignment_paged(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3289,7 +3364,10 @@ test_userblock_alignment_paged(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3326,7 +3404,10 @@ test_userblock_alignment_paged(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3401,7 +3482,10 @@ test_userblock_alignment_paged(void)
CHECK(ret, FAIL, "H5Pset_alignment");
/* Create a file with FAPL & FCPL */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
VERIFY(fid, FAIL, "H5Fcreate");
@@ -3591,17 +3675,26 @@ test_filespace_info(const char *env_h5_drvr)
CHECK(fcpl, FAIL, "H5Pcreate");
/* Setting to 0: should fail */
- H5E_BEGIN_TRY { ret = H5Pset_file_space_page_size(fcpl, 0); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_file_space_page_size(fcpl, 0);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
/* Setting to 511: should fail */
- H5E_BEGIN_TRY { ret = H5Pset_file_space_page_size(fcpl, 511); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_file_space_page_size(fcpl, 511);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
/* Setting to 1GB+1: should fail */
- H5E_BEGIN_TRY { ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G + 1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G + 1);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
@@ -4991,13 +5084,19 @@ test_libver_bounds_open(void)
/* Attempt to open latest file with (earliest, v18), should fail */
ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_EARLIEST, H5F_LIBVER_V18);
- H5E_BEGIN_TRY { file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY;
VERIFY(file, FAIL, "Attempted to open latest file with earliest version");
/* Attempt to open latest file with (v18, v18), should fail */
ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_V18);
- H5E_BEGIN_TRY { file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl);
+ }
H5E_END_TRY;
VERIFY(file, FAIL, "Attempted to open latest file with v18 bounds");
@@ -5378,7 +5477,10 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n
herr_t ret; /* The return value */
/* Try to create the file */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE8, H5F_ACC_TRUNC | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE8, H5F_ACC_TRUNC | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl);
+ }
H5E_END_TRY;
/* Get the internal file pointer if the create succeeds */
@@ -5540,7 +5642,10 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
herr_t ret; /* Return value */
/* Create the file with the input fcpl and fapl */
- H5E_BEGIN_TRY { fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, fcpl, fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, fcpl, fapl);
+ }
H5E_END_TRY;
/* Retrieve the low/high bounds */
@@ -5571,7 +5676,10 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
/* Loop through all the combinations of low/high bounds in new_fapl */
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
/* Invalid combinations */
@@ -5750,14 +5858,20 @@ test_libver_bounds_obj(hid_t fapl)
object header version, then delete the group and close the file.*/
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid combinations */
continue;
/* Open the file */
- H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
+ }
H5E_END_TRY;
if (fid >= 0) { /* The file open succeeds */
@@ -5910,7 +6024,10 @@ test_libver_bounds_dataset(hid_t fapl)
CHECK(ret, FAIL, "H5Pset_chunk_opts");
/* Create the chunked dataset */
- H5E_BEGIN_TRY { did = H5Dcreate2(fid, DSETB, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dcreate2(fid, DSETB, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (did >= 0) {
@@ -5959,14 +6076,20 @@ test_libver_bounds_dataset(hid_t fapl)
/* Verify the dataset's layout, fill value and filter pipleline message versions */
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
continue;
/* Open the file */
- H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
+ }
H5E_END_TRY;
if (fid >= 0) { /* The file open succeeds */
@@ -6177,14 +6300,20 @@ test_libver_bounds_dataspace(hid_t fapl)
hid_t tmp_sid, tmp_sid_compact, tmp_sid_contig; /* Dataspace IDs */
H5S_t *tmp_space, *tmp_space_compact, *tmp_space_contig; /* Internal dataspace pointers */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
continue;
/* Open the file */
- H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
+ }
H5E_END_TRY;
if (fid >= 0) { /* The file open succeeds */
@@ -6501,14 +6630,20 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)
/* Also verify the committed atatype message version */
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
continue;
/* Open the file */
- H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
+ }
H5E_END_TRY;
if (fid >= 0) { /* The file open succeeds */
@@ -6821,14 +6956,20 @@ test_libver_bounds_attributes(hid_t fapl)
/* Verify the attribute version */
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(new_fapl, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
continue;
/* Open the file */
- H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
+ }
H5E_END_TRY;
if (fid >= 0) { /* The file open succeeds */
@@ -6982,7 +7123,10 @@ test_libver_macros2(void)
ret = H5Gunlink(file, "Group");
CHECK(ret, FAIL, "H5Gunlink");
- H5E_BEGIN_TRY { grp = H5Gopen(file, "Group"); }
+ H5E_BEGIN_TRY
+ {
+ grp = H5Gopen(file, "Group");
+ }
H5E_END_TRY;
VERIFY(grp, FAIL, "H5Gopen");
#endif
@@ -7218,17 +7362,26 @@ test_min_dset_ohdr(void)
*/
/* trying to set with invalid file ID */
- H5E_BEGIN_TRY { ret = H5Fset_dset_no_attrs_hint(-1, TRUE); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fset_dset_no_attrs_hint(-1, TRUE);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint");
/* trying to get with invalid file ID */
- H5E_BEGIN_TRY { ret = H5Fget_dset_no_attrs_hint(-1, &minimize); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fget_dset_no_attrs_hint(-1, &minimize);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint");
/* trying to get with invalid pointer */
- H5E_BEGIN_TRY { ret = H5Fget_dset_no_attrs_hint(file_id, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fget_dset_no_attrs_hint(file_id, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint");
diff --git a/test/th5o.c b/test/th5o.c
index f69ec0d..b6fe794 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -338,21 +338,30 @@ test_h5o_open_by_addr(void)
/* Try giving some bogus values to H5O_open_by_addr. */
/* Try to open an object with a bad address */
grp_addr += 20;
- H5E_BEGIN_TRY { grp = H5Oopen_by_addr(fid, grp_addr); }
+ H5E_BEGIN_TRY
+ {
+ grp = H5Oopen_by_addr(fid, grp_addr);
+ }
H5E_END_TRY
VERIFY(grp, FAIL, "H5Oopen_by_addr");
/* For instance, an objectno smaller than the end of the file's superblock should
* trigger an error */
grp_addr = 10;
- H5E_BEGIN_TRY { grp = H5Oopen_by_addr(fid, grp_addr); }
+ H5E_BEGIN_TRY
+ {
+ grp = H5Oopen_by_addr(fid, grp_addr);
+ }
H5E_END_TRY
VERIFY(grp, FAIL, "H5Oopen_by_addr");
/* Likewise, an objectno larger than the size of the file should fail */
grp_addr = 0;
grp_addr = 1000000000;
- H5E_BEGIN_TRY { grp = H5Oopen_by_addr(fid, grp_addr); }
+ H5E_BEGIN_TRY
+ {
+ grp = H5Oopen_by_addr(fid, grp_addr);
+ }
H5E_END_TRY
VERIFY(grp, FAIL, "H5Oopen_by_addr");
@@ -360,7 +369,10 @@ test_h5o_open_by_addr(void)
CHECK(ret, FAIL, "H5Fclose");
/* Also, trying to open an object without a valid location should fail */
- H5E_BEGIN_TRY { dtype = H5Oopen_by_addr(fid, dtype_addr); }
+ H5E_BEGIN_TRY
+ {
+ dtype = H5Oopen_by_addr(fid, dtype_addr);
+ }
H5E_END_TRY
VERIFY(dtype, FAIL, "H5Oopen_by_addr");
} /* test_h5o_open_by_addr() */
@@ -807,7 +819,10 @@ test_h5o_link(void)
for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Set version bounds */
- H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl_id, low, high); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_libver_bounds(fapl_id, low, high);
+ }
H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@@ -992,7 +1007,10 @@ test_h5o_comment(void)
CHECK(ret, FAIL, "H5Oset_comment");
/* Putting a comment on the dataspace. It's supposed to fail. */
- H5E_BEGIN_TRY { ret = H5Oset_comment(dspace, "dataspace comment"); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oset_comment(dspace, "dataspace comment");
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Oset_comment");
@@ -1161,7 +1179,10 @@ test_h5o_comment_by_name(void)
CHECK(ret, FAIL, "H5Oset_comment_by_name");
/* Putting a comment on the dataspace. It's supposed to fail. */
- H5E_BEGIN_TRY { ret = H5Oset_comment_by_name(dspace, ".", "dataspace comment", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oset_comment_by_name(dspace, ".", "dataspace comment", H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Oset_comment");
diff --git a/test/th5s.c b/test/th5s.c
index a4b443f..59bdffb 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -180,7 +180,10 @@ test_h5s_basic(void)
* Check to be sure we can't create a simple dataspace that has too many
* dimensions.
*/
- H5E_BEGIN_TRY { sid1 = H5Screate_simple(H5S_MAX_RANK + 1, dims3, NULL); }
+ H5E_BEGIN_TRY
+ {
+ sid1 = H5Screate_simple(H5S_MAX_RANK + 1, dims3, NULL);
+ }
H5E_END_TRY;
VERIFY(sid1, FAIL, "H5Screate_simple");
@@ -247,43 +250,70 @@ test_h5s_basic(void)
CHECK(dset1, FAIL, "H5Dcreate2");
/* Try some writes with the bad dataspace (sid1) */
- H5E_BEGIN_TRY { ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
- H5E_BEGIN_TRY { ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
- H5E_BEGIN_TRY { ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, sid1, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, sid1, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
/* Try to iterate using the bad dataspace */
- H5E_BEGIN_TRY { ret = H5Diterate(&n, H5T_NATIVE_INT, sid1, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Diterate(&n, H5T_NATIVE_INT, sid1, NULL, NULL);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Diterate");
/* Try to fill using the bad dataspace */
- H5E_BEGIN_TRY { ret = H5Dfill(NULL, H5T_NATIVE_INT, &n, H5T_NATIVE_INT, sid1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dfill(NULL, H5T_NATIVE_INT, &n, H5T_NATIVE_INT, sid1);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dfill");
/* Now use the bad dataspace as the space for an attribute */
- H5E_BEGIN_TRY { aid1 = H5Acreate2(dset1, BASICATTR, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ aid1 = H5Acreate2(dset1, BASICATTR, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY
VERIFY(aid1, FAIL, "H5Acreate2");
/* Make sure that dataspace reads using the bad dataspace fail */
- H5E_BEGIN_TRY { ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dread");
- H5E_BEGIN_TRY { ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dread");
- H5E_BEGIN_TRY { ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, sid1, H5P_DEFAULT, &n); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, sid1, H5P_DEFAULT, &n);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dread");
@@ -700,7 +730,10 @@ test_h5s_zero_dim(void)
ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL);
CHECK(ret, FAIL, "H5Sselect_hyperslab");
- H5E_BEGIN_TRY { ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dwrite");
@@ -716,7 +749,10 @@ test_h5s_zero_dim(void)
ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord);
CHECK(ret, FAIL, "H5Sselect_elements");
- H5E_BEGIN_TRY { ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dwrite");
@@ -813,7 +849,10 @@ test_h5s_zero_dim(void)
/* Now extend the first dimension size of the dataset to SPACE1_DIM1*3 past the maximal size.
* It is supposed to fail. */
extend_dims[0] = SPACE1_DIM1 * 3;
- H5E_BEGIN_TRY { ret = H5Dset_extent(dset1, extend_dims); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dset_extent(dset1, extend_dims);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dset_extent");
@@ -1198,7 +1237,10 @@ test_h5s_encode(void)
}
/* Try decoding bogus buffer */
- H5E_BEGIN_TRY { ret_id = H5Sdecode(sbuf); }
+ H5E_BEGIN_TRY
+ {
+ ret_id = H5Sdecode(sbuf);
+ }
H5E_END_TRY;
VERIFY(ret_id, FAIL, "H5Sdecode");
@@ -1354,7 +1396,10 @@ test_h5s_scalar_write(void)
CHECK(fid1, FAIL, "H5Fcreate");
/* Verify a non-zero rank fails with a NULL dimension. */
- H5E_BEGIN_TRY { sid1 = H5Screate_simple(SPACE1_RANK, NULL, NULL); }
+ H5E_BEGIN_TRY
+ {
+ sid1 = H5Screate_simple(SPACE1_RANK, NULL, NULL);
+ }
H5E_END_TRY
VERIFY(sid1, FAIL, "H5Screate_simple");
diff --git a/test/titerate.c b/test/titerate.c
index c681117..a0f763c 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -266,19 +266,28 @@ test_iter_group(hid_t fapl, hbool_t new_format)
/* Test invalid indices for starting iteration */
info.command = RET_ZERO;
idx = (hsize_t)-1;
- H5E_BEGIN_TRY { ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Literate");
/* Test skipping exactly as many entries as in the group */
idx = NDATASETS + 2;
- H5E_BEGIN_TRY { ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Literate");
/* Test skipping more entries than are in the group */
idx = NDATASETS + 3;
- H5E_BEGIN_TRY { ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Literate");
@@ -456,13 +465,19 @@ test_iter_attr(hid_t fapl, hbool_t new_format)
/* Test skipping exactly as many attributes as there are */
idx = NATTR;
- H5E_BEGIN_TRY { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Aiterate2");
/* Test skipping more attributes than there are */
idx = NATTR + 1;
- H5E_BEGIN_TRY { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Aiterate2");
diff --git a/test/tmisc.c b/test/tmisc.c
index 3b95c1a..2ccd49e 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1894,7 +1894,10 @@ test_misc11(void)
CHECK(ret, FAIL, "H5Pset_sizes");
/* This should fail as (32770*2) will exceed ^16 - 2 bytes for storing btree entries */
- H5E_BEGIN_TRY { ret = H5Pset_sym_k(fcpl, 32770, 0); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_sym_k(fcpl, 32770, 0);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_sym_k");
@@ -1902,7 +1905,10 @@ test_misc11(void)
CHECK(ret, FAIL, "H5Pset_sym_k");
/* This should fail as (32770*2) will exceed ^16 - 2 bytes for storing btree entries */
- H5E_BEGIN_TRY { ret = H5Pset_istore_k(fcpl, 32770); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_istore_k(fcpl, 32770);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pset_istore_k");
@@ -3110,7 +3116,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the file again (should fail) */
- H5E_BEGIN_TRY { ret = H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Fclose(fid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Fclose");
@@ -3141,7 +3150,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the property list again (should fail) */
- H5E_BEGIN_TRY { ret = H5Pclose(plid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pclose(plid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pclose");
@@ -3172,7 +3184,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the property class again (should fail) */
- H5E_BEGIN_TRY { ret = H5Pclose_class(pcid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pclose_class(pcid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Pclose_class");
@@ -3203,7 +3218,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the datatype again (should fail) */
- H5E_BEGIN_TRY { ret = H5Tclose(tid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Tclose(tid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Tclose");
@@ -3234,7 +3252,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the dataspace again (should fail) */
- H5E_BEGIN_TRY { ret = H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sclose(sid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sclose");
@@ -3273,7 +3294,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the dataset again (should fail) */
- H5E_BEGIN_TRY { ret = H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dclose(did);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dclose");
@@ -3324,7 +3348,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the attribute again (should fail) */
- H5E_BEGIN_TRY { ret = H5Aclose(aid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Aclose(aid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Aclose");
@@ -3371,7 +3398,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the group again (should fail) */
- H5E_BEGIN_TRY { ret = H5Gclose(gid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Gclose(gid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Gclose");
@@ -3406,7 +3436,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the error class again (should fail) */
- H5E_BEGIN_TRY { ret = H5Eunregister_class(ecid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Eunregister_class(ecid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Eunregister_class");
@@ -3441,7 +3474,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the error message again (should fail) */
- H5E_BEGIN_TRY { ret = H5Eclose_msg(emid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Eclose_msg(emid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Eclose_msg");
@@ -3476,7 +3512,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try closing the error stack again (should fail) */
- H5E_BEGIN_TRY { ret = H5Eclose_stack(esid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Eclose_stack(esid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Eclose_stack");
@@ -3511,7 +3550,10 @@ test_misc19(void)
VERIFY(rc, 0, "H5Idec_ref");
/* Try unregistering the VFD again (should fail) */
- H5E_BEGIN_TRY { ret = H5FDunregister(vfdid); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5FDunregister(vfdid);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5FDunregister");
@@ -3949,7 +3991,10 @@ test_misc23(void)
* test the old APIs
**********************************************************************/
- H5E_BEGIN_TRY { tmp_id = H5Gcreate1(file_id, "/A/B00a/grp", (size_t)0); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gcreate1(file_id, "/A/B00a/grp", (size_t)0);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gcreate1");
@@ -3959,7 +4004,10 @@ test_misc23(void)
status = H5Gclose(tmp_id);
CHECK(status, FAIL, "H5Gclose");
- H5E_BEGIN_TRY { tmp_id = H5Dcreate1(file_id, "/A/B00c/dset", type_id, space_id, create_id); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dcreate1(file_id, "/A/B00c/dset", type_id, space_id, create_id);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dcreate1");
@@ -4292,51 +4340,87 @@ test_misc24(void)
CHECK(ret, FAIL, "H5Tclose");
/* Attempt to open each kind of object with wrong API, including using soft links */
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
@@ -4345,19 +4429,31 @@ test_misc24(void)
group_id = H5Gopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
CHECK(group_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
@@ -4368,19 +4464,31 @@ test_misc24(void)
dset_id = H5Dopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
CHECK(dset_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Topen2");
@@ -4391,19 +4499,31 @@ test_misc24(void)
type_id = H5Topen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
CHECK(ret, FAIL, "H5Topen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Gopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
- H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(tmp_id, FAIL, "H5Dopen2");
@@ -4989,7 +5109,10 @@ test_misc27(void)
#ifdef H5_STRICT_FORMAT_CHECKS
/* Open group with incorrect # of object header messages (should fail) */
- H5E_BEGIN_TRY { gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(gid, FAIL, "H5Gopen2");
#else /* H5_STRICT_FORMAT_CHECKS */
@@ -5482,17 +5605,26 @@ test_misc33(void)
CHECK(fid, FAIL, "H5Fopen");
/* Case (1) */
- H5E_BEGIN_TRY { ret = H5Oget_info_by_name2(fid, "/soft_two", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oget_info_by_name2(fid, "/soft_two", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Oget_info_by_name");
/* Case (2) */
- H5E_BEGIN_TRY { ret = H5Oget_info_by_name2(fid, "/dsetA", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oget_info_by_name2(fid, "/dsetA", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Oget_info_by_name");
/* Case (3) */
- H5E_BEGIN_TRY { ret = H5Oget_info_by_name2(fid, "/soft_one", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Oget_info_by_name2(fid, "/soft_one", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Oget_info_by_name");
diff --git a/test/trefer.c b/test/trefer.c
index 4b9d47f..727e753 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -456,7 +456,10 @@ test_reference_obj(void)
/* Attempting to retrieve type of object using non-valid refs */
for (j = 0; j < 3; j++) {
- H5E_BEGIN_TRY { ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &nvrbuf[j], &obj_type); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &nvrbuf[j], &obj_type);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Rget_obj_type2");
} /* end for */
@@ -687,7 +690,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
VERIFY(hssize_ret, (hssize_t)H5S_UNLIMITED, "H5Sget_select_npoints");
/* Store third dataset region */
- H5E_BEGIN_TRY { ret = H5Rcreate(&wbuf[2], fid1, "/Dataset2", H5R_DATASET_REGION, sid2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Rcreate(&wbuf[2], fid1, "/Dataset2", H5R_DATASET_REGION, sid2);
+ }
H5E_END_TRY;
if (libver_high < H5F_LIBVER_V110)
@@ -700,7 +706,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
}
/* Store fourth dataset region */
- H5E_BEGIN_TRY { ret = H5Rcreate(&wbuf[3], fid1, "/Dataset3", H5R_DATASET_REGION, sid3); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Rcreate(&wbuf[3], fid1, "/Dataset3", H5R_DATASET_REGION, sid3);
+ }
H5E_END_TRY;
if (libver_high < H5F_LIBVER_V110)
@@ -778,7 +787,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
/*
* Dereference an undefined reference (should fail)
*/
- H5E_BEGIN_TRY { dset2 = H5Rdereference2(dset_NA, H5P_DEFAULT, H5R_DATASET_REGION, &rdata_NA[0]); }
+ H5E_BEGIN_TRY
+ {
+ dset2 = H5Rdereference2(dset_NA, H5P_DEFAULT, H5R_DATASET_REGION, &rdata_NA[0]);
+ }
H5E_END_TRY;
VERIFY(dset2, H5I_INVALID_HID, "H5Rdereference2");
@@ -788,7 +800,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
/* This close should fail since H5Rdereference2 never created
* the id of the referenced object. */
- H5E_BEGIN_TRY { ret = H5Dclose(dset2); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dclose(dset2);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dclose");
@@ -965,7 +980,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
/* Attempting to retrieve type of object using non-valid refs */
for (j = 0; j < 3; j++) {
- H5E_BEGIN_TRY { ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &nvrbuf[j], &obj_type); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &nvrbuf[j], &obj_type);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Rget_obj_type2");
} /* end for */
diff --git a/test/trefstr.c b/test/trefstr.c
index 049384f..0dcf621 100644
--- a/test/trefstr.c
+++ b/test/trefstr.c
@@ -265,7 +265,9 @@ test_refstr_wrap(void)
/* Get pointer to raw string in ref-counted string */
s = H5RS_get_str(rs);
CHECK_PTR(s, "H5RS_get_str");
- CHECK(s, buf, "wrapping");
+ if (s == buf)
+ TestErrPrintf("%d: Should not have gotten the same pointer from reference-counted string!\n",
+ __LINE__);
cmp = HDstrcmp(s, buf);
if (cmp <= 0)
TestErrPrintf("%d: string comparison incorrect!\n", __LINE__);
diff --git a/test/tselect.c b/test/tselect.c
index 49946fb..fd47d97 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -287,7 +287,10 @@ test_select_hyper(hid_t xfer_plist)
block[0] = 1;
block[1] = 1;
block[2] = 1;
- H5E_BEGIN_TRY { ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
@@ -304,7 +307,10 @@ test_select_hyper(hid_t xfer_plist)
block[0] = 2;
block[1] = 2;
block[2] = 2;
- H5E_BEGIN_TRY { ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
@@ -344,10 +350,16 @@ test_select_hyper(hid_t xfer_plist)
CHECK(ret, FAIL, "H5Dwrite");
/* Exercise checks for NULL buffer and valid selection */
- H5E_BEGIN_TRY { ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dwrite");
- H5E_BEGIN_TRY { ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dwrite");
@@ -388,10 +400,16 @@ test_select_hyper(hid_t xfer_plist)
CHECK(ret, FAIL, "H5Dread");
/* Exercise checks for NULL buffer and valid selection */
- H5E_BEGIN_TRY { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dread");
- H5E_BEGIN_TRY { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dread(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Dread");
@@ -5363,9 +5381,9 @@ test_select_hyper_union_3d(void)
/* Allocate write & read buffers */
wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3);
- CHECK(wbuf, NULL, "HDmalloc");
+ CHECK_PTR(wbuf, "HDmalloc");
rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE3_DIM1 * SPACE3_DIM2);
- CHECK(rbuf, NULL, "HDcalloc");
+ CHECK_PTR(rbuf, "HDcalloc");
/* Initialize write buffer */
for (i = 0, tbuf = wbuf; i < SPACE4_DIM1; i++)
@@ -8166,14 +8184,20 @@ test_scalar_select2(void)
/* Select one element in memory with a point selection */
coord1[0] = 0;
- H5E_BEGIN_TRY { ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)&coord1); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)&coord1);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sselect_elements");
/* Select one element in memory with a hyperslab selection */
start[0] = 0;
count[0] = 0;
- H5E_BEGIN_TRY { ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
@@ -13835,7 +13859,10 @@ test_select_bounds(void)
CHECK(ret, FAIL, "H5Sselect_none");
/* Get bounds for 'none' selection */
- H5E_BEGIN_TRY { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_select_bo unds");
@@ -13866,7 +13893,10 @@ test_select_bounds(void)
CHECK(ret, FAIL, "H5Soffset_simple");
/* Get bounds for hyperslab selection with negative offset */
- H5E_BEGIN_TRY { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_select_bounds");
@@ -13917,7 +13947,10 @@ test_select_bounds(void)
CHECK(ret, FAIL, "H5Soffset_simple");
/* Get bounds for hyperslab selection with negative offset */
- H5E_BEGIN_TRY { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_select_bounds");
@@ -13968,7 +14001,10 @@ test_select_bounds(void)
CHECK(ret, FAIL, "H5Soffset_simple");
/* Get bounds for hyperslab selection with negative offset */
- H5E_BEGIN_TRY { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_select_bounds");
@@ -14030,12 +14066,18 @@ test_hyper_regular(void)
CHECK(sid, FAIL, "H5Screate_simple");
/* Query if 'all' selection is regular hyperslab (should fail) */
- H5E_BEGIN_TRY { is_regular = H5Sis_regular_hyperslab(sid); }
+ H5E_BEGIN_TRY
+ {
+ is_regular = H5Sis_regular_hyperslab(sid);
+ }
H5E_END_TRY;
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
- H5E_BEGIN_TRY { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
@@ -14044,12 +14086,18 @@ test_hyper_regular(void)
CHECK(ret, FAIL, "H5Sselect_none");
/* Query if 'none' selection is regular hyperslab (should fail) */
- H5E_BEGIN_TRY { is_regular = H5Sis_regular_hyperslab(sid); }
+ H5E_BEGIN_TRY
+ {
+ is_regular = H5Sis_regular_hyperslab(sid);
+ }
H5E_END_TRY;
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
- H5E_BEGIN_TRY { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
@@ -14070,12 +14118,18 @@ test_hyper_regular(void)
CHECK(ret, FAIL, "H5Sselect_elements");
/* Query if 'point' selection is regular hyperslab (should fail) */
- H5E_BEGIN_TRY { is_regular = H5Sis_regular_hyperslab(sid); }
+ H5E_BEGIN_TRY
+ {
+ is_regular = H5Sis_regular_hyperslab(sid);
+ }
H5E_END_TRY;
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
- H5E_BEGIN_TRY { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
@@ -14130,7 +14184,10 @@ test_hyper_regular(void)
VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
- H5E_BEGIN_TRY { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
+ }
H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
diff --git a/test/tvltypes.c b/test/tvltypes.c
index bd19067..f8734b6 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -136,7 +136,10 @@ test_vltypes_dataset_create(void)
CHECK(ret, FAIL, "H5Pset_fill_time");
/* Create a dataset, supposed to fail */
- H5E_BEGIN_TRY { dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+ }
H5E_END_TRY;
VERIFY(dataset, FAIL, "H5Dcreate2");
@@ -202,11 +205,17 @@ test_vltypes_funcs(void)
ret = H5Tset_offset(type, (size_t)16);
CHECK(ret, FAIL, "H5Tset_offset");
- H5E_BEGIN_TRY { cset = H5Tget_cset(type); }
+ H5E_BEGIN_TRY
+ {
+ cset = H5Tget_cset(type);
+ }
H5E_END_TRY;
VERIFY(cset, FAIL, "H5Tget_cset");
- H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); }
+ H5E_BEGIN_TRY
+ {
+ strpad = H5Tget_strpad(type);
+ }
H5E_END_TRY;
VERIFY(strpad, FAIL, "H5Tget_strpad");
@@ -473,7 +482,10 @@ test_vltypes_vlen_atomic(void)
CHECK(ret, FAIL, "H5Dvlen_get_buf_size");
/* Try to call H5Dvlen_get_buf with bad dataspace */
- H5E_BEGIN_TRY { ret = H5Dvlen_get_buf_size(dataset, tid1, sid2, &size); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dvlen_get_buf_size(dataset, tid1, sid2, &size);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dvlen_get_buf_size");
@@ -507,7 +519,10 @@ test_vltypes_vlen_atomic(void)
/* Try to reclaim read data using "bad" dataspace with no extent
* Should fail */
- H5E_BEGIN_TRY { ret = H5Dvlen_reclaim(tid1, sid2, xfer_pid, rdata); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dvlen_reclaim(tid1, sid2, xfer_pid, rdata);
+ }
H5E_END_TRY
VERIFY(ret, FAIL, "H5Dvlen_reclaim");
diff --git a/test/unlink.c b/test/unlink.c
index dfd0010..f939bd6 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -117,7 +117,10 @@ test_one(hid_t file)
TESTING("unlink without a name");
if ((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR
- H5E_BEGIN_TRY { status = H5Ldelete(grp, ".", H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Ldelete(grp, ".", H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0)
FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed.")
@@ -287,7 +290,10 @@ test_symlink(hid_t file)
return 0;
error:
- H5E_BEGIN_TRY { H5Gclose(work); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(work);
+ }
H5E_END_TRY;
return 1;
} /* end test_symlink() */
@@ -1285,7 +1291,10 @@ test_filespace(hid_t fapl)
FAIL_STACK_ERROR
/* Create another group with same name */
- H5E_BEGIN_TRY { group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (group >= 0) {
H5Gclose(group);
@@ -1332,7 +1341,10 @@ test_filespace(hid_t fapl)
FAIL_STACK_ERROR
/* Create another named datatype with same name */
- H5E_BEGIN_TRY { status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (status >= 0)
TEST_ERROR
@@ -1786,12 +1798,18 @@ error:
/* Close any open groups */
for (n = 0; n < ngroups; n++)
if (gids[n]) {
- H5E_BEGIN_TRY { H5Gclose(gids[n]); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(gids[n]);
+ }
H5E_END_TRY;
} /* end if */
HDfree(gids);
} /* end if */
- H5E_BEGIN_TRY { H5Gclose(rootid); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(rootid);
+ }
H5E_END_TRY;
return 1;
@@ -1872,12 +1890,18 @@ error:
/* Close any open groups */
for (n = 0; n < ngroups; n++)
if (gids[n]) {
- H5E_BEGIN_TRY { H5Gclose(gids[n]); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(gids[n]);
+ }
H5E_END_TRY;
} /* end if */
HDfree(gids);
} /* end if */
- H5E_BEGIN_TRY { H5Gclose(rootid); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(rootid);
+ }
H5E_END_TRY;
return 1;
@@ -2244,12 +2268,18 @@ error:
/* Close any open groups */
for (n = 0; n < ngroups; n++)
if (gids[n]) {
- H5E_BEGIN_TRY { H5Gclose(gids[n]); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(gids[n]);
+ }
H5E_END_TRY;
} /* end if */
HDfree(gids);
} /* end if */
- H5E_BEGIN_TRY { H5Gclose(rootid); }
+ H5E_BEGIN_TRY
+ {
+ H5Gclose(rootid);
+ }
H5E_END_TRY;
return 1;
diff --git a/test/unregister.c b/test/unregister.c
index ebb63fa..c6da4df 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -148,7 +148,10 @@ test_unregister_filters(hid_t fapl_id)
goto error;
/* Unregister the filter before closing the group. It should fail */
- H5E_BEGIN_TRY { ret = H5Zunregister(H5Z_FILTER_DUMMY); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Zunregister(H5Z_FILTER_DUMMY);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
@@ -196,7 +199,10 @@ test_unregister_filters(hid_t fapl_id)
goto error;
/* Unregister the filter before closing the dataset. It should fail */
- H5E_BEGIN_TRY { ret = H5Zunregister(H5Z_FILTER_DUMMY); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Zunregister(H5Z_FILTER_DUMMY);
+ }
H5E_END_TRY;
if (ret >= 0) {
H5_FAILED();
diff --git a/test/vds.c b/test/vds.c
index 2e25d86..856ea52 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -323,7 +323,10 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char
return 0;
error:
- H5E_BEGIN_TRY { H5Sclose(space_out); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(space_out);
+ }
H5E_END_TRY
return -1;
@@ -999,7 +1002,10 @@ test_api(test_api_config_t config, hid_t fapl)
TEST_ERROR
/* Attempt to add virtual layout mapping */
- H5E_BEGIN_TRY { ret = H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
@@ -3548,7 +3554,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[1] = 9;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
TEST_ERROR
- H5E_BEGIN_TRY { ret = H5Dwrite(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Dwrite(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]);
+ }
H5E_END_TRY
if (ret >= 0)
TEST_ERROR
diff --git a/test/version_bounds_1_10.c b/test/version_bounds_1_10.c
index c18f431..3ec5057 100644
--- a/test/version_bounds_1_10.c
+++ b/test/version_bounds_1_10.c
@@ -66,7 +66,10 @@ test_sel_check(hid_t fid, const char *dset_name, int should_open, int should_acc
hdset_reg_ref_t ref_rbuf[1]; /* The buffer for the reference */
/* Open and read the referenced dataset */
- H5E_BEGIN_TRY { did = H5Dopen2(fid, dset_name, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(fid, dset_name, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (should_open && (H5I_INVALID_HID == did))
@@ -79,7 +82,10 @@ test_sel_check(hid_t fid, const char *dset_name, int should_open, int should_acc
TEST_ERROR
/* Open access to the region reference from the dataset's dataspace */
- H5E_BEGIN_TRY { sid = H5Rget_region(did, H5R_DATASET_REGION, &ref_rbuf[0]); }
+ H5E_BEGIN_TRY
+ {
+ sid = H5Rget_region(did, H5R_DATASET_REGION, &ref_rbuf[0]);
+ }
H5E_END_TRY;
if (should_access && (H5I_INVALID_HID == sid))
@@ -200,7 +206,10 @@ test_sel_bounds(const char *filename)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return FAIL;
@@ -217,7 +226,10 @@ test_ref_check(hid_t fid, const char *dset_name, hbool_t should_open)
{
hid_t did = H5I_INVALID_HID; /* Dataset ID */
- H5E_BEGIN_TRY { did = H5Dopen2(fid, dset_name, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ did = H5Dopen2(fid, dset_name, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (should_open && (H5I_INVALID_HID == did))
@@ -294,7 +306,10 @@ test_ref_bounds(const char *filename)
return SUCCEED;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return FAIL;
diff --git a/test/vfd.c b/test/vfd.c
index 7213572..49e0781 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -636,7 +636,10 @@ test_direct(void)
if (H5Pset_alignment(fapl, (hsize_t)THRESHOLD, (hsize_t)FBSIZE) < 0)
TEST_ERROR;
- H5E_BEGIN_TRY { file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+ }
H5E_END_TRY;
if (file < 0) {
H5Pclose(fapl);
@@ -836,13 +839,19 @@ test_family_opens(char *fname, hid_t fa_pl)
/* Case 1: reopen file with 1st member file name and default property list */
HDsnprintf(first_name, sizeof(first_name), fname, 0);
- H5E_BEGIN_TRY { file = H5Fopen(first_name, H5F_ACC_RDWR, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(first_name, H5F_ACC_RDWR, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (file >= 0)
TEST_ERROR
/* Case 2: reopen file with correct name template but default property list */
- H5E_BEGIN_TRY { file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
+ }
H5E_END_TRY;
if (file >= 0)
TEST_ERROR
@@ -851,7 +860,10 @@ test_family_opens(char *fname, hid_t fa_pl)
if (H5Pset_fapl_family(fa_pl, (hsize_t)128, H5P_DEFAULT) < 0)
TEST_ERROR;
- H5E_BEGIN_TRY { file = H5Fopen(fname, H5F_ACC_RDWR, fa_pl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(fname, H5F_ACC_RDWR, fa_pl);
+ }
H5E_END_TRY;
if (file >= 0)
TEST_ERROR
@@ -867,7 +879,10 @@ test_family_opens(char *fname, hid_t fa_pl)
if (H5Pset_fapl_family(fa_pl, (hsize_t)FAMILY_SIZE, H5P_DEFAULT) < 0)
TEST_ERROR;
- H5E_BEGIN_TRY { file = H5Fopen(wrong_name, H5F_ACC_RDWR, fa_pl); }
+ H5E_BEGIN_TRY
+ {
+ file = H5Fopen(wrong_name, H5F_ACC_RDWR, fa_pl);
+ }
H5E_END_TRY;
if (file >= 0)
TEST_ERROR
@@ -1341,7 +1356,10 @@ test_multi_opens(char *fname)
HDsnprintf(super_name, sizeof(super_name), "%%s-%c.h5", 's');
HDsnprintf(sf_name, sizeof(sf_name), super_name, fname);
- H5E_BEGIN_TRY { fid = H5Fopen(sf_name, H5F_ACC_RDWR, H5P_DEFAULT); }
+ H5E_BEGIN_TRY
+ {
+ fid = H5Fopen(sf_name, H5F_ACC_RDWR, H5P_DEFAULT);
+ }
H5E_END_TRY;
return (fid >= 0 ? FAIL : SUCCEED);
@@ -2531,7 +2549,10 @@ driver_is_splitter_compatible(hid_t fapl_id)
HDstrncpy(vfd_config->wo_path, "nonesuch", H5FD_SPLITTER_PATH_MAX);
vfd_config->log_file_path[0] = '\0';
- H5E_BEGIN_TRY { ret = H5Pset_fapl_splitter(split_fapl_id, vfd_config); }
+ H5E_BEGIN_TRY
+ {
+ ret = H5Pset_fapl_splitter(split_fapl_id, vfd_config);
+ }
H5E_END_TRY;
if (SUCCEED == ret) {
ret_value = -1;
@@ -2547,7 +2568,10 @@ driver_is_splitter_compatible(hid_t fapl_id)
return ret_value;
error:
- H5E_BEGIN_TRY { H5Pclose(split_fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(split_fapl_id);
+ }
H5E_END_TRY;
HDfree(vfd_config);
@@ -2608,7 +2632,10 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
* Should fail.
*/
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
+ }
H5E_END_TRY;
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open on nonexistent files unexpectedly successful\n");
@@ -2621,7 +2648,10 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
if (splitter_create_single_file_at(vfd_config->wo_path, vfd_config->wo_fapl_id, data) < 0) {
SPLITTER_TEST_FAULT("can't write W/O file\n");
}
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
+ }
H5E_END_TRY;
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open with extant W/O file unexpectedly successful\n");
@@ -2635,7 +2665,10 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
if (splitter_create_single_file_at(filename_rw, vfd_config->rw_fapl_id, data) < 0) {
SPLITTER_TEST_FAULT("can't create R/W file\n");
}
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
+ }
H5E_END_TRY;
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open with extant R/W file unexpectedly successful\n");
@@ -2870,7 +2903,10 @@ splitter_compare_expected_data(hid_t file_id, const struct splitter_dataset_def
done:
if (ret_value < 0) {
- H5E_BEGIN_TRY { H5Dclose(dset_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(dset_id);
+ }
H5E_END_TRY;
}
return ret_value;
@@ -2968,7 +3004,10 @@ splitter_tentative_open_test(hid_t child_fapl_id)
* Should fail.
*/
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
+ }
H5E_END_TRY;
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with both nonexistent files unexpectedly succeeded\n");
@@ -2989,7 +3028,10 @@ splitter_tentative_open_test(hid_t child_fapl_id)
if (h5_duplicate_file_by_bytes(filename_tmp, vfd_config->wo_path) < 0) {
SPLITTER_TEST_FAULT("Can't create W/O file copy.\n");
}
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
+ }
H5E_END_TRY;
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with nonexistent R/W file unexpectedly succeeded\n");
@@ -3014,7 +3056,10 @@ splitter_tentative_open_test(hid_t child_fapl_id)
if (h5_duplicate_file_by_bytes(filename_tmp, filename_rw) < 0) {
SPLITTER_TEST_FAULT("Can't create R/W file copy.\n");
}
- H5E_BEGIN_TRY { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
+ }
H5E_END_TRY;
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with nonexistent W/O unexpectedly succeeded\n");
@@ -3180,7 +3225,10 @@ file_exists(const char *filename, hid_t fapl_id)
hid_t file_id = H5I_INVALID_HID;
int ret_value = 0;
- H5E_BEGIN_TRY { file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id); }
+ H5E_BEGIN_TRY
+ {
+ file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id);
+ }
H5E_END_TRY;
if (file_id != H5I_INVALID_HID) {
ret_value = 1;
@@ -3192,7 +3240,10 @@ file_exists(const char *filename, hid_t fapl_id)
return ret_value;
error:
- H5E_BEGIN_TRY { H5Fclose(file_id); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(file_id);
+ }
H5E_END_TRY;
return ret_value;
} /* end file_exists() */