diff options
| author | Sean McBride <sean@rogue-research.com> | 2023-06-16 04:49:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 04:49:02 (GMT) |
| commit | 68eba3da69e659fab69bbef5901ce42e82cea1dc (patch) | |
| tree | f36805f798df6c04092c14dc6803d2cb82f6eff2 /test | |
| parent | 10093f7c4345061bdbebc12888debbf08fe85a5b (diff) | |
| download | hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.zip hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.tar.gz hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.tar.bz2 | |
Many clang -Wextra-semi-stmt fixes (#2537)
* Adds semicolons to function-like macros
* Adds a do..while(0) loop to some macros
* Removes semicolons when inappropriate, especially H5E_TRY_BEGIN/END
Diffstat (limited to 'test')
88 files changed, 1696 insertions, 1696 deletions
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index b667b07..10698c1 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -110,7 +110,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); @@ -441,7 +441,7 @@ error: H5Sclose(mem_space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); if (out) @@ -547,7 +547,7 @@ error: H5Sclose(fspace); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); if (script) diff --git a/test/btree2.c b/test/btree2.c index 573f45c..36182f2 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -679,7 +679,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -737,7 +737,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -802,7 +802,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -842,7 +842,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_insert_basic() */ @@ -988,7 +988,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC + 2), find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -1027,7 +1027,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_split_root() */ @@ -1180,7 +1180,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level1_2leaf_redistrib() */ @@ -1339,7 +1339,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level1_side_split() */ @@ -1482,7 +1482,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level1_3leaf_redistrib() */ @@ -1604,7 +1604,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level1_middle_split() */ @@ -1757,7 +1757,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -1797,7 +1797,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_make_level2() */ @@ -2025,7 +2025,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_leaf_redistrib() */ @@ -2257,7 +2257,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_leaf_split() */ @@ -2429,7 +2429,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_2internal_redistrib() */ @@ -2606,7 +2606,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_2internal_split() */ @@ -2784,7 +2784,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_3internal_redistrib() */ @@ -2965,7 +2965,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_insert_level2_3internal_split() */ @@ -3132,7 +3132,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3140,7 +3140,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); { ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3174,7 +3174,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); { ret = H5B2_insert(bt2, &record); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3209,7 +3209,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(records); return 1; } /* test_insert_lots() */ @@ -3309,7 +3309,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3386,7 +3386,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3463,7 +3463,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3557,7 +3557,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3617,7 +3617,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_update_basic() */ @@ -3824,7 +3824,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -3878,7 +3878,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_split_root() */ @@ -4035,7 +4035,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_level1_2leaf_redistrib() */ @@ -4198,7 +4198,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_level1_side_split() */ @@ -4345,7 +4345,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_level1_3leaf_redistrib() */ @@ -4470,7 +4470,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_level1_middle_split() */ @@ -4642,7 +4642,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -4819,7 +4819,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5006,7 +5006,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5061,7 +5061,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_update_make_level2() */ @@ -5220,7 +5220,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); { ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5228,7 +5228,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); { ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5312,7 +5312,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(records); return 1; @@ -5369,7 +5369,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_remove(bt2, &record, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5409,7 +5409,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_remove(bt2, &record, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5493,7 +5493,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ { ret = H5B2_remove(bt2, &record, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5627,7 +5627,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_basic() */ @@ -5698,7 +5698,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt { ret = H5B2_remove(bt2, &record, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -5851,7 +5851,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_noredistrib() */ @@ -6047,7 +6047,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_redistrib() */ @@ -6225,7 +6225,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_2leaf_merge() */ @@ -6350,7 +6350,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_3leaf_merge() */ @@ -6576,7 +6576,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_promote() */ @@ -6724,7 +6724,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_promote_2leaf_redistrib() */ @@ -6872,7 +6872,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_promote_3leaf_redistrib() */ @@ -7017,7 +7017,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_promote_2leaf_merge() */ @@ -7162,7 +7162,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_promote_3leaf_merge() */ @@ -7300,7 +7300,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level1_collapse() */ @@ -7585,7 +7585,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_promote() */ @@ -7736,7 +7736,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_promote_2internal_redistrib() */ @@ -7887,7 +7887,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_promote_3internal_redistrib() */ @@ -8039,7 +8039,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_promote_2internal_merge() */ @@ -8191,7 +8191,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_promote_3internal_merge() */ @@ -8317,7 +8317,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_2internal_merge_left() */ @@ -8443,7 +8443,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_2internal_merge_right() */ @@ -8569,7 +8569,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_3internal_merge() */ @@ -8694,7 +8694,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_remove_level2_collapse_right() */ @@ -8769,7 +8769,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* gen_l4_btree2() */ @@ -9205,7 +9205,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (fd > 0) HDclose(fd); @@ -9279,7 +9279,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param { ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9359,7 +9359,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param { ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9437,7 +9437,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(records); return 1; } /* test_find_neighbor() */ @@ -9710,7 +9710,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_delete() */ @@ -9777,7 +9777,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa { ret = H5B2_modify(bt2, &record, modify_cb, &modify); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9828,7 +9828,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa { ret = H5B2_modify(bt2, &record, modify_cb, &modify); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9879,7 +9879,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa { ret = H5B2_modify(bt2, &record, modify_cb, &modify); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9930,7 +9930,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa { ret = H5B2_modify(bt2, &record, modify_cb, &modify); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (ret != FAIL) TEST_ERROR; @@ -9955,7 +9955,7 @@ error: H5B2_close(bt2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_modify() */ @@ -10095,7 +10095,7 @@ error: H5Fclose(file0); H5Fclose(file00); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_open_twice_diff() */ @@ -10258,7 +10258,7 @@ error: { H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/cache_api.c b/test/cache_api.c index f40782c..b596534 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -1658,7 +1658,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pget_mdc_config((hid_t)-1, &scratch); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1696,7 +1696,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pget_mdc_config(fapl_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1714,7 +1714,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pget_mdc_config(fapl_id, &scratch); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1733,7 +1733,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pset_mdc_config((hid_t)-1, &default_config); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1748,7 +1748,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pset_mdc_config(fapl_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1763,7 +1763,7 @@ check_fapl_mdc_api_errs(void) { result = H5Pset_mdc_config(fapl_id, &(invalid_configs[i])); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1891,7 +1891,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_config((hid_t)-1, &scratch); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1911,7 +1911,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_config(file_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1932,7 +1932,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_config(file_id, &scratch); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1955,7 +1955,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fset_mdc_config((hid_t)-1, &default_config); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1975,7 +1975,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fset_mdc_config(file_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -1995,7 +1995,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fset_mdc_config(file_id, &(invalid_configs[i])); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -2023,7 +2023,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_hit_rate((hid_t)-1, &hit_rate); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -2043,7 +2043,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_hit_rate(file_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -2064,7 +2064,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Freset_mdc_hit_rate_stats((hid_t)-1); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { @@ -2085,7 +2085,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { result = H5Fget_mdc_size((hid_t)-1, &max_size, &min_clean_size, &cur_size, &cur_num_entries); } - H5E_END_TRY; + H5E_END_TRY if (result >= 0) { diff --git a/test/cache_image.c b/test/cache_image.c index 8ee152c..8072eda 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -935,7 +935,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa { file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl_id); } - H5E_END_TRY; + H5E_END_TRY } else { @@ -943,7 +943,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa { file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (file_id >= 0) { @@ -6284,7 +6284,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) failure_mssg = "SWMR start succeeded in file with cache image."; } } - H5E_END_TRY; + H5E_END_TRY } if (show_progress) diff --git a/test/chunk_info.c b/test/chunk_info.c index 6f3359e..5a53d92 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -641,7 +641,7 @@ test_get_chunk_info_highest_v18(hid_t fapl) { ret = H5Dget_chunk_info(dset, H5S_ALL, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempt to get info of a non-existing chunk."); @@ -698,7 +698,7 @@ test_get_chunk_info_highest_v18(hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempt to get info of a non-existing chunk."); @@ -798,7 +798,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -922,7 +922,7 @@ test_chunk_info_single_chunk(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; @@ -945,7 +945,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1064,7 +1064,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1170,7 +1170,7 @@ test_chunk_info_fixed_array(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index."); @@ -1207,7 +1207,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1319,7 +1319,7 @@ test_chunk_info_extensible_array(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index."); @@ -1356,7 +1356,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1468,7 +1468,7 @@ test_chunk_info_version2_btrees(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index."); @@ -1505,7 +1505,7 @@ error: H5Pclose(cparms); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1665,7 +1665,7 @@ test_basic_query(hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; @@ -1744,7 +1744,7 @@ test_basic_query(hid_t fapl) { ret = H5Dchunk_iter(dset, H5P_DEFAULT, &iter_cb_fail, &cptr); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; if (cptr != &(chunk_infos[1])) @@ -1774,7 +1774,7 @@ error: H5Pclose(cparms); H5Fclose(basicfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -1852,7 +1852,7 @@ test_failed_attempts(const char *filename, hid_t fapl) { ret = H5Dget_num_chunks(dset, dspace, &nchunks); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset."); @@ -1863,7 +1863,7 @@ test_failed_attempts(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset."); @@ -1875,7 +1875,7 @@ test_failed_attempts(const char *filename, hid_t fapl) { ret = H5Dget_chunk_info_by_coord(dset, offset, &read_flt_msk, &addr, &size); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset."); @@ -1897,7 +1897,7 @@ error: H5Sclose(dspace); H5Fclose(chunkfile); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -2185,7 +2185,7 @@ error: H5Pclose(dxpl); H5Fclose(filter_file); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; diff --git a/test/cork.c b/test/cork.c index ad10fa2..5a81b25 100644 --- a/test/cork.c +++ b/test/cork.c @@ -275,7 +275,7 @@ error: H5Pclose(dcpl3); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -483,7 +483,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* verify_obj_dset_cork */ @@ -738,7 +738,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -911,7 +911,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* verify_group_cork */ @@ -1186,7 +1186,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* verify_named_cork */ @@ -1478,7 +1478,7 @@ verify_multiple_cork(hbool_t swmr) { ret = H5Odisable_mdc_flushes(aidg2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1487,7 +1487,7 @@ verify_multiple_cork(hbool_t swmr) { ret = H5Odisable_mdc_flushes(aidd1); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1496,7 +1496,7 @@ verify_multiple_cork(hbool_t swmr) { ret = H5Oare_mdc_flushes_disabled(aidt2, &corked); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1520,7 +1520,7 @@ verify_multiple_cork(hbool_t swmr) ret = H5Oare_mdc_flushes_disabled(fid1, &corked); ret = H5Odisable_mdc_flushes(fid1); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1529,7 +1529,7 @@ verify_multiple_cork(hbool_t swmr) { ret = H5Oenable_mdc_flushes(fid2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1563,7 +1563,7 @@ error: H5Fclose(fid1); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* verify_multiple_cork */ @@ -1667,7 +1667,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) { ret = H5Odisable_mdc_flushes(tid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1706,7 +1706,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) { ret = H5Oenable_mdc_flushes(sid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1723,7 +1723,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) { ret = H5Oare_mdc_flushes_disabled(aid, &corked); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1766,7 +1766,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) { ret = H5Odisable_mdc_flushes(gid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1791,7 +1791,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) { ret = H5Oenable_mdc_flushes(tid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -1865,7 +1865,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_objs_cork() */ @@ -2215,7 +2215,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(wbuf); HDfree(wbuf_data); diff --git a/test/cross_read.c b/test/cross_read.c index c1073cb..2c82306 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -126,7 +126,7 @@ error: { H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end check_data_i() */ @@ -200,7 +200,7 @@ error: { H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end check_data_f() */ @@ -334,7 +334,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return nerrors; } /* end check_file() */ diff --git a/test/dangle.c b/test/dangle.c index 36984b8..05d7110 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -84,7 +84,7 @@ test_dangle_dataset(H5F_close_degree_t degree) 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY if (H5Sclose(sid) < 0) TEST_ERROR; @@ -100,7 +100,7 @@ test_dangle_dataset(H5F_close_degree_t degree) if (H5Fclose(fid) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* end if */ else if (H5Fclose(fid) < 0) TEST_ERROR; @@ -175,7 +175,7 @@ test_dangle_group(H5F_close_degree_t degree) { gid = H5Gcreate2(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) TEST_ERROR; @@ -193,7 +193,7 @@ test_dangle_group(H5F_close_degree_t degree) if (H5Fclose(fid) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* end if */ else if (H5Fclose(fid) < 0) TEST_ERROR; @@ -274,7 +274,7 @@ test_dangle_datatype1(H5F_close_degree_t degree) if (H5Tcommit2(fid, TYPENAME, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY if (H5Tclose(tid) < 0) TEST_ERROR; @@ -289,7 +289,7 @@ test_dangle_datatype1(H5F_close_degree_t degree) if (H5Fclose(fid) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* end if */ else if (H5Fclose(fid) < 0) TEST_ERROR; @@ -374,7 +374,7 @@ test_dangle_datatype2(H5F_close_degree_t degree) if (H5Fclose(fid) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* end if */ else if (H5Fclose(fid) < 0) TEST_ERROR; @@ -462,7 +462,7 @@ test_dangle_attribute(H5F_close_degree_t degree) if ((aid = H5Acreate2(dsid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY if (H5Sclose(sid) < 0) TEST_ERROR; @@ -481,7 +481,7 @@ test_dangle_attribute(H5F_close_degree_t degree) if (H5Fclose(fid) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* end if */ else if (H5Fclose(fid) < 0) TEST_ERROR; diff --git a/test/direct_chunk.c b/test/direct_chunk.c index d6f094e..c3037a7 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -364,7 +364,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY if (outbuf) HDfree(outbuf); @@ -476,7 +476,7 @@ error: H5Sclose(sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -659,7 +659,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -935,7 +935,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -1171,7 +1171,7 @@ error: H5Tclose(st); H5Tclose(dt); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -1251,7 +1251,7 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Try to get chunk size for a contiguous dataset. It should fail */ H5E_BEGIN_TRY @@ -1259,7 +1259,7 @@ test_invalid_parameters(hid_t file) if ((status = H5Dget_chunk_storage_size(dataset, offset, &chunk_nbytes)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Try to H5Dread_chunk from the contiguous dataset. It should fail */ H5E_BEGIN_TRY @@ -1267,7 +1267,7 @@ test_invalid_parameters(hid_t file) if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY if (H5Dclose(dataset) < 0) goto error; @@ -1293,14 +1293,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk((hid_t)-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk((hid_t)-1, dxpl, offset, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check invalid DXPL ID for H5Dwrite_chunk and H5Dread_chunk */ H5E_BEGIN_TRY @@ -1308,14 +1308,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, (hid_t)-1, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk(dataset, (hid_t)-1, offset, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check invalid OFFSET for H5Dwrite_chunk and H5Dread_chunk */ H5E_BEGIN_TRY @@ -1323,14 +1323,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, NULL, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk(dataset, dxpl, NULL, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check when OFFSET is out of dataset range for H5Dwrite_chunk and H5Dread_chunk */ offset[0] = NX + 1; @@ -1340,14 +1340,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check when OFFSET is not on chunk boundary for H5Dwrite_chunk and H5Dread_chunk */ offset[0] = CHUNK_NX; @@ -1357,14 +1357,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check invalid buffer size for H5Dwrite_chunk only */ offset[0] = CHUNK_NX; @@ -1375,7 +1375,7 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Check invalid data buffer for H5Dwrite_chunk and H5Dread_chunk */ buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); @@ -1384,14 +1384,14 @@ test_invalid_parameters(hid_t file) if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, NULL)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, NULL)) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY if (H5Dclose(dataset) < 0) goto error; @@ -1416,7 +1416,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -1604,7 +1604,7 @@ error: H5Pclose(dxpl); H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY if (outbuf) HDfree(outbuf); @@ -1793,7 +1793,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY if (outbuf) HDfree(outbuf); @@ -1952,7 +1952,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -2035,7 +2035,7 @@ test_read_unallocated_chunk(hid_t file) { status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf); } - H5E_END_TRY; + H5E_END_TRY /* Check that the chunk read call does not succeed. */ if (status != -1) @@ -2047,7 +2047,7 @@ test_read_unallocated_chunk(hid_t file) { status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes); } - H5E_END_TRY; + H5E_END_TRY /* Check that the chunk storage size call does not succeed. */ if (status != -1) @@ -2081,7 +2081,7 @@ error: H5Pclose(cparms); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -2238,7 +2238,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; diff --git a/test/dsets.c b/test/dsets.c index 9208233..63ceb4d 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -416,7 +416,7 @@ test_create(hid_t file) dataset = H5Dcreate2(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Library allowed overwrite of existing dataset."); @@ -443,7 +443,7 @@ test_create(hid_t file) { dataset = H5Dopen2(file, "does_not_exist", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Opened a non-existent dataset."); @@ -467,7 +467,7 @@ test_create(hid_t file) dataset = H5Dcreate2(file, DSET_CHUNKED_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, create_parms, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Opened a dataset with incorrect chunking parameters."); @@ -945,7 +945,7 @@ test_compact_io(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -1039,7 +1039,7 @@ error: H5Fclose(file); H5Fclose(verfile); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_compact_io() */ @@ -1169,7 +1169,7 @@ test_max_compact(hid_t fapl) { H5Dcreate2(file, DSET_COMPACT_MAX2_NAME, H5T_NATIVE_INT, space, H5P_DEFAULT, plist, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Close file */ if (H5Sclose(space) < 0) @@ -1196,7 +1196,7 @@ error: H5Dclose(dataset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_max_compact() */ @@ -1254,7 +1254,7 @@ test_layout_extend(hid_t fapl) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create dataset with extendible dataspace (unlimited max_dims) should fail */ H5E_BEGIN_TRY @@ -1263,7 +1263,7 @@ test_layout_extend(hid_t fapl) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create property list for contiguous dataset creation */ if ((dcpl_contig = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -1277,7 +1277,7 @@ test_layout_extend(hid_t fapl) if (H5Dcreate2(fid, "contig", H5T_NATIVE_INT, sid_fix, H5P_DEFAULT, dcpl_contig, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create dataset with extendible dataspace (unlimited max_dims) should fail*/ H5E_BEGIN_TRY @@ -1286,7 +1286,7 @@ test_layout_extend(hid_t fapl) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create property list for chunked dataset creation */ if ((dcpl_chunked = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -1342,7 +1342,7 @@ error: H5Dclose(did_unlim); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_layout_extend() */ @@ -1469,7 +1469,7 @@ test_conv_buffer(hid_t fid) { status = H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Library shouldn't allow conversion buffer too small"); @@ -1527,7 +1527,7 @@ error: H5Tclose(arr_type5); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_conv_buffer() */ @@ -1613,7 +1613,7 @@ error: H5Dclose(dataset); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_tconv() */ @@ -2006,7 +2006,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -2024,7 +2024,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; } @@ -2073,7 +2073,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -2091,7 +2091,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; } @@ -2137,7 +2137,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -2156,7 +2156,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; } /* end if */ @@ -2204,7 +2204,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -2222,7 +2222,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, { status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; } @@ -2474,7 +2474,7 @@ test_get_filter_info(void) { err = H5Zget_filter_info(-1, &flags); } - H5E_END_TRY; + H5E_END_TRY if (err >= 0) TEST_ERROR; @@ -3020,7 +3020,7 @@ test_missing_filter(hid_t file) { ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Should not be able to read dataset data\n", __LINE__); @@ -5718,7 +5718,7 @@ error: H5Sclose(space); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_multiopen() */ @@ -5829,7 +5829,7 @@ error: H5Sclose(space); H5Dclose(dset); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_types() */ @@ -5908,7 +5908,7 @@ test_can_apply(hid_t file) { dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); @@ -5921,7 +5921,7 @@ test_can_apply(hid_t file) { dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); @@ -6276,7 +6276,7 @@ error: H5Tclose(strtid); H5Tclose(vlentid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_optional_filters() */ @@ -6344,7 +6344,7 @@ test_can_apply_szip(hid_t { ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); @@ -6357,7 +6357,7 @@ test_can_apply_szip(hid_t { ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); @@ -6380,7 +6380,7 @@ test_can_apply_szip(hid_t dsid = H5Dcreate2(file, DSET_CAN_APPLY_SZIP_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid <= 0) { H5_FAILED(); HDprintf(" Line %d: Should have created dataset!\n", __LINE__); @@ -6442,7 +6442,7 @@ test_can_apply_szip(hid_t dsid = H5Dcreate2(file, DSET_CAN_APPLY_SZIP_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); @@ -6854,7 +6854,7 @@ error: H5Pclose(dcpl1); H5Pclose(dcpl2); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_compare_dcpl() */ @@ -7017,7 +7017,7 @@ error: H5Pclose(dcpl1_copy); H5Pclose(dcpl2_copy); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_copy_dcpl() */ @@ -7103,7 +7103,7 @@ test_filter_delete(hid_t file) { ret = H5Pget_filter_by_id2(dcpl1, H5Z_FILTER_DEFLATE, &flags, NULL, NULL, (size_t)0, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); @@ -7115,7 +7115,7 @@ test_filter_delete(hid_t file) { ret = H5Premove_filter(dcpl1, H5Z_FILTER_DEFLATE); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); @@ -7165,7 +7165,7 @@ error: H5Dclose(dsid); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; #else (void)file; /* Silence compiler */ @@ -7255,7 +7255,7 @@ error: if (buf) HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end auxread_fdata() */ @@ -7332,7 +7332,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_filters_endianess() */ @@ -7393,7 +7393,7 @@ test_zero_dims(hid_t file) { d = H5Dcreate2(file, ZERODIM_DATASET, H5T_NATIVE_INT, s, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (d > 0) { H5Dclose(d); FAIL_PUTS_ERROR("created dataset with undefined chunk dimensions"); @@ -7404,7 +7404,7 @@ test_zero_dims(hid_t file) { ret = H5Pset_chunk(dcpl, 1, &dzero); } - H5E_END_TRY; + H5E_END_TRY if (ret > 0) FAIL_PUTS_ERROR("set zero-sized chunk dimensions"); @@ -7474,7 +7474,7 @@ test_zero_dims(hid_t file) { d2 = H5Dcreate2(file, ZERODIM_DATASET2, H5T_NATIVE_INT, s2, H5P_DEFAULT, dcpl2, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (d2 > 0) { H5Dclose(d2); FAIL_PUTS_ERROR("created dataset with undefined chunk dimensions"); @@ -7485,7 +7485,7 @@ test_zero_dims(hid_t file) { ret = H5Pset_chunk(dcpl2, 2, dzero2); } - H5E_END_TRY; + H5E_END_TRY if (ret > 0) FAIL_PUTS_ERROR("set zero-sized chunk dimensions"); @@ -7541,7 +7541,7 @@ error: H5Dclose(d2); H5Sclose(s2); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_zero_dims() */ @@ -7792,7 +7792,7 @@ error: H5Sclose(s); H5Sclose(sid2); } - H5E_END_TRY; + H5E_END_TRY HDfree(rdata); HDfree(wdata); @@ -8336,7 +8336,7 @@ error: H5Dclose(d); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_random_chunks_real() */ @@ -8375,7 +8375,6 @@ test_random_chunks(hid_t fapl) nerrors += test_random_chunks_real("Write/read on randomly selected chunks w/implicit index", TRUE, fapl); return nerrors; - ; } /* end test_random_chunks() */ #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -8457,7 +8456,7 @@ test_deprec(hid_t file) { dataset = H5Dcreate1(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Library allowed overwrite of existing dataset."); @@ -8482,7 +8481,7 @@ test_deprec(hid_t file) { dataset = H5Dopen1(file, "does_not_exist"); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Opened a non-existent dataset."); @@ -8535,7 +8534,7 @@ test_deprec(hid_t file) { dataset = H5Dcreate1(file, DSET_DEPREC_NAME_CHUNKED, H5T_NATIVE_DOUBLE, space, create_parms); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5_FAILED(); HDputs(" Opened a dataset with incorrect chunking parameters."); @@ -8660,7 +8659,7 @@ test_huge_chunks(hid_t fapl) { ret = H5Pset_chunk(dcpl, 1, &chunk_dim); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions."); @@ -8672,7 +8671,7 @@ test_huge_chunks(hid_t fapl) { ret = H5Pset_chunk(dcpl, 3, chunk_dim2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions."); @@ -8691,7 +8690,7 @@ test_huge_chunks(hid_t fapl) { dsid = H5Dcreate2(fid, HUGE_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) FAIL_PUTS_ERROR(" 1-D Dataset with too large of chunk dimensions created."); @@ -8718,7 +8717,7 @@ test_huge_chunks(hid_t fapl) { dsid = H5Dcreate2(fid, HUGE_DATASET2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) FAIL_PUTS_ERROR(" n-D Dataset with too large of chunk dimensions created."); @@ -8743,7 +8742,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_huge_chunks() */ @@ -9011,7 +9010,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_chunk_cache() */ @@ -9380,7 +9379,7 @@ error: H5Sclose(t_sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(wdata); HDfree(rdata1); @@ -9806,7 +9805,7 @@ error: H5Fclose(fid); H5Pclose(my_fapl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_chunk_fast() */ @@ -9944,7 +9943,7 @@ error: H5Sclose(scalar_sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_reopen_chunk_fast() */ @@ -10089,7 +10088,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(wbuf); HDfree(rbuf); @@ -10276,7 +10275,7 @@ test_chunk_expand(hid_t fapl) { dsid = H5Dcreate2(fid, "dset", H5T_NATIVE_UINT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid >= 0) FAIL_PUTS_ERROR("should fail to create dataset when allocation time is early"); @@ -10284,7 +10283,7 @@ test_chunk_expand(hid_t fapl) { dsid2 = H5Dcreate2(fid, "dset2", H5T_NATIVE_UINT, sid2, H5P_DEFAULT, dcpl2, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dsid2 >= 0) FAIL_PUTS_ERROR("should fail to create dataset when allocation time is early"); @@ -10381,7 +10380,7 @@ test_chunk_expand(hid_t fapl) { status = H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early"); @@ -10390,7 +10389,7 @@ test_chunk_expand(hid_t fapl) status = H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early"); } /* end for */ @@ -10477,7 +10476,7 @@ test_chunk_expand(hid_t fapl) status = H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR( "should fail to write to dataset when allocation time is not early"); @@ -10487,7 +10486,7 @@ test_chunk_expand(hid_t fapl) status = H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR( "should fail to write to dataset when allocation time is not early"); @@ -10616,7 +10615,7 @@ test_chunk_expand(hid_t fapl) { status = H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early"); @@ -10625,7 +10624,7 @@ test_chunk_expand(hid_t fapl) status = H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early"); } /* end for */ @@ -10685,7 +10684,7 @@ error: H5Sclose(scalar_sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_chunk_expand() */ @@ -11217,7 +11216,7 @@ error: H5Sclose(mem_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(wbuf_big); HDfree(rbuf_big); @@ -11516,7 +11515,7 @@ error: H5Sclose(sid_max); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (wbuf) HDfree(wbuf); if (rbuf) @@ -11603,7 +11602,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_idx_compatible() */ @@ -11744,7 +11743,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_unfiltered_edge_chunks() */ @@ -11880,7 +11879,7 @@ error: H5Sclose(scalar_sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_large_chunk_shrink() */ @@ -11924,7 +11923,7 @@ test_zero_dim_dset(hid_t fapl) { ret = H5Pset_libver_bounds(fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -11986,7 +11985,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_zero_dim_dset() */ @@ -12257,7 +12256,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_swmr_non_latest() */ @@ -12378,7 +12377,7 @@ error: H5Sclose(sid); H5Sclose(msid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_earray_hdr_fd() */ @@ -12499,7 +12498,7 @@ error: H5Sclose(sid); H5Sclose(msid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_farray_hdr_fd() */ @@ -12626,7 +12625,7 @@ error: H5Sclose(sid); H5Sclose(msid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_bt2_hdr_fd() */ @@ -13116,7 +13115,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_storage_size() */ @@ -13184,7 +13183,7 @@ test_power2up(hid_t fapl) { status = H5Dset_extent(did, ext_dims); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -13211,7 +13210,7 @@ error: H5Pclose(dcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_power2up() */ @@ -13523,7 +13522,7 @@ error: { H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_scatter() */ @@ -13890,7 +13889,7 @@ error: { H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_gather() */ @@ -14123,7 +14122,7 @@ error: { H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_scatter_error() */ @@ -14289,7 +14288,7 @@ error: { H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_gather_error() */ @@ -14653,7 +14652,7 @@ test_compact_open_close_dirty(hid_t fapl) { did = H5Dopen2(fid, DSET_COMPACT_MAX_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -14699,7 +14698,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_compact_open_close_dirty() */ @@ -14784,7 +14783,7 @@ test_versionbounds(void) { ret = H5Pset_libver_bounds(fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -14805,7 +14804,7 @@ test_versionbounds(void) { vdset = H5Dcreate2(vfile, V_DSET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (vdset > 0) /* dataset created successfully */ { @@ -14862,7 +14861,7 @@ error: H5Fclose(srcfile); H5Fclose(vfile); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_versionbounds() */ @@ -14940,7 +14939,7 @@ test_object_header_minimization_dcpl(void) { ret = H5Pget_dset_no_attrs_hint(H5I_INVALID_HID, &minimize); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -14949,7 +14948,7 @@ test_object_header_minimization_dcpl(void) { ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, FALSE); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -14958,7 +14957,7 @@ test_object_header_minimization_dcpl(void) { ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, TRUE); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -14967,7 +14966,7 @@ test_object_header_minimization_dcpl(void) { ret = H5Pget_dset_no_attrs_hint(dcpl_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -14990,7 +14989,7 @@ error: H5Pclose(dcpl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_object_header_minimization_dcpl() */ @@ -15048,7 +15047,7 @@ test_h5s_block(void) { ret = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_BLOCK, H5P_DEFAULT, buf); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -15111,7 +15110,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_h5s_block() */ @@ -15180,7 +15179,7 @@ test_h5s_plist(void) ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 0, H5S_SELECT_SET, &start, &stride, &count, &block); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; H5E_BEGIN_TRY @@ -15189,7 +15188,7 @@ test_h5s_plist(void) ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_NOOP, &start, &stride, &count, &block); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; H5E_BEGIN_TRY @@ -15198,7 +15197,7 @@ test_h5s_plist(void) ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, NULL, &stride, &count, &block); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; H5E_BEGIN_TRY @@ -15209,7 +15208,7 @@ test_h5s_plist(void) &block); stride = 1; } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; H5E_BEGIN_TRY @@ -15218,7 +15217,7 @@ test_h5s_plist(void) ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, &start, &stride, NULL, &block); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -15229,7 +15228,7 @@ test_h5s_plist(void) /* H5S_PLIST for memory dataspace */ ret = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_PLIST, H5S_ALL, H5P_DEFAULT, buf); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -15288,7 +15287,7 @@ test_h5s_plist(void) ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id_copy, H5S_MAX_RANK + 1, H5S_SELECT_OR, &start, &stride, &count, &block); } - H5E_END_TRY; + H5E_END_TRY if (ret == SUCCEED) TEST_ERROR; @@ -15353,7 +15352,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_h5s_plist() */ @@ -15547,7 +15546,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_0sized_dset_metadata_alloc() */ diff --git a/test/dt_arith.c b/test/dt_arith.c index a26945f..b9b8830 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -106,7 +106,7 @@ static int without_hardware_g = 0; * This algorithm is mainly to avoid any casting and comparison between source and destination types * for compiler, because we're testing conversions. */ #define INIT_INTEGER(TYPE, SRC_MAX, SRC_MIN, SRC_SIZE, DST_SIZE, SRC_PREC, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ unsigned int n; \ TYPE value1 = 1; \ @@ -160,13 +160,13 @@ static int without_hardware_g = 0; if (n < SRC_PREC - 1) \ value2 = (TYPE)(value2 << 1); \ } \ - } + } while (0) /* Change a buffer's byte order from big endian to little endian. It's mainly for library's * bit operations which handle only little endian order. */ #define CHANGE_ORDER(EBUF, EORDER, ESIZE) \ - { \ + do { \ unsigned int m; \ if (H5T_ORDER_BE == EORDER) { \ unsigned char mediator; \ @@ -190,14 +190,14 @@ static int without_hardware_g = 0; EBUF[(ESIZE - 1) - m] = mediator2; \ } \ } \ - } + } while (0) /* Allocate buffer and initialize it with floating-point normalized values. * It's for conversion test of floating-point as the source. */ #define INIT_FP_NORM(TYPE, SRC_MAX, SRC_MIN, SRC_MAX_10_EXP, SRC_MIN_10_EXP, SRC_SIZE, DST_SIZE, BUF, SAVED, \ NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ size_t num_norm, factor, n; \ TYPE value1, value2; \ @@ -270,13 +270,13 @@ static int without_hardware_g = 0; HDmemcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ - } + } while (0) /* Allocate buffer and initialize it with floating-point denormalized values. * It's for conversion test of floating-point as the source. */ #define INIT_FP_DENORM(TYPE, SRC_MANT_DIG, SRC_SIZE, SRC_PREC, SRC_ORDR, DST_SIZE, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ unsigned char *tmp1, *tmp2; \ size_t n; \ @@ -322,13 +322,13 @@ static int without_hardware_g = 0; } \ HDfree(tmp1); \ HDfree(tmp2); \ - } + } while (0) /* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity, * +/-QNaN, +/-SNaN. It's for conversion test of floating-point as the source. */ #define INIT_FP_SPECIAL(SRC_SIZE, SRC_PREC, SRC_ORDR, SRC_MANT_DIG, DST_SIZE, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p; \ unsigned char *value; \ int n; \ @@ -386,7 +386,7 @@ static int without_hardware_g = 0; \ HDmemcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ HDfree(value); \ - } + } while (0) static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); static int my_isnan(dtype_t type, void *val); @@ -763,7 +763,7 @@ error: { H5Pclose(dxpl_id); } - H5E_END_TRY; + H5E_END_TRY if (buf1) HDfree(buf1); if (buf2) @@ -1220,7 +1220,7 @@ error: H5Pclose(dxpl_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -1532,7 +1532,7 @@ error: H5Pclose(dxpl_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); diff --git a/test/dtransform.c b/test/dtransform.c index d73bc1a..9bbac8f 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -214,7 +214,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, } #define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED) \ - { \ + do { \ struct { \ TYPE arr[ROWS][COLS]; \ } *array = NULL; \ @@ -298,10 +298,10 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, TEST_ERROR; \ \ HDfree(array); \ - } + } while (0) #define INVALID_SET_TEST(TRANSFORM) \ - { \ + do { \ if (H5Pset_data_transform(dxpl_id, TRANSFORM) < 0) { \ PASSED(); \ } \ @@ -310,7 +310,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, HDfprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \ goto error; \ } \ - } + } while (0) int main(void) diff --git a/test/dtypes.c b/test/dtypes.c index bd55491..c7d845d 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -315,7 +315,7 @@ test_copy(void) { status = H5Tclose(H5T_NATIVE_SCHAR); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Should not be able to close a predefined type!"); @@ -599,7 +599,7 @@ test_compound_1(void) { ret = H5Tinsert(complex_id, "compound", (size_t)0, complex_id); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("Inserted compound datatype into itself?"); } /* end if */ @@ -616,7 +616,7 @@ test_compound_1(void) { ret = H5Tset_size(complex_id, sizeof(double)); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -625,7 +625,7 @@ test_compound_1(void) { size = H5Tget_precision(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -635,7 +635,7 @@ test_compound_1(void) { ret = H5Tset_precision(complex_id, size); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -644,7 +644,7 @@ test_compound_1(void) { ret = H5Tget_pad(complex_id, &lsb, &msb); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -653,7 +653,7 @@ test_compound_1(void) { size = H5Tget_ebias(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -662,7 +662,7 @@ test_compound_1(void) { lsb = H5Tget_inpad(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (lsb >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -671,7 +671,7 @@ test_compound_1(void) { cset = H5Tget_cset(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (cset > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -680,7 +680,7 @@ test_compound_1(void) { strpad = H5Tget_strpad(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (strpad > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -689,7 +689,7 @@ test_compound_1(void) { offset = H5Tget_offset(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (offset >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -704,7 +704,7 @@ test_compound_1(void) { sign = H5Tget_sign(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (sign > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -713,7 +713,7 @@ test_compound_1(void) { tag = H5Tget_tag(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (tag) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -722,7 +722,7 @@ test_compound_1(void) { super = H5Tget_super(complex_id); } - H5E_END_TRY; + H5E_END_TRY if (super >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -1412,7 +1412,7 @@ test_compound_7(void) { ret = H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf("Inserted field 'd'?\n"); @@ -1424,7 +1424,7 @@ test_compound_7(void) { ret = H5Tset_size(tid2, sizeof(struct s1) / 2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf("Shrunk compound type?\n"); @@ -1656,7 +1656,7 @@ test_compound_8(void) { ret = H5Tpack(tid3); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); AT(); @@ -2563,7 +2563,7 @@ test_compound_12(void) { ret = H5Tset_size(complex_id, size); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDputs(" Tries to cut off the last member. Should have failed."); @@ -3461,7 +3461,7 @@ error: H5Sclose(space_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_compound_15_attr() */ @@ -3783,7 +3783,7 @@ test_compound_18(void) { did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did > 0) { H5Dclose(did); FAIL_PUTS_ERROR("created dataset with bad compound datatype"); @@ -3798,7 +3798,7 @@ test_compound_18(void) { aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (aid > 0) { H5Aclose(aid); FAIL_PUTS_ERROR("created attribute with bad compound datatype"); @@ -3809,7 +3809,7 @@ test_compound_18(void) { ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("committed named datatype with bad compound datatype"); } /* end if */ @@ -3838,7 +3838,7 @@ test_compound_18(void) { tid = H5Topen2(file, "cmpnd", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (tid > 0) { H5Tclose(tid); FAIL_PUTS_ERROR("opened named datatype with bad compound datatype"); @@ -3849,7 +3849,7 @@ test_compound_18(void) { did = H5Dopen2(file, "dataset", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did > 0) { H5Dclose(did); FAIL_PUTS_ERROR("opened dataset with bad compound datatype"); @@ -3864,7 +3864,7 @@ test_compound_18(void) { aid = H5Aopen(gid, "attr", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (aid > 0) { H5Aclose(aid); FAIL_PUTS_ERROR("opened attribute with bad compound datatype"); @@ -4122,7 +4122,7 @@ error: H5Tclose(tid2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4163,7 +4163,7 @@ test_transient(hid_t fapl) { status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Predefined types should not be modifiable!"); @@ -4173,7 +4173,7 @@ test_transient(hid_t fapl) { status = H5Tclose(H5T_NATIVE_INT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Predefined types should not be closable!"); @@ -4191,7 +4191,7 @@ test_transient(hid_t fapl) { ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret_id >= 0) { H5_FAILED(); HDputs(" Attributes should not be allowed for transient types!"); @@ -4213,7 +4213,7 @@ test_transient(hid_t fapl) { status = H5Tset_precision(t2, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Dataset datatypes should not be modifiable!"); @@ -4236,7 +4236,7 @@ test_transient(hid_t fapl) { status = H5Tset_precision(t2, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Dataset datatypes should not be modifiable!"); @@ -4277,7 +4277,7 @@ error: H5Dclose(dset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4320,7 +4320,7 @@ test_named(hid_t fapl) status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Predefined types should not be committable!"); @@ -4345,7 +4345,7 @@ test_named(hid_t fapl) { status = H5Tset_precision(type, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Committed type is not constant!"); @@ -4358,7 +4358,7 @@ test_named(hid_t fapl) status = H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Committed types should not be recommitted!"); @@ -4532,7 +4532,7 @@ test_named(hid_t fapl) status = H5Tcommit2(file, "test_named_3 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Types should not be committable to a read-only file!"); @@ -4546,7 +4546,7 @@ test_named(hid_t fapl) { status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Types should not be committable to a read-only file!"); @@ -4572,7 +4572,7 @@ error: H5Dclose(dset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5010,7 +5010,7 @@ error: H5Tclose(src_type); H5Tclose(dst_type); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); @@ -5081,7 +5081,7 @@ error: H5Tclose(c_type); H5Tclose(f_type); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); @@ -5159,7 +5159,7 @@ test_conv_str_3(void) { ret = H5Tset_precision(type, nelmts); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5168,7 +5168,7 @@ test_conv_str_3(void) { size = H5Tget_ebias(type); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5177,7 +5177,7 @@ test_conv_str_3(void) { inpad = H5Tget_inpad(type); } - H5E_END_TRY; + H5E_END_TRY if (inpad > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5186,7 +5186,7 @@ test_conv_str_3(void) { sign = H5Tget_sign(type); } - H5E_END_TRY; + H5E_END_TRY if (sign > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5195,7 +5195,7 @@ test_conv_str_3(void) { tag = H5Tget_tag(type); } - H5E_END_TRY; + H5E_END_TRY if (tag) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5204,7 +5204,7 @@ test_conv_str_3(void) { super = H5Tget_super(type); } - H5E_END_TRY; + H5E_END_TRY if (super >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -5218,7 +5218,7 @@ error: H5Tclose(type); H5Tclose(super); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); @@ -5299,7 +5299,7 @@ error: H5Tclose(t1); H5Tclose(t2); } - H5E_END_TRY; + H5E_END_TRY if (buf) HDfree(buf); @@ -5538,7 +5538,7 @@ test_bitfield_funcs(void) { size = H5Tget_ebias(type); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5549,7 +5549,7 @@ test_bitfield_funcs(void) { inpad = H5Tget_inpad(type); } - H5E_END_TRY; + H5E_END_TRY if (inpad > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5560,7 +5560,7 @@ test_bitfield_funcs(void) { cset = H5Tget_cset(type); } - H5E_END_TRY; + H5E_END_TRY if (cset > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5571,7 +5571,7 @@ test_bitfield_funcs(void) { strpad = H5Tget_strpad(type); } - H5E_END_TRY; + H5E_END_TRY if (strpad > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5582,7 +5582,7 @@ test_bitfield_funcs(void) { ret = H5Tset_sign(type, H5T_SGN_2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5593,7 +5593,7 @@ test_bitfield_funcs(void) { tag = H5Tget_tag(type); } - H5E_END_TRY; + H5E_END_TRY if (tag) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5604,7 +5604,7 @@ test_bitfield_funcs(void) { super = H5Tget_super(type); } - H5E_END_TRY; + H5E_END_TRY if (super >= 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); @@ -5732,7 +5732,7 @@ opaque_check(int tag_it) { status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDprintf(" opaque conversion should have failed but succeeded\n"); @@ -5804,7 +5804,7 @@ opaque_long(void) { ret = H5Tset_tag(dt, long_tag); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; @@ -5863,7 +5863,7 @@ opaque_funcs(void) { ret = H5Tset_precision(type, (size_t)32); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5873,7 +5873,7 @@ opaque_funcs(void) { ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5883,7 +5883,7 @@ opaque_funcs(void) { size = H5Tget_ebias(type); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5893,7 +5893,7 @@ opaque_funcs(void) { inpad = H5Tget_inpad(type); } - H5E_END_TRY; + H5E_END_TRY if (inpad > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5903,7 +5903,7 @@ opaque_funcs(void) { cset = H5Tget_cset(type); } - H5E_END_TRY; + H5E_END_TRY if (cset > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5913,7 +5913,7 @@ opaque_funcs(void) { strpad = H5Tget_strpad(type); } - H5E_END_TRY; + H5E_END_TRY if (strpad > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5923,7 +5923,7 @@ opaque_funcs(void) { ret = H5Tset_offset(type, (size_t)16); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5933,7 +5933,7 @@ opaque_funcs(void) { sign = H5Tget_sign(type); } - H5E_END_TRY; + H5E_END_TRY if (sign > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -5943,7 +5943,7 @@ opaque_funcs(void) { super = H5Tget_super(type); } - H5E_END_TRY; + H5E_END_TRY if (super >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR; @@ -6100,7 +6100,7 @@ test_encode(void) { ret_id = H5Tdecode(cmpd_buf); } - H5E_END_TRY; + H5E_END_TRY if (ret_id != FAIL) { H5_FAILED(); HDprintf("Decoded an empty buffer!\n"); @@ -6452,7 +6452,7 @@ test_encode(void) { ret = H5Tclose(decoded_tid1); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); @@ -6463,7 +6463,7 @@ test_encode(void) { ret = H5Tclose(decoded_tid2); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); @@ -6474,7 +6474,7 @@ test_encode(void) { ret = H5Tclose(decoded_tid3); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); @@ -6525,7 +6525,7 @@ error: H5Tclose(decoded_tid3); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6713,7 +6713,7 @@ error: H5Fclose(file); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_latest() */ @@ -6910,7 +6910,7 @@ error: { H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ } /* end test_int_float_except() */ @@ -7144,7 +7144,7 @@ test_set_order(void) error: H5E_BEGIN_TRY H5Tclose(dtype); - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_set_order() */ @@ -7312,7 +7312,7 @@ error: H5Tclose(cmpd); H5Tclose(cmpd_array); H5Fclose(file); - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_set_order_compound() */ @@ -7575,7 +7575,7 @@ error: H5Dclose(dset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (tag_ret) H5free_memory(tag_ret); return 1; @@ -7802,7 +7802,7 @@ error: H5Fclose(filea2); H5Fclose(fileb); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_delete_obj_named() */ @@ -8004,7 +8004,7 @@ error: H5Fclose(attr_fid); H5Fclose(type_fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_delete_obj_named_fileid() */ @@ -8091,7 +8091,7 @@ test_deprec(hid_t fapl) { status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Predefined types should not be committable!"); @@ -8110,7 +8110,7 @@ test_deprec(hid_t fapl) { status = H5Tset_precision(type, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Committed type is not constant!"); @@ -8119,7 +8119,7 @@ test_deprec(hid_t fapl) { status = H5Tcommit1(file, "test_named_2 (should not exist)", type); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Committed types should not be recommitted!"); @@ -8152,7 +8152,7 @@ test_deprec(hid_t fapl) { status = H5Tcommit1(file, "test_named_3 (should not exist)", type); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Types should not be committable to a read-only file!"); @@ -8174,7 +8174,7 @@ error: H5Tclose(type); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_deprec() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -8435,7 +8435,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8578,7 +8578,7 @@ error: H5Tclose(base_dtype); H5Tclose(mem_dtype); } - H5E_END_TRY; + H5E_END_TRY return ret; } /* end of verify_version */ @@ -8780,7 +8780,7 @@ test_versionbounds(void) { ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -8847,7 +8847,7 @@ error: H5Pclose(fapl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_versionbounds() */ diff --git a/test/earray.c b/test/earray.c index eed4bd2..1f82058 100644 --- a/test/earray.c +++ b/test/earray.c @@ -626,7 +626,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -643,7 +643,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -659,7 +659,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -676,7 +676,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -691,7 +691,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -706,7 +706,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -723,7 +723,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -742,7 +742,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -759,7 +759,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -774,7 +774,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE { ea = H5EA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened extensible array */ H5EA_close(ea); @@ -825,7 +825,7 @@ error: H5EA_close(ea); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_create() */ @@ -896,7 +896,7 @@ error: H5EA_close(ea); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_reopen() */ @@ -1004,7 +1004,7 @@ error: H5Fclose(file); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_open_twice() */ @@ -1146,7 +1146,7 @@ error: H5Fclose(file0); H5Fclose(file00); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_open_twice_diff() */ @@ -1211,7 +1211,7 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { ea2 = H5EA_open(f, ea_addr, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea2) { /* Close opened array */ H5EA_close(ea2); @@ -1234,7 +1234,7 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { ea = H5EA_open(f, ea_addr, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ea) { /* Close opened array */ H5EA_close(ea); @@ -1269,7 +1269,7 @@ error: H5EA_close(ea2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_delete_open() */ @@ -2224,7 +2224,7 @@ error: H5EA_close(ea); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_set_elmts() */ @@ -2383,7 +2383,7 @@ error: H5EA_close(ea); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_skip_elmts() */ @@ -2608,7 +2608,7 @@ error: { H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index 5b75178..55c80fb 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -105,7 +105,7 @@ error: H5Pclose(pl); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* end test_encode_decode() */ diff --git a/test/enum.c b/test/enum.c index 90cbe68..24f8160 100644 --- a/test/enum.c +++ b/test/enum.c @@ -116,7 +116,7 @@ error: H5Tclose(tid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -286,7 +286,7 @@ error: H5Tclose(tid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -389,7 +389,7 @@ error: H5Tclose(f_tid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -490,7 +490,7 @@ error: H5Tclose(f_tid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -597,7 +597,7 @@ error: { H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -662,7 +662,7 @@ test_funcs(void) { size = H5Tget_ebias(tid); } - H5E_END_TRY; + H5E_END_TRY if (size > 0) FAIL_PUTS_ERROR("H5Tget_ebias should not work with enum types"); @@ -670,7 +670,7 @@ test_funcs(void) { inpad = H5Tget_inpad(tid); } - H5E_END_TRY; + H5E_END_TRY if (inpad > -1) FAIL_PUTS_ERROR("H5Tget_inpad should not work with enum types"); @@ -678,7 +678,7 @@ test_funcs(void) { cset = H5Tget_cset(tid); } - H5E_END_TRY; + H5E_END_TRY if (cset > -1) FAIL_PUTS_ERROR("H5Tget_cset should not work with enum types"); @@ -687,7 +687,7 @@ test_funcs(void) { ret = H5Tset_offset(tid, size); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR("H5Tset_offset should not work with enum types"); @@ -695,7 +695,7 @@ test_funcs(void) { ret = H5Tset_order(tid, H5T_ORDER_BE); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR("H5Tset_order should not work with enum types"); @@ -710,7 +710,7 @@ error: { H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/err_compat.c b/test/err_compat.c index 1f7eb45..500b69f 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -366,7 +366,7 @@ test_h5epush1(hid_t file) did = H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Create the dataset */ if ((did = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) diff --git a/test/error_test.c b/test/error_test.c index 3aa4970..1bcbcd4 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -113,7 +113,7 @@ test_error(hid_t file) { dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Create the dataset */ if ((dataset = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < diff --git a/test/event_set.c b/test/event_set.c index df6b8cb..e9bd070 100644 --- a/test/event_set.c +++ b/test/event_set.c @@ -238,7 +238,7 @@ error: { H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -645,7 +645,7 @@ error: { H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 7efe0e8..07efc98 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -562,7 +562,7 @@ error: H5Pclose(dcpl_id); H5Pclose(fapl_copy_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(data); @@ -678,7 +678,7 @@ error: H5Gclose(gid1); H5Gclose(gid2); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -781,7 +781,7 @@ error: { H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -847,7 +847,7 @@ check_evict_on_close_api(void) { status = H5Pset_evict_on_close(dapl_id, evict_on_close); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("H5Pset_evict_on_close() accepted invalid access plist."); @@ -856,7 +856,7 @@ check_evict_on_close_api(void) { status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR("H5Pget_evict_on_close() accepted invalid hid_t."); @@ -969,7 +969,7 @@ error: H5Fclose(fid); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDexit(EXIT_FAILURE); @@ -1006,7 +1006,7 @@ check_evict_on_close_parallel_fail(void) { status = H5Pset_evict_on_close(fapl_id, evict_on_close); } - H5E_END_TRY; + 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 d0d7f60..bca7da1 100644 --- a/test/external.c +++ b/test/external.c @@ -137,7 +137,7 @@ test_non_extendible(hid_t file) { dset_addr = H5Dget_offset(dset); } - H5E_END_TRY; + H5E_END_TRY if (dset_addr != HADDR_UNDEF) FAIL_STACK_ERROR; @@ -184,7 +184,7 @@ error: H5Sclose(space); H5Dclose(dset); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_non_extendible() */ @@ -225,7 +225,7 @@ test_too_small(hid_t file) { dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset >= 0) FAIL_PUTS_ERROR(" Small external file succeeded instead of failing."); if (H5Sclose(space) < 0) @@ -243,7 +243,7 @@ error: H5Pclose(dcpl); H5Dclose(dset); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_too_small() */ @@ -299,7 +299,7 @@ error: H5Pclose(dcpl); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_large_enough_current_eventual() */ @@ -340,7 +340,7 @@ test_large_enough_current_not_eventual(hid_t file) { dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset >= 0) FAIL_PUTS_ERROR(" Small external file succeeded instead of failing."); @@ -359,7 +359,7 @@ error: H5Pclose(dcpl); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_large_enough_current_not_eventual() */ @@ -452,7 +452,7 @@ error: H5Pclose(dcpl); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlimited() */ @@ -558,7 +558,7 @@ test_multiple_files(hid_t file) { dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset >= 0) FAIL_PUTS_ERROR(" Small external files succeeded instead of failing."); @@ -577,7 +577,7 @@ error: H5Pclose(dcpl); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_multiple_files() */ @@ -613,7 +613,7 @@ test_add_to_unlimited(void) { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed."); @@ -632,7 +632,7 @@ error: { H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_add_to_unlimited() */ @@ -667,7 +667,7 @@ test_overflow(void) { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed."); @@ -682,7 +682,7 @@ error: { H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_overflow() */ @@ -807,7 +807,7 @@ error: H5Sclose(hs_space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_read_file_set() */ @@ -933,7 +933,7 @@ error: H5Sclose(file_space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_write_file_set() */ @@ -1030,7 +1030,7 @@ error: H5Pclose(dcpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_path_absolute() */ @@ -1120,7 +1120,7 @@ error: H5Sclose(space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_path_relative() */ @@ -1213,7 +1213,7 @@ test_path_relative_cwd(hid_t fapl) { dset3 = H5Dopen2(file, "dset1", dapl); } - H5E_END_TRY; + H5E_END_TRY if (dset3 >= 0) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); @@ -1250,7 +1250,7 @@ test_path_relative_cwd(hid_t fapl) { dset3 = H5Dopen2(file, "dset1", dapl); } - H5E_END_TRY; + H5E_END_TRY if (dset3 >= 0) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); @@ -1291,7 +1291,7 @@ error: H5Sclose(space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_path_relative_cwd() */ @@ -1396,7 +1396,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_h5d_get_access_plist() */ @@ -1525,7 +1525,7 @@ error: H5Pclose(fapl_id_new); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY nerrors = MAX(1, nerrors); HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); return EXIT_FAILURE; diff --git a/test/external_env.c b/test/external_env.c index 3718dc2..b39358f 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -124,7 +124,7 @@ error: H5Sclose(space); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_path_env() */ @@ -212,7 +212,7 @@ error: H5Pclose(fapl_id_new); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY nerrors = MAX(1, nerrors); HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); return EXIT_FAILURE; diff --git a/test/farray.c b/test/farray.c index e5bd6b6..0f522fb 100644 --- a/test/farray.c +++ b/test/farray.c @@ -443,7 +443,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE { fa = H5FA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (fa) { /* Close opened fixed array */ H5FA_close(fa); @@ -460,7 +460,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE { fa = H5FA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (fa) { /* Close opened fixed array */ H5FA_close(fa); @@ -477,7 +477,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE { fa = H5FA_create(f, &test_cparam, NULL); } - H5E_END_TRY; + H5E_END_TRY if (fa) { /* Close opened fixed array */ H5FA_close(fa); @@ -528,7 +528,7 @@ error: H5FA_close(fa); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_create() */ @@ -596,7 +596,7 @@ error: H5FA_close(fa); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_reopen() */ @@ -699,7 +699,7 @@ error: H5Fclose(fid); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_open_twice() */ @@ -835,7 +835,7 @@ error: H5Fclose(fid0); H5Fclose(fid00); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_open_twice_diff() */ @@ -897,7 +897,7 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam) { fa2 = H5FA_open(f, fa_addr, NULL); } - H5E_END_TRY; + H5E_END_TRY if (fa2) { /* Close opened array */ H5FA_close(fa2); @@ -920,7 +920,7 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam) { fa = H5FA_open(f, fa_addr, NULL); } - H5E_END_TRY; + H5E_END_TRY if (fa) { /* Close opened array */ H5FA_close(fa); @@ -955,7 +955,7 @@ error: H5FA_close(fa2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_delete_open() */ @@ -1481,7 +1481,7 @@ error: H5FA_close(fa); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_set_elmts() */ @@ -1609,7 +1609,7 @@ error: H5FA_close(fa); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_skip_elmts() */ @@ -1801,7 +1801,7 @@ error: { H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/fheap.c b/test/fheap.c index bcf1ab0..f256ec9 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -1905,7 +1905,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_create() */ @@ -2058,7 +2058,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_reopen() */ @@ -2235,7 +2235,7 @@ error: H5Fclose(file); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_open_twice() */ @@ -2338,7 +2338,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { fh2 = H5HF_open(f, fh_addr); } - H5E_END_TRY; + H5E_END_TRY if (fh2) { /* Close opened heap */ H5HF_close(fh2); @@ -2378,7 +2378,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { fh = H5HF_open(f, fh_addr); } - H5E_END_TRY; + H5E_END_TRY if (fh) { /* Close opened heap */ H5HF_close(fh); @@ -2414,7 +2414,7 @@ error: H5HF_close(fh2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_delete_open() */ @@ -2568,7 +2568,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { fh = H5HF_create(f, &tmp_cparam); } - H5E_END_TRY; + H5E_END_TRY if (NULL != fh) FAIL_STACK_ERROR; @@ -2732,7 +2732,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { fh = H5HF_create(f, &tmp_cparam); } - H5E_END_TRY; + H5E_END_TRY if (NULL != fh) FAIL_STACK_ERROR; @@ -2752,7 +2752,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_id_limits() */ @@ -2874,7 +2874,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_filtered_create() */ @@ -3013,7 +3013,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_size() */ @@ -3148,7 +3148,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_reopen_hdr() */ @@ -3222,7 +3222,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { ret = H5HF_insert(fh, (size_t)0, shared_wobj_g, heap_id); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5Eclear2(H5E_DEFAULT); @@ -3260,7 +3260,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_weird() */ @@ -3363,7 +3363,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_first() */ @@ -3458,7 +3458,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_second() */ @@ -3556,7 +3556,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_root_mult() */ @@ -3662,7 +3662,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_force_indirect() */ @@ -3768,7 +3768,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_fill_second() */ @@ -3880,7 +3880,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_insert_third_direct() */ @@ -3976,7 +3976,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_first_row() */ @@ -4079,7 +4079,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_second_row() */ @@ -4179,7 +4179,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_second_row() */ @@ -4290,7 +4290,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_third_row() */ @@ -4388,7 +4388,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_fourth_row() */ @@ -4484,7 +4484,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_all_root_direct() */ @@ -4585,7 +4585,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_first_recursive_indirect() */ @@ -4695,7 +4695,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_second_direct_recursive_indirect() */ @@ -4797,7 +4797,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_first_recursive_indirect() */ @@ -4907,7 +4907,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_second_recursive_indirect() */ @@ -5015,7 +5015,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_second_recursive_indirect() */ @@ -5115,7 +5115,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_recursive_indirect_row() */ @@ -5224,7 +5224,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_2nd_recursive_indirect() */ @@ -5326,7 +5326,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_recursive_indirect_two_deep() */ @@ -5436,7 +5436,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_3rd_recursive_indirect() */ @@ -5547,7 +5547,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_first_3rd_recursive_indirect() */ @@ -5655,7 +5655,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_recursive_indirect_row() */ @@ -5763,7 +5763,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_all_3rd_recursive_indirect() */ @@ -5878,7 +5878,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_4th_recursive_indirect() */ @@ -5999,7 +5999,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_first_4th_recursive_indirect() */ @@ -6111,7 +6111,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_4th_recursive_indirect_row() */ @@ -6223,7 +6223,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_all_4th_recursive_indirect() */ #endif /* ALL_INSERT_TESTS */ @@ -6357,7 +6357,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_start_5th_recursive_indirect() */ @@ -6452,7 +6452,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); { ret = H5HF_remove(fh, heap_id); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_STACK_ERROR; @@ -6481,7 +6481,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); { ret = H5HF_remove(fh, heap_id); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5Eclear2(H5E_DEFAULT); @@ -6491,7 +6491,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); { ret = H5HF_read(fh, heap_id, shared_robj_g); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5Eclear2(H5E_DEFAULT); @@ -6517,7 +6517,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_bogus() */ @@ -6681,7 +6681,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_one() */ @@ -6874,7 +6874,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_two() */ @@ -7043,7 +7043,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_one_larger() */ @@ -7283,7 +7283,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_two_larger() */ @@ -7583,7 +7583,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_three_larger() */ @@ -7707,7 +7707,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(heap_id); HDfree(heap_id_data); @@ -7784,7 +7784,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_root_direct() */ @@ -7872,7 +7872,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_two_direct() */ @@ -7942,7 +7942,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_first_row() */ @@ -8014,7 +8014,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_first_two_rows() */ @@ -8090,7 +8090,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_first_four_rows() */ @@ -8160,7 +8160,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_all_root_direct() */ @@ -8234,7 +8234,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_2nd_indirect() */ @@ -8312,7 +8312,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_remove_3rd_indirect() */ @@ -8392,7 +8392,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_start_block() */ @@ -8490,7 +8490,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_start_block_add_back() */ @@ -8600,7 +8600,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_start_block_add_skipped() */ @@ -8694,7 +8694,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_2nd_block() */ @@ -8837,7 +8837,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_2nd_block_add_skipped() */ @@ -9005,7 +9005,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_one_partial_skip_2nd_block_add_skipped() */ @@ -9135,7 +9135,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_row_skip_add_skipped() */ @@ -9264,7 +9264,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_skip_direct_skip_indirect_two_rows_add_skipped() */ @@ -9388,7 +9388,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_direct_skip_indirect_start_block_add_skipped() */ @@ -9519,7 +9519,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped() */ @@ -9662,7 +9662,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */ @@ -9830,7 +9830,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped() */ @@ -9984,7 +9984,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_direct_skip_indirect_two_rows_add_skipped() */ @@ -10169,7 +10169,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped() */ @@ -10298,7 +10298,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_2nd_direct_skip_start_block_add_skipped() */ @@ -10440,7 +10440,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped() */ @@ -10592,7 +10592,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */ @@ -10749,7 +10749,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped() */ @@ -10912,7 +10912,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped() */ @@ -11082,7 +11082,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */ @@ -11243,7 +11243,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped() */ @@ -11423,7 +11423,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */ @@ -11640,7 +11640,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped() */ @@ -11841,7 +11841,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */ @@ -12078,7 +12078,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */ @@ -12211,7 +12211,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_frag_simple() */ @@ -12380,7 +12380,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_frag_direct() */ @@ -12491,7 +12491,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_frag_2nd_direct() */ @@ -12611,7 +12611,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_man_frag_3rd_direct() */ @@ -12761,7 +12761,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_huge_insert_one() */ @@ -12991,7 +12991,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_huge_insert_two() */ @@ -13296,7 +13296,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_huge_insert_three() */ @@ -13721,7 +13721,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_huge_insert_mix() */ @@ -13932,7 +13932,7 @@ error: H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */ H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_filtered_huge() */ @@ -14082,7 +14082,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_tiny_insert_one() */ @@ -14312,7 +14312,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_tiny_insert_two() */ @@ -14919,7 +14919,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_tiny_insert_mix() */ @@ -15092,7 +15092,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_filtered_man_root_direct() */ @@ -15418,7 +15418,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_filtered_man_root_indirect() */ @@ -15621,7 +15621,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_random() */ @@ -15838,7 +15838,7 @@ error: H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */ H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_random_pow2() */ @@ -15955,7 +15955,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g); } - H5E_END_TRY; + H5E_END_TRY HDassert(!id_changed); if (tparam->comp == FHEAP_TEST_COMPRESS) { if (ret >= 0) @@ -15971,7 +15971,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g); } - H5E_END_TRY; + H5E_END_TRY HDassert(!id_changed); if (ret >= 0) TEST_ERROR; @@ -16129,7 +16129,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_write() */ @@ -16301,7 +16301,7 @@ error: H5HF_close(fh); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_bug1() */ @@ -16926,7 +16926,7 @@ error: H5Pclose(def_fcpl); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/file_image.c b/test/file_image.c index e9f50c3..638ec8d 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -1069,7 +1069,7 @@ test_get_file_image_error_rejection(void) { bytes_read = H5Fget_file_image(file_id, image_ptr, (size_t)(image_size - 1)); } - H5E_END_TRY; + H5E_END_TRY VERIFY(bytes_read < 0, "H5Fget_file_image(2 -- test 1) succeeded."); /* Call H5Fget_file_image() with good buffer and buffer size, @@ -1079,7 +1079,7 @@ test_get_file_image_error_rejection(void) { bytes_read = H5Fget_file_image((hid_t)0, image_ptr, (size_t)(image_size)); } - H5E_END_TRY; + H5E_END_TRY VERIFY(bytes_read < 0, "H5Fget_file_image(3 -- test 1) succeeded."); /* Call H5Fget_file_image() with good buffer and buffer size, @@ -1089,7 +1089,7 @@ test_get_file_image_error_rejection(void) { bytes_read = H5Fget_file_image(dset_id, image_ptr, (size_t)(image_size)); } - H5E_END_TRY; + H5E_END_TRY VERIFY(bytes_read < 0, "H5Fget_file_image(4 -- test 1) succeeded."); /* Close dset and space */ @@ -1193,7 +1193,7 @@ test_get_file_image_error_rejection(void) { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(image_size == -1, "H5Fget_file_image(5) succeeded."); /* Close dset and space */ @@ -1255,7 +1255,7 @@ test_get_file_image_error_rejection(void) { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(image_size == -1, "H5Fget_file_image(6) succeeded."); /* Close dset and space */ @@ -1315,7 +1315,7 @@ test_get_file_image_error_rejection(void) { image_size = H5Fget_file_image(file_id, NULL, (size_t)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(image_size == -1, "H5Fget_file_image(7) succeeded."); /* Close dset and space */ diff --git a/test/fillval.c b/test/fillval.c index 489aa76..a9f4297 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -87,7 +87,7 @@ error: { H5Tclose(ret_value); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -140,7 +140,7 @@ error: H5Tclose(str_id); H5Tclose(ret_value); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end create_compound_vl_type() */ @@ -199,7 +199,7 @@ test_getset(void) { H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i); } - H5E_END_TRY; + H5E_END_TRY if (fill_i != 0) { H5_FAILED(); HDputs(" H5Pget_fill_value() should return default 0"); @@ -268,7 +268,7 @@ error: H5Tclose(type_si); H5Tclose(type_ss); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -384,7 +384,7 @@ error: H5E_BEGIN_TRY { } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_getset_vl() */ @@ -513,7 +513,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (H5Dcreate2(file, "dset7", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY } /* II. Test early space allocation cases */ @@ -566,7 +566,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (H5Dcreate2(file, "dset7", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT) != FAIL) goto error; } - H5E_END_TRY; + H5E_END_TRY /* Close everything */ if (H5D_COMPACT != layout) { @@ -842,7 +842,7 @@ error: H5Dclose(dset8); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1178,7 +1178,7 @@ error: H5Sclose(fspace); H5Sclose(mspace); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1377,7 +1377,7 @@ error: H5Tclose(ctype_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return nerrors; } @@ -2027,7 +2027,7 @@ error: H5Sclose(fspace); H5Sclose(mspace); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_extend_cases() */ @@ -2177,7 +2177,7 @@ error: H5Pclose(dcpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; skip: @@ -2189,7 +2189,7 @@ skip: H5Pclose(dcpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 0; } /* end test_extend() */ @@ -2343,7 +2343,7 @@ error: H5Dclose(dset2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2466,7 +2466,7 @@ error: H5Sclose(fspace); H5Sclose(rspace); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2613,7 +2613,7 @@ error: H5Pclose(dcpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return nerrors; } diff --git a/test/filter_fail.c b/test/filter_fail.c index 172027c..f2f1c3d 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -165,7 +165,7 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled) { ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, points); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDputs(" Data writing is supposed to fail because the chunk can't be written to file."); @@ -186,7 +186,7 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled) { ret = H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDputs(" Dataset is supposed to fail because the chunk can't be flushed to file."); @@ -214,7 +214,7 @@ error: H5Dclose(dataset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_filter_write() */ @@ -355,7 +355,7 @@ error: H5Dclose(dataset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_filter_read() */ diff --git a/test/filter_plugin.c b/test/filter_plugin.c index 96e114a..1e853e7 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -1333,7 +1333,7 @@ test_filter_numbers(void) id = H5Z_FILTER_MAX + 1; status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (status != FAIL) @@ -1344,7 +1344,7 @@ test_filter_numbers(void) id = -1; status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (status != FAIL) @@ -1358,7 +1358,7 @@ test_filter_numbers(void) id = H5Z_FILTER_MAX + 1; status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (status != FAIL) @@ -1369,7 +1369,7 @@ test_filter_numbers(void) id = -1; status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (status != FAIL) @@ -1388,7 +1388,7 @@ error: { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_filter_numbers() */ diff --git a/test/flush1.c b/test/flush1.c index f0f1093..f9fcf9c 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -99,7 +99,7 @@ error: H5Gclose(gid); H5Gclose(top_gid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end create_file() */ @@ -163,7 +163,7 @@ error: H5Sclose(sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY HDfree(data); @@ -330,7 +330,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDexit(EXIT_FAILURE); } /* end main() */ diff --git a/test/flush2.c b/test/flush2.c index d5461d6..bc5d409 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -100,7 +100,7 @@ error: H5Sclose(sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY HDfree(data); @@ -164,7 +164,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end file_ok() */ @@ -217,7 +217,7 @@ error: H5Pclose(new_fapl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end clear_status_flags() */ diff --git a/test/flushrefresh.c b/test/flushrefresh.c index 28d4638..5201404 100644 --- a/test/flushrefresh.c +++ b/test/flushrefresh.c @@ -1084,7 +1084,7 @@ flush_verification(const char *obj_pathname, const char *expected) oid = H5Oopen(fid, obj_pathname, H5P_DEFAULT); status = H5Oget_info3(oid, &oinfo, H5O_INFO_BASIC); } - H5E_END_TRY; + H5E_END_TRY /* Compare to expected result */ if (HDstrcmp(expected, FLUSHED) == 0) { @@ -1112,7 +1112,7 @@ flush_verification(const char *obj_pathname, const char *expected) H5Oclose(oid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return SUCCEED; diff --git a/test/freespace.c b/test/freespace.c index 60238d8..e163152 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -551,7 +551,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_fs_create() */ @@ -899,7 +899,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_fs_sect_add() */ @@ -1271,7 +1271,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_fs_sect_find() */ @@ -1747,7 +1747,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_fs_sect_merge() */ @@ -2111,7 +2111,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_sect_shrink() */ @@ -2386,7 +2386,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_sect_change_class() */ @@ -2764,7 +2764,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_sect_extend() */ @@ -2868,7 +2868,7 @@ error: H5FS_close(f, frsp); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_fs_sect_iterate() */ @@ -2927,7 +2927,7 @@ error: { H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/gen_bad_offset.c b/test/gen_bad_offset.c index d07ff96..e9e3393 100644 --- a/test/gen_bad_offset.c +++ b/test/gen_bad_offset.c @@ -139,7 +139,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return EXIT_FAILURE; } /* end main() */ diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c index 812d9a8..917ebc0 100644 --- a/test/gen_bad_ohdr.c +++ b/test/gen_bad_ohdr.c @@ -110,7 +110,7 @@ error: H5Pclose(gcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY #else /* H5O_ENABLE_BAD_MESG_COUNT */ HDputs("H5O_BAD_MESG_COUNT compiler macro not defined!"); #endif /* H5O_ENABLE_BAD_MESG_COUNT */ diff --git a/test/gen_bogus.c b/test/gen_bogus.c index c7c3964..99e459f 100644 --- a/test/gen_bogus.c +++ b/test/gen_bogus.c @@ -133,7 +133,7 @@ error: H5Sclose(sid); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* generate_datasets() */ @@ -177,7 +177,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY #else /* H5O_ENABLE_BOGUS */ HDputs("H5O_ENABLE_BOGUS compiler macro not defined!"); #endif /* H5O_ENABLE_BOGUS */ diff --git a/test/gen_bounds.c b/test/gen_bounds.c index fb765f7..4ff9799 100644 --- a/test/gen_bounds.c +++ b/test/gen_bounds.c @@ -236,7 +236,7 @@ error: H5Fclose(fid); HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_earliest_latest */ @@ -351,7 +351,7 @@ error: H5Fclose(fid); HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_earliest_v18 */ @@ -461,7 +461,7 @@ error: H5Fclose(fid); HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_latest_latest */ @@ -577,7 +577,7 @@ error: H5Fclose(fid); HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_v18_latest */ @@ -739,7 +739,7 @@ error: H5Fclose(fid); HDfree(buf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_v18_v18 */ @@ -952,7 +952,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1203,7 +1203,7 @@ error: H5Fclose(fid); HDfree(dwbuf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; diff --git a/test/gen_cross.c b/test/gen_cross.c index c468039..143451d 100644 --- a/test/gen_cross.c +++ b/test/gen_cross.c @@ -176,7 +176,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -264,7 +264,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -352,7 +352,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -448,7 +448,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -544,7 +544,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -640,7 +640,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -737,7 +737,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -825,7 +825,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -921,7 +921,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; #endif /* H5_HAVE_FILTER_DEFLATE */ @@ -1012,7 +1012,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1101,7 +1101,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1210,7 +1210,7 @@ error: H5Pclose(dcpl); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } diff --git a/test/gen_deflate.c b/test/gen_deflate.c index b103559..a3ba2c6 100644 --- a/test/gen_deflate.c +++ b/test/gen_deflate.c @@ -111,7 +111,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return EXIT_FAILURE; } /* end main() */ diff --git a/test/gen_file_image.c b/test/gen_file_image.c index 03065c6..b2faefd 100644 --- a/test/gen_file_image.c +++ b/test/gen_file_image.c @@ -87,7 +87,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return EXIT_FAILURE; } /* end main() */ diff --git a/test/gen_filespace.c b/test/gen_filespace.c index b9baa82..69c1c1e 100644 --- a/test/gen_filespace.c +++ b/test/gen_filespace.c @@ -114,6 +114,6 @@ error: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } diff --git a/test/gen_filters.c b/test/gen_filters.c index c171538..35bfc04 100644 --- a/test/gen_filters.c +++ b/test/gen_filters.c @@ -101,7 +101,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_filters_endianess() */ @@ -217,7 +217,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } diff --git a/test/gen_new_fill.c b/test/gen_new_fill.c index 5669802..c0b11b5 100644 --- a/test/gen_new_fill.c +++ b/test/gen_new_fill.c @@ -98,6 +98,6 @@ error: H5Dclose(dset2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/gen_new_group.c b/test/gen_new_group.c index d58d159..a9d9af7 100644 --- a/test/gen_new_group.c +++ b/test/gen_new_group.c @@ -117,6 +117,6 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/gen_old_group.c b/test/gen_old_group.c index f777ed3..393c3f5 100644 --- a/test/gen_old_group.c +++ b/test/gen_old_group.c @@ -58,6 +58,6 @@ error: H5Dclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/getname.c b/test/getname.c index f1d43ea..7900279 100644 --- a/test/getname.c +++ b/test/getname.c @@ -1531,7 +1531,7 @@ test_main(hid_t file_id, hid_t fapl) if (H5Iget_name(type_id, name, NAME_BUF_SIZE) > 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Get name for dataspace, it should fail */ H5E_BEGIN_TRY @@ -1539,7 +1539,7 @@ test_main(hid_t file_id, hid_t fapl) if (H5Iget_name(space_id, name, NAME_BUF_SIZE) > 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY } /* Close */ @@ -3080,7 +3080,7 @@ test_main(hid_t file_id, hid_t fapl) if ((size = H5Iget_name(dtype, NULL, 0)) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY if (H5Tcommit_anon(file2_id, dtype, H5P_DEFAULT, H5P_DEFAULT)) TEST_ERROR; @@ -3805,7 +3805,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY HDputs("***** GET NAME TESTS FAILED *****"); diff --git a/test/gheap.c b/test/gheap.c index 58b7fe2..5a37f9e 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -37,15 +37,15 @@ #define GHEAP_TEST_NOBJS 1024 #define GHEAP_REPEATED_ERR(MSG) \ - { \ + do { \ nerrors++; \ if (nerrors <= GHEAP_REPEATED_ERR_LIM) { \ H5_FAILED(); \ HDputs(MSG); \ if (nerrors == GHEAP_REPEATED_ERR_LIM) \ HDputs(" Suppressing further errors..."); \ - } /* end if */ \ - } /* end GHEAP_REPEATED_ERR */ + } /* end if */ \ + } while (0) /* end GHEAP_REPEATED_ERR */ const char *FILENAME[] = {"gheap1", "gheap2", "gheap3", "gheap4", "gheapooo", NULL}; @@ -152,7 +152,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) HDfree(obj); return MAX(1, nerrors); @@ -252,7 +252,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) HDfree(obj); return MAX(1, nerrors); @@ -342,7 +342,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) HDfree(obj); return MAX(1, nerrors); @@ -438,7 +438,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) HDfree(obj); return MAX(1, nerrors); @@ -499,7 +499,7 @@ test_ooo_indices(hid_t fapl) H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, sizeof(j), &j, &obj[j]); if (status < 0) - GHEAP_REPEATED_ERR(" Unable to insert object into global heap") + GHEAP_REPEATED_ERR(" Unable to insert object into global heap"); /* Check that the index is as expected */ if (obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1U << 16) - 1) + 1) @@ -557,7 +557,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) HDfree(obj); return MAX(1, nerrors); @@ -615,7 +615,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/h5test.c b/test/h5test.c index 5013135..c0e93b9 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -205,7 +205,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl) { H5Fdelete(filename, fapl); } - H5E_END_TRY; + H5E_END_TRY } /* end h5_delete_test_file() */ @@ -369,7 +369,7 @@ h5_reset(void) H5Fclose(file); HDunlink(filename); } - H5E_END_TRY; + H5E_END_TRY } #endif /* OLD_WAY */ } @@ -1594,7 +1594,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } diff --git a/test/hdfs.c b/test/hdfs.c index bf8e840..c1404f7 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -548,7 +548,7 @@ test_fapl_config_validation(void) */ success = H5Pset_fapl_hdfs(fapl_id, &case_ptr->config); } - H5E_END_TRY; + H5E_END_TRY JSVERIFY(case_ptr->expected, success, case_ptr->msg) @@ -590,7 +590,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; #endif /* H5_HAVE_LIBHDFS */ @@ -674,7 +674,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_HAVE_LIBHDFS */ @@ -862,7 +862,7 @@ test_vfd_open(void) { fd = H5FDopen(T.url, T.flags, fapl_id, T.maxaddr); } - H5E_END_TRY; + H5E_END_TRY if (NULL != fd) { if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) { HDfprintf(stderr, "\n!!!!! WARNING !!!!!\n" @@ -926,7 +926,7 @@ error: (void)H5Pclose(fapl_unconfigured); } } - H5E_END_TRY; + H5E_END_TRY return 1; @@ -1046,7 +1046,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1114,7 +1114,7 @@ test_H5FDread_without_eoa_set_fails(void) H5E_BEGIN_TRY{/* mute stack trace on expected failure */ JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer), - "cannot read before eoa is set")} H5E_END_TRY; + "cannot read before eoa is set")} H5E_END_TRY for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) { JSVERIFY(0, (unsigned)buffer[i], "buffer was modified by write!") } @@ -1146,7 +1146,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1316,7 +1316,7 @@ test_read(void) { open_return = H5FDread(file_raven, H5FD_MEM_DRAW, H5P_DEFAULT, test.addr, test.len, buffer); } - H5E_END_TRY; + H5E_END_TRY JSVERIFY(test.success, open_return, test.message) @@ -1353,7 +1353,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1433,12 +1433,12 @@ test_noops_and_autofails(void) /* auto-fail calls to write and truncate */ H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data), - "write must fail")} H5E_END_TRY; + "write must fail")} H5E_END_TRY - H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY; + H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY H5E_BEGIN_TRY{ - JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY; + JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY /************ * TEARDOWN * @@ -1464,7 +1464,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (file != NULL) { (void)H5FDclose(file); @@ -1566,12 +1566,11 @@ test_H5F_integration(void) /* Read-Write Open access is not allowed with this file driver. */ - H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(filename_example_h5, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY; + H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(filename_example_h5, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY /* H5Fcreate() is not allowed with this file driver. */ - H5E_BEGIN_TRY{ - FAIL_IF(0 <= H5Fcreate(filename_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY; + H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(filename_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY /* Successful open. */ @@ -1606,7 +1605,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (file > 0) { (void)H5Fclose(file); diff --git a/test/lheap.c b/test/lheap.c index 7db032e..c527fe2 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -221,7 +221,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/links.c b/test/links.c index 516c195..2ab7f59 100644 --- a/test/links.c +++ b/test/links.c @@ -535,13 +535,13 @@ new_links(hid_t fapl, hbool_t new_format) if (H5Lcreate_hard(H5L_SAME_LOC, "dataset1", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY H5E_BEGIN_TRY { if (H5Lcreate_soft("dataset1", H5L_SAME_LOC, "soft", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create links across files with hard link. Should fail. */ H5E_BEGIN_TRY @@ -549,7 +549,7 @@ new_links(hid_t fapl, hbool_t new_format) if (H5Lcreate_hard(file_a, "dataset1", file_b, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create hard link to test H5L_SAME_LOC */ if (H5Lcreate_hard(grp1_a, "dataset2", H5L_SAME_LOC, "hard1", H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -595,7 +595,7 @@ error: H5Fclose(file_a); H5Fclose(file_b); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -667,7 +667,7 @@ cklinks(hid_t fapl, hbool_t new_format) { status = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Lexists() should have failed for a path with missing components."); @@ -677,7 +677,7 @@ cklinks(hid_t fapl, hbool_t new_format) { status = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Lexists() should have failed for a path with missing components."); @@ -715,7 +715,7 @@ cklinks(hid_t fapl, hbool_t new_format) { status = H5Oget_info_by_name3(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Oget_info_by_name() should have failed for a dangling link."); @@ -746,7 +746,7 @@ cklinks(hid_t fapl, hbool_t new_format) { status = H5Oget_info_by_name3(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Oget_info_by_name() should have failed for a recursive link."); @@ -924,7 +924,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(objname); return FAIL; } @@ -1083,7 +1083,7 @@ toomany(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "soft17", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for sequence of too many nested links."); @@ -1124,7 +1124,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end toomany() */ @@ -1337,7 +1337,7 @@ error: H5Sclose(space_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_lcpl() */ @@ -1394,7 +1394,7 @@ test_move(hid_t fapl, hbool_t new_format) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Move a group across files. Should fail. */ H5E_BEGIN_TRY @@ -1402,7 +1402,7 @@ test_move(hid_t fapl, hbool_t new_format) if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Move a soft link across files. Should succeed. */ if (H5Lmove(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -1431,7 +1431,7 @@ test_move(hid_t fapl, hbool_t new_format) { moved_grp = H5Gopen2(grp_1, "group_move", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (moved_grp >= 0) { H5_FAILED(); HDputs(" Group still in original location?"); @@ -1482,7 +1482,7 @@ test_move(hid_t fapl, hbool_t new_format) if ((moved_grp = H5Gopen2(grp_1, "group_copy", H5P_DEFAULT)) >= 0) FAIL_STACK_ERROR; } - H5E_END_TRY; + H5E_END_TRY H5Gclose(grp_1); H5Gclose(grp_2); @@ -1504,7 +1504,7 @@ error: H5Fclose(file_a); H5Fclose(file_b); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1561,7 +1561,7 @@ test_copy(hid_t fapl, hbool_t new_format) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Copy a group across files. Should fail. */ H5E_BEGIN_TRY @@ -1569,7 +1569,7 @@ test_copy(hid_t fapl, hbool_t new_format) if (H5Lcopy(grp_1, "group_copy", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Copy a soft link across files. Should succeed. */ if (H5Lcopy(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -1678,7 +1678,7 @@ error: H5Fclose(file_a); H5Fclose(file_b); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1918,7 +1918,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_move_preserves() */ @@ -1989,7 +1989,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objname_by_idx(group1_id, (hsize_t)1, tmpstr, sizeof(tmpstr)) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Test getting the type for objects */ if ((obj_type = H5Gget_objtype_by_idx(group1_id, (hsize_t)0)) < 0) @@ -2001,7 +2001,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objtype_by_idx(group1_id, (hsize_t)1) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Test getting the number of objects in a group */ if (H5Gget_num_objs(file_id, &num_objs) < 0) @@ -2058,7 +2058,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", TRUE, NULL) >= 0) FAIL_STACK_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Test the dangling soft link */ if (H5Gget_objinfo(file_id, "/group2/dangle_soft_link", FALSE, &sb_soft2) < 0) @@ -2105,7 +2105,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gopen2(file_id, "moved_group1/moved_group2", H5P_DEFAULT) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; @@ -2120,7 +2120,7 @@ error: H5Gclose(group1_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_deprec() */ @@ -2185,7 +2185,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) { exists = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (exists >= 0) { H5_FAILED(); HDputs(" H5Lexists() should have failed for a path with missing components."); @@ -2195,7 +2195,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) { exists = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (exists >= 0) { H5_FAILED(); HDputs(" H5Lexists() should have failed for a path with missing components."); @@ -2231,7 +2231,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) { status = H5Oget_info_by_name2(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Oget_info_by_name() should have failed for a dangling link."); @@ -2262,7 +2262,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) { status = H5Oget_info_by_name2(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" H5Oget_info_by_name() should have failed for a recursive link."); @@ -2510,7 +2510,7 @@ error: H5Sclose(space_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_lcpl_deprec() */ @@ -2751,7 +2751,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_move_preserves_deprec() */ @@ -2969,7 +2969,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_root_deprec() */ @@ -3123,7 +3123,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_query_deprec() */ @@ -3438,7 +3438,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* external_link_closing_deprec() */ @@ -3761,7 +3761,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_hard_links_deprec() */ @@ -3945,7 +3945,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_link_reregister_deprec() */ @@ -4112,7 +4112,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_callbacks_deprec() */ @@ -4258,7 +4258,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format) { gid = H5Oopen(fid, "soft5", plist); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for sequence of too many nested links."); @@ -4420,7 +4420,7 @@ error: H5Pclose(plist); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end lapl_nlinks_deprec() */ @@ -4532,7 +4532,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end linkinfo_deprec() */ @@ -4674,7 +4674,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_create_compact_deprec() */ @@ -4837,7 +4837,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_create_dense_deprec() */ @@ -5126,7 +5126,7 @@ link_info_by_idx_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5134,7 +5134,7 @@ link_info_by_idx_deprec(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -5178,7 +5178,7 @@ link_info_by_idx_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5186,7 +5186,7 @@ link_info_by_idx_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5194,7 +5194,7 @@ link_info_by_idx_deprec(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -5238,7 +5238,7 @@ link_info_by_idx_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5246,7 +5246,7 @@ link_info_by_idx_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5254,7 +5254,7 @@ link_info_by_idx_deprec(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -5283,7 +5283,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_info_by_idx_deprec() */ @@ -5454,7 +5454,7 @@ link_info_by_idx_old_deprec(hid_t fapl) ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -5462,7 +5462,7 @@ link_info_by_idx_old_deprec(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -5489,7 +5489,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_info_by_idx_old_deprec() */ @@ -5596,7 +5596,7 @@ delete_by_idx_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5605,7 +5605,7 @@ delete_by_idx_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5637,7 +5637,7 @@ delete_by_idx_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5711,7 +5711,7 @@ delete_by_idx_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5763,7 +5763,7 @@ delete_by_idx_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5897,7 +5897,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end delete_by_idx_deprec() */ @@ -5951,7 +5951,7 @@ delete_by_idx_old_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5981,7 +5981,7 @@ delete_by_idx_old_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -5990,7 +5990,7 @@ delete_by_idx_old_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6037,7 +6037,7 @@ delete_by_idx_old_deprec(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6163,7 +6163,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end delete_by_idx_old_deprec() */ @@ -6427,7 +6427,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o { ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_fail_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6593,7 +6593,7 @@ link_iterate_deprec(hid_t fapl) { ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6626,7 +6626,7 @@ link_iterate_deprec(hid_t fapl) { ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6665,7 +6665,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (visited) HDfree(visited); @@ -6910,7 +6910,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma { ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6920,7 +6920,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma { ret = H5Literate1((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -6928,7 +6928,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma { ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_deprec_cb, iter_info); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -7023,7 +7023,7 @@ link_iterate_old_deprec(hid_t fapl) { ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -7034,7 +7034,7 @@ link_iterate_old_deprec(hid_t fapl) { ret = H5Literate1(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_deprec_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -7066,7 +7066,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (visited) HDfree(visited); @@ -7289,7 +7289,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_root() */ @@ -7411,7 +7411,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_path() */ @@ -7610,7 +7610,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_mult() */ @@ -7791,7 +7791,7 @@ error: H5Pclose(lcpl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_self() */ @@ -7935,7 +7935,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_pingpong() */ @@ -8061,7 +8061,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "link1", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDprintf("%d: Should have failed for sequence of too many nested links.", __LINE__); @@ -8104,7 +8104,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_toomany() */ @@ -8171,7 +8171,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "no_file", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for sequence of too many nested links."); @@ -8183,7 +8183,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "no_object", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for sequence of too many nested links."); @@ -8195,7 +8195,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format) { status = H5Lget_name_by_idx(rid, "no_file", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs( @@ -8219,7 +8219,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_dangling() */ @@ -8294,7 +8294,7 @@ external_link_prefix(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", gapl_id); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */ if (gid < 0) { @@ -8318,7 +8318,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_prefix() */ @@ -8391,7 +8391,7 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file from absolute path set for main file */ if (gid < 0) { @@ -8415,7 +8415,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_abs_mainpath() */ @@ -8479,7 +8479,7 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file from the main file's relative pathname */ if (gid < 0) { @@ -8503,7 +8503,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_rel_mainpath() */ @@ -8572,7 +8572,7 @@ external_link_cwd(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file from the current working directory */ if (gid < 0) { @@ -8596,7 +8596,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_cwd() */ @@ -8670,7 +8670,7 @@ external_link_abstar(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file with absolute path */ if (gid < 0) { @@ -8694,7 +8694,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_abstar() */ @@ -8768,7 +8768,7 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file from main file's current working directory */ if (gid < 0) { @@ -8792,7 +8792,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_abstar_cur() */ @@ -8873,7 +8873,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_reltar() */ @@ -8943,7 +8943,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (HDchdir("..") < 0) TEST_ERROR; @@ -8973,7 +8973,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_chdir() */ @@ -9187,7 +9187,7 @@ error: H5Oclose(oidB); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_set_elink_fapl1() */ @@ -9394,7 +9394,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(points); HDfree(points_data); @@ -9521,7 +9521,7 @@ error: H5Pclose(core_fapl); H5Pclose(stdio_fapl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_set_elink_fapl3() */ @@ -9578,7 +9578,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { group = H5Gcreate2(file1, "/ext_link/group", H5P_DEFAULT, H5P_DEFAULT, gapl); } - H5E_END_TRY; + H5E_END_TRY if (group != FAIL) TEST_ERROR; @@ -9609,7 +9609,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { subgroup = H5Gcreate2(file1, "/ext_link/group/subgroup", H5P_DEFAULT, H5P_DEFAULT, gapl); } - H5E_END_TRY; + H5E_END_TRY if (subgroup != FAIL) TEST_ERROR; @@ -9629,21 +9629,21 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_TRUNC); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_EXCL); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; H5E_BEGIN_TRY { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_CREAT); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; /* SWMR reader with write access */ @@ -9651,7 +9651,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR | H5F_ACC_SWMR_READ); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; /* SWMR writer with read-only access */ @@ -9659,7 +9659,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE); } - H5E_END_TRY; + H5E_END_TRY if (ret != FAIL) TEST_ERROR; @@ -9775,28 +9775,28 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo { file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file1 != FAIL) TEST_ERROR; H5E_BEGIN_TRY { file1 = H5Fcreate(filename1, H5F_ACC_TRUNC | H5F_ACC_DEFAULT, H5P_DEFAULT, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file1 != FAIL) TEST_ERROR; H5E_BEGIN_TRY { file1 = H5Fopen(filename1, H5F_ACC_DEFAULT, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file1 != FAIL) TEST_ERROR; H5E_BEGIN_TRY { file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_DEFAULT, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file1 != FAIL) TEST_ERROR; @@ -9816,7 +9816,7 @@ error: H5Fclose(file2); H5Pclose(gapl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_set_elink_acc_flags() */ @@ -9981,7 +9981,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) { group = H5Gopen2(file1, "/group1/ext_link/group2", gapl); } - H5E_END_TRY; + H5E_END_TRY if (group != FAIL) TEST_ERROR; @@ -9993,7 +9993,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) { group = H5Gopen2(file1, "/group1/ext_link/group2", gapl); } - H5E_END_TRY; + H5E_END_TRY if (group != FAIL) TEST_ERROR; @@ -10016,7 +10016,7 @@ error: H5Pclose(ret_fapl); H5Pclose(fam_fapl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_set_elink_cb() */ @@ -10074,7 +10074,7 @@ external_reset_register(void) { H5Fdelete(filename, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY PASSED(); return SUCCEED; @@ -10084,7 +10084,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_reset_register() */ @@ -10156,7 +10156,7 @@ external_link_win1(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via main file's CWD*/ if (gid < 0) { @@ -10180,7 +10180,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win1() */ @@ -10253,7 +10253,7 @@ external_link_win2(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file directly */ if (gid < 0) { @@ -10277,7 +10277,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win2() */ @@ -10347,7 +10347,7 @@ external_link_win3(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file directly */ if (gid < 0) { @@ -10371,7 +10371,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win3() */ @@ -10438,7 +10438,7 @@ external_link_win4(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via main file's absolute drive/relative path */ if (gid < 0) { @@ -10462,7 +10462,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win4() */ @@ -10539,7 +10539,7 @@ external_link_win5(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via main file's rel drive/abs path */ if (gid < 0) { @@ -10563,7 +10563,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win5() */ @@ -10637,7 +10637,7 @@ external_link_win6(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via target file's rel path in current drive */ if (gid < 0) { @@ -10661,7 +10661,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win6() */ @@ -10732,7 +10732,7 @@ external_link_win7(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via main file's local host/main drive*/ if (gid < 0) { @@ -10756,7 +10756,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win7() */ @@ -10832,7 +10832,7 @@ external_link_win8(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file directly */ if (gid < 0) { @@ -10856,7 +10856,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win8() */ @@ -10927,7 +10927,7 @@ external_link_win9(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* should be able to find the target file via main file's local host/main drive*/ if (gid < 0) { @@ -10951,7 +10951,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_win9() */ @@ -11002,7 +11002,7 @@ external_link_recursive(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "recursive", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for recursive external links."); @@ -11022,7 +11022,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_recursive() */ @@ -11176,7 +11176,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_query() */ @@ -11269,7 +11269,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_unlink_compact() */ @@ -11446,7 +11446,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_unlink_dense() */ @@ -11680,7 +11680,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_move() */ @@ -11912,7 +11912,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_ride() */ @@ -12227,7 +12227,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* external_link_closing() */ @@ -12313,7 +12313,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -12418,7 +12418,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_strong() */ @@ -12695,7 +12695,7 @@ error: H5Fclose(file2); H5Fclose(file1); } - H5E_END_TRY; + H5E_END_TRY HDfree(filename1); HDfree(filename2a); @@ -14150,7 +14150,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_hard_links() */ @@ -14362,7 +14362,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_link_reregister() */ @@ -14673,7 +14673,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_callbacks() */ @@ -14828,7 +14828,7 @@ error: H5Gclose(gid2); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end lapl_udata() */ @@ -15100,7 +15100,7 @@ ud_link_errors(hid_t fapl, hbool_t new_format) if (H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, NULL, 1, H5P_DEFAULT, H5P_DEFAULT) >= 0) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Create a user-defined link to the group. */ HDstrcpy(group_name, "/group"); @@ -15208,7 +15208,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end ud_link_errors() */ @@ -15354,7 +15354,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format) { gid = H5Oopen(fid, "soft5", plist); } - H5E_END_TRY; + H5E_END_TRY if (gid >= 0) { H5_FAILED(); HDputs(" Should have failed for sequence of too many nested links."); @@ -15516,7 +15516,7 @@ error: H5Pclose(plist); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end lapl_nlinks() */ @@ -15628,7 +15628,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end linkinfo() */ @@ -15680,7 +15680,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end check_all_closed() */ @@ -15809,7 +15809,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end build_visit_file() */ @@ -15912,7 +15912,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_visit() */ @@ -16000,7 +16000,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_visit_by_name() */ @@ -16107,7 +16107,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end obj_visit() */ @@ -16204,7 +16204,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end obj_visit_by_name() */ @@ -16287,7 +16287,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end obj_visit_stop() */ @@ -16765,7 +16765,7 @@ error: H5Pclose(gcpl2); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_filters() */ @@ -17094,7 +17094,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end obj_exists() */ @@ -17139,7 +17139,7 @@ corder_create_empty(hid_t fapl) { ret = H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_INDEXED); } - H5E_END_TRY; + H5E_END_TRY if (ret > 0) { H5_FAILED(); HDputs( @@ -17223,7 +17223,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_create_empty() */ @@ -17365,7 +17365,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_create_compact() */ @@ -17528,7 +17528,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_create_dense() */ @@ -17824,7 +17824,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_transition() */ @@ -17975,7 +17975,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end corder_delete() */ @@ -18259,7 +18259,7 @@ link_info_by_idx(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18267,7 +18267,7 @@ link_info_by_idx(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -18311,7 +18311,7 @@ link_info_by_idx(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18319,7 +18319,7 @@ link_info_by_idx(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18327,7 +18327,7 @@ link_info_by_idx(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -18371,7 +18371,7 @@ link_info_by_idx(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18379,7 +18379,7 @@ link_info_by_idx(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18387,7 +18387,7 @@ link_info_by_idx(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -18416,7 +18416,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_info_by_idx() */ @@ -18605,7 +18605,7 @@ link_info_by_idx_old(hid_t fapl) ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY @@ -18613,7 +18613,7 @@ link_info_by_idx_old(hid_t fapl) name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) TEST_ERROR; @@ -18640,7 +18640,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end link_info_by_idx_old() */ @@ -18747,7 +18747,7 @@ delete_by_idx(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -18756,7 +18756,7 @@ delete_by_idx(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -18788,7 +18788,7 @@ delete_by_idx(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -18862,7 +18862,7 @@ delete_by_idx(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -18914,7 +18914,7 @@ delete_by_idx(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19048,7 +19048,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end delete_by_idx() */ @@ -19111,7 +19111,7 @@ delete_by_idx_old(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19142,7 +19142,7 @@ delete_by_idx_old(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19151,7 +19151,7 @@ delete_by_idx_old(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19202,7 +19202,7 @@ delete_by_idx_old(hid_t fapl) { ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19337,7 +19337,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end delete_by_idx_old() */ @@ -19616,7 +19616,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u { ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_fail_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19782,7 +19782,7 @@ link_iterate(hid_t fapl) { ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19815,7 +19815,7 @@ link_iterate(hid_t fapl) { ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -19854,7 +19854,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (visited) HDfree(visited); @@ -20113,7 +20113,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links { ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20123,7 +20123,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links { ret = H5Literate2((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20132,7 +20132,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links { ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_cb, iter_info); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -20225,7 +20225,7 @@ link_iterate_old(hid_t fapl) { ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20236,7 +20236,7 @@ link_iterate_old(hid_t fapl) { ret = H5Literate2(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20268,7 +20268,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (visited) HDfree(visited); @@ -20518,7 +20518,7 @@ open_by_idx(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20558,7 +20558,7 @@ open_by_idx(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20602,7 +20602,7 @@ open_by_idx(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20649,7 +20649,7 @@ error: H5Fclose(file_id); H5Fclose(mount_file_id); } - H5E_END_TRY; + H5E_END_TRY if (objno) HDfree(objno); @@ -20833,7 +20833,7 @@ open_by_idx_old(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20872,7 +20872,7 @@ open_by_idx_old(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20881,7 +20881,7 @@ open_by_idx_old(hid_t fapl) { ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -20917,7 +20917,7 @@ error: H5Fclose(file_id); H5Fclose(mount_file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end open_by_idx_old() */ @@ -21141,7 +21141,7 @@ object_info(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21198,7 +21198,7 @@ object_info(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21259,7 +21259,7 @@ object_info(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21302,7 +21302,7 @@ error: H5Gclose(soft_group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (objno) HDfree(objno); @@ -21459,7 +21459,7 @@ object_info_old(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21515,7 +21515,7 @@ object_info_old(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21525,7 +21525,7 @@ object_info_old(hid_t fapl) ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21561,7 +21561,7 @@ error: H5Gclose(soft_group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end object_info_old() */ @@ -21692,7 +21692,7 @@ group_info(hid_t fapl) ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -21884,7 +21884,7 @@ group_info(hid_t fapl) ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -22076,7 +22076,7 @@ group_info(hid_t fapl) ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -22110,7 +22110,7 @@ error: H5Gclose(soft_group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end group_info() */ @@ -22172,7 +22172,7 @@ group_info_old(hid_t fapl) { ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -22362,7 +22362,7 @@ group_info_old(hid_t fapl) { ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -22372,7 +22372,7 @@ group_info_old(hid_t fapl) ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, &grp_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -22399,7 +22399,7 @@ error: H5Gclose(soft_group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end group_info_old() */ @@ -22636,7 +22636,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end timestamps() */ diff --git a/test/links_env.c b/test/links_env.c index 27e29ea..69a35f6 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -107,7 +107,7 @@ external_link_env(hid_t fapl, hbool_t new_format) { gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Should be able to find the target file from pathnames set via HDF5_EXT_PREFIX */ if (gid < 0) { @@ -131,7 +131,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end external_link_env() */ @@ -336,7 +336,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_eoa() */ @@ -627,7 +627,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_eoa_shrink() */ @@ -834,7 +834,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_eoa_extend() */ @@ -942,14 +942,14 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) { status = H5F_block_read(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf); } - H5E_END_TRY; + 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_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -958,7 +958,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) { status = H5MF_xfree(f, H5FD_MEM_SUPER, tmp_addr, (hsize_t)TBLOCK_SIZE30); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; @@ -999,7 +999,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) { check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3)); } - H5E_END_TRY; + H5E_END_TRY if (H5_addr_defined(check_addr)) TEST_ERROR; @@ -1008,7 +1008,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) { check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3)); } - H5E_END_TRY; + H5E_END_TRY if (H5_addr_defined(check_addr)) TEST_ERROR; @@ -1042,7 +1042,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_tmp() */ @@ -1134,7 +1134,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_start() */ @@ -1451,7 +1451,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_alloc_free() */ @@ -1972,7 +1972,7 @@ error: H5Pclose(fapl_new); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_extend() */ @@ -2155,7 +2155,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_absorb() */ @@ -2301,7 +2301,7 @@ error: H5Fclose(file); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc1() */ @@ -2445,7 +2445,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc2() */ @@ -2611,7 +2611,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc3() */ @@ -2779,7 +2779,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc4() */ @@ -2905,7 +2905,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc5() */ @@ -3068,7 +3068,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc6() */ @@ -3260,7 +3260,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_alloc7() */ @@ -3559,7 +3559,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_extend() */ @@ -3799,7 +3799,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_aggr_absorb() */ @@ -4096,7 +4096,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_eoa() */ @@ -4391,7 +4391,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_fs() */ @@ -4667,7 +4667,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_alloc1() */ @@ -4961,7 +4961,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_alloc2() */ @@ -5347,7 +5347,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_alloc3() */ @@ -5563,7 +5563,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_alloc4() */ @@ -5793,7 +5793,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_align_alloc5() */ @@ -6108,7 +6108,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_mf_align_alloc6() */ @@ -6285,7 +6285,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_bug1() */ @@ -6564,7 +6564,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_persist_split() */ @@ -6921,7 +6921,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_persist_multi() */ #endif /* PB_OUT */ @@ -7097,7 +7097,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl2); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_persist() */ @@ -7286,7 +7286,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl2); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_fs_gone() */ @@ -7455,7 +7455,7 @@ error: H5Pclose(fapl2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_strat_thres_persist() */ @@ -7644,7 +7644,7 @@ error: H5Pclose(fapl2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_mf_strat_thres_gone() */ @@ -7735,7 +7735,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_dichotomy() */ @@ -8017,7 +8017,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl_new); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_alloc_xfree() */ @@ -8148,7 +8148,7 @@ error: H5Fclose(fid); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_try_shrink() */ @@ -8328,7 +8328,7 @@ error: H5Fclose(fid); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_small_try_extend() */ @@ -8491,7 +8491,7 @@ error: H5Fclose(fid); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_large_try_extend() */ @@ -8646,7 +8646,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_large() */ @@ -8818,7 +8818,7 @@ error: H5Fclose(fid); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_small() */ @@ -9133,7 +9133,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl_new); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* test_page_alignment() */ @@ -9294,7 +9294,7 @@ error: H5Pclose(fapl); H5Pclose(new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 489a9c0..f950db0 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -262,7 +262,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_fapl_configuration() */ @@ -1274,7 +1274,7 @@ error: H5Pclose(splitter_config->rw_fapl_id); H5Pclose(ret_value); } - H5E_END_TRY; + H5E_END_TRY HDfree(splitter_config); return H5I_INVALID_HID; @@ -1329,7 +1329,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_create_and_close() */ @@ -1497,7 +1497,7 @@ error: */ H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY LOGPRINT(1, "_create_chunking_ids() FAILED\n"); @@ -1815,7 +1815,7 @@ error: H5Sclose(dspace_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_basic_dataset_write() */ @@ -1903,7 +1903,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_chunked_dataset_write() */ @@ -1995,7 +1995,7 @@ error: H5Gclose(grp_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_on_disk_zoo() */ @@ -2137,7 +2137,7 @@ error: H5Dclose(dset_id); H5Sclose(dspace_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_vanishing_datasets() */ @@ -2274,7 +2274,7 @@ error: H5Pclose(bundle[i].fapl_id); } } - H5E_END_TRY; + H5E_END_TRY HDfree(bundle); HDfree(buf); return -1; diff --git a/test/mount.c b/test/mount.c index 6807f36..8ea5fe9 100644 --- a/test/mount.c +++ b/test/mount.c @@ -97,7 +97,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end setup() */ @@ -151,7 +151,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_basic() */ @@ -197,7 +197,7 @@ test_illegal(hid_t fapl) { status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Mounting a file on itself should have failed."); @@ -217,7 +217,7 @@ test_illegal(hid_t fapl) { status = H5Fmount(mnt, ".", file3, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Mounting two files at one mount point should have failed."); @@ -242,7 +242,7 @@ test_illegal(hid_t fapl) { status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Mounting same file opened twice at one mount point should have failed."); @@ -260,7 +260,7 @@ test_illegal(hid_t fapl) { status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Creating a cycle with mount points should have failed."); @@ -294,7 +294,7 @@ error: H5Fclose(file3); H5Fclose(file3b); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_illegal() */ @@ -365,7 +365,7 @@ test_samefile(hid_t fapl) { status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Mounting different files at one mount point should have failed."); if (H5Funmount(mnt1a, ".") < 0) @@ -404,7 +404,7 @@ test_samefile(hid_t fapl) { status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Mounting same files at one mount point should have failed."); if (H5Funmount(mnt1a, ".") < 0) @@ -437,7 +437,7 @@ error: H5Fclose(file2); H5Fclose(file3); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_samefile() */ @@ -486,7 +486,7 @@ test_hide(hid_t fapl) { grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (grp >= 0) { H5_FAILED(); HDputs(" Name is still accessible under mount point."); @@ -536,7 +536,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_hide() */ @@ -622,7 +622,7 @@ error: H5Fclose(file2); H5Fclose(file1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_assoc() */ @@ -690,7 +690,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_mntlnk() */ @@ -735,7 +735,7 @@ test_move(hid_t fapl) { status = H5Lmove(file1, "/mnt1/rename_b/y", H5L_SAME_LOC, "/y", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Moving an object across files shouldn't have been possible"); @@ -759,7 +759,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_move() */ @@ -825,7 +825,7 @@ error: H5Fclose(file2); H5Fclose(file1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_preopen() */ @@ -898,7 +898,7 @@ error: H5Fclose(file2); H5Fclose(file1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_postopen() */ @@ -965,7 +965,7 @@ test_unlink(hid_t fapl) { status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Incorrect traversal from mount point!"); @@ -986,7 +986,7 @@ test_unlink(hid_t fapl) { status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Traversal through mount point should not have worked!"); @@ -996,7 +996,7 @@ test_unlink(hid_t fapl) { status = H5Oget_info_by_name3(file2, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Traversal through mount point should not have worked!"); @@ -1012,7 +1012,7 @@ test_unlink(hid_t fapl) { status = H5Funmount(file1, "/mnt_unlink"); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__); @@ -1022,7 +1022,7 @@ test_unlink(hid_t fapl) { status = H5Funmount(file2, "/"); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__); @@ -1052,7 +1052,7 @@ error: H5Fclose(file2); H5Fclose(file1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlink() */ @@ -1113,7 +1113,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_mvmpt() */ @@ -1158,7 +1158,7 @@ test_interlink(hid_t fapl) { status = H5Lcreate_hard(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Interfile hard link should not have been allowed!"); @@ -1170,7 +1170,7 @@ test_interlink(hid_t fapl) { status = H5Lmove(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); HDputs(" Interfile renaming should not have been allowed!"); @@ -1193,7 +1193,7 @@ test_interlink(hid_t fapl) { dset = H5Dcreate2(file1, "/mnt1/file2/dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset >= 0) { H5_FAILED(); HDputs(" Dataset and shared type must be in the same file!"); @@ -1232,7 +1232,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_interlink() */ @@ -1310,7 +1310,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_uniformity() */ @@ -1397,7 +1397,7 @@ error: H5Fclose(file1); H5Fclose(file2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_close() */ @@ -1630,7 +1630,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_mount_after_close() */ @@ -1897,7 +1897,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2047,7 +2047,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_missing_unmount() */ @@ -2175,7 +2175,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_hold_open_file() */ @@ -2329,7 +2329,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_hold_open_group() */ @@ -2411,7 +2411,7 @@ test_fcdegree_same(hid_t fapl) { ret = H5Fmount(gidA, ".", fid2, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2471,7 +2471,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_fcdegree_same() */ @@ -2565,7 +2565,7 @@ test_fcdegree_semi(hid_t fapl) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2578,7 +2578,7 @@ test_fcdegree_semi(hid_t fapl) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2612,7 +2612,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_fcdegree_semi() */ @@ -2717,14 +2717,14 @@ test_fcdegree_strong(hid_t fapl) { ret = H5Oget_info3(gidA, &oinfo, H5O_INFO_BASIC); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY { ret = H5Oget_info3(gidAM, &oinfo, H5O_INFO_BASIC); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2750,7 +2750,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_fcdegree_strong() */ @@ -2859,14 +2859,14 @@ test_acc_perm(hid_t fapl) { bad_id = H5Gcreate2(gidAM, "Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + 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_END_TRY; + H5E_END_TRY if (bad_id >= 0) TEST_ERROR; @@ -2909,7 +2909,7 @@ test_acc_perm(hid_t fapl) { bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (bad_id >= 0) TEST_ERROR; @@ -2954,7 +2954,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_acc_perm() */ @@ -3175,7 +3175,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_mult_mount() */ @@ -3307,7 +3307,7 @@ test_nested_survive(hid_t fapl) { gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gidAMS >= 0) TEST_ERROR; @@ -3386,7 +3386,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_nested_survive() */ @@ -3520,7 +3520,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_close_parent() */ @@ -3820,7 +3820,7 @@ test_cut_graph(hid_t fapl) { gidK = H5Gopen2(gidQ, "/A/D/K", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gidK >= 0) TEST_ERROR; @@ -3843,7 +3843,7 @@ test_cut_graph(hid_t fapl) { gidO = H5Gopen2(gidM, "/B/H/O", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gidO >= 0) TEST_ERROR; @@ -3945,7 +3945,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_cut_graph() */ @@ -4055,7 +4055,7 @@ test_symlink(hid_t fapl) { gidL = H5Gopen2(fid1, "L", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (gidL >= 0) TEST_ERROR; @@ -4109,7 +4109,7 @@ error: H5Fclose(fid2); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_symlink() */ @@ -4212,7 +4212,7 @@ error: H5Fclose(fid2[i]); } } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_sharedacc() */ @@ -4369,7 +4369,7 @@ error: H5Fclose(fid2); H5Fclose(fid3); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_sharedclose() */ @@ -4522,7 +4522,7 @@ error: H5Fclose(fid2); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_multisharedclose() */ diff --git a/test/ntypes.c b/test/ntypes.c index 707c71d..decd1c2 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -292,7 +292,7 @@ error: H5Tclose(dtype); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY HDfree(ipoints2); HDfree(icheck2); @@ -614,7 +614,7 @@ error: H5Tclose(dtype); H5Tclose(native_type); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -825,7 +825,7 @@ error: H5Tclose(native_type); H5Tclose(tid2); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1064,7 +1064,7 @@ error: H5Tclose(tid_m); H5Tclose(tid_m2); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1289,7 +1289,7 @@ error: H5Tclose(tid2); H5Tclose(tid_m); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1446,7 +1446,7 @@ error: H5Tclose(tid); H5Tclose(tid_m); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1632,7 +1632,7 @@ error: H5Tclose(tid3); H5Tclose(tid_m); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1779,7 +1779,7 @@ error: H5Tclose(tid); H5Tclose(tid_m); } - H5E_END_TRY; + H5E_END_TRY HDfree(ipoints3); HDfree(icheck3); @@ -1986,7 +1986,7 @@ error: H5Tclose(tid_m); H5Tclose(tid_m2); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_vl_type() */ @@ -2124,7 +2124,7 @@ error: H5Tclose(sid1); H5Tclose(tid1); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_vlstr_dtype() */ @@ -2244,7 +2244,7 @@ error: H5Tclose(tid1); H5Tclose(sid1); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_str_dtype() */ @@ -2415,7 +2415,7 @@ error: H5Tclose(native_type); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_refer_dtype() */ @@ -2627,7 +2627,7 @@ error: H5Dclose(dset2); H5Dclose(dset1); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_refer_dtype2() */ @@ -2724,7 +2724,7 @@ error: H5Dclose(dset); H5Dclose(dataset); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_opaque_dtype */ @@ -2878,7 +2878,7 @@ error: H5Dclose(dataset1); H5Dclose(dataset2); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_bitfield_dtype */ @@ -3088,7 +3088,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_ninteger() */ @@ -3166,7 +3166,7 @@ error: H5Fclose(file); h5_cleanup(FILENAME, fapl); } - H5E_END_TRY; + H5E_END_TRY nerrors = MAX(1, nerrors); HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); diff --git a/test/objcopy.c b/test/objcopy.c index eac99e0..d5c4947 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -330,7 +330,7 @@ error: H5Dclose(did2); H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -426,7 +426,7 @@ error: H5Dclose(dsetv_id); H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -551,7 +551,7 @@ error: H5Dclose(dsetv_id); H5Pclose(pid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -919,7 +919,7 @@ error: H5Tclose(tid2); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_attribute() */ @@ -1006,7 +1006,7 @@ error: H5Aclose(aid2); H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_std_attributes() */ @@ -1533,7 +1533,7 @@ error: H5Tclose(tid2); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_datasets() */ @@ -1736,7 +1736,7 @@ error: H5E_BEGIN_TRY { } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_groups() */ @@ -1887,7 +1887,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_named_datatype */ @@ -1997,7 +1997,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_named_datatype_vl */ @@ -2115,7 +2115,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_named_datatype_vl_vl */ @@ -2298,7 +2298,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_named_datatype_attr_self */ @@ -2435,7 +2435,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_simple */ @@ -2550,7 +2550,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) { ret = H5Pset_libver_bounds(fapl_dst, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -2571,7 +2571,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* If copy failed, check if the failure is expected */ if (ret < 0) { @@ -2639,7 +2639,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_versionbounds */ @@ -2761,7 +2761,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_simple_samefile */ @@ -2902,7 +2902,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_simple_empty */ @@ -3057,7 +3057,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compound */ @@ -3583,7 +3583,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked */ @@ -4086,7 +4086,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_empty */ @@ -4467,7 +4467,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_sparse */ @@ -4884,7 +4884,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_HAVE_FILTER_DEFLATE */ } /* end test_copy_dataset_compressed */ @@ -5071,7 +5071,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_HAVE_FILTER_DEFLATE */ } /* end test_copy_dataset_no_edge_filt */ @@ -5233,7 +5233,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compact */ @@ -5381,7 +5381,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_external */ @@ -5526,7 +5526,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_named_dtype */ @@ -5693,7 +5693,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_named_dtype_hier */ @@ -5861,7 +5861,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_named_dtype_hier_outside */ @@ -6040,7 +6040,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_multi_ohdr_chunks */ @@ -6211,7 +6211,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_attr_named_dtype */ @@ -6371,7 +6371,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_contig_vl */ @@ -6588,7 +6588,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_vl */ @@ -6759,7 +6759,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compact_vl */ @@ -6900,7 +6900,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_simple_empty */ @@ -7084,7 +7084,7 @@ error: H5Tclose(tid2); H5Pclose(dxpl_id); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* compare_attribute_compound_vlstr() */ @@ -7251,7 +7251,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_attribute_compound_vlstr() */ @@ -7441,7 +7441,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_HAVE_FILTER_DEFLATE */ } /* end test_copy_dataset_compressed_vl */ @@ -7552,7 +7552,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group_empty */ @@ -7711,7 +7711,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_root_group */ @@ -7870,7 +7870,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group */ @@ -8039,7 +8039,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group_deep */ @@ -8171,7 +8171,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group_loop */ @@ -8324,7 +8324,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group_wide_loop */ @@ -8649,7 +8649,7 @@ error: H5Fclose(fid_src); H5Pclose(plid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_group_links */ @@ -8811,7 +8811,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_soft_link */ @@ -8975,7 +8975,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_ext_link */ @@ -9079,7 +9079,7 @@ test_copy_exist(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -9102,7 +9102,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_exist */ @@ -9203,7 +9203,7 @@ test_copy_path(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { ret = H5Ocopy(fid_src, NAME_DATASET_SUB_SUB, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -9268,7 +9268,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_path */ @@ -9346,7 +9346,7 @@ error: H5Tclose(tid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_same_file_named_datatype */ @@ -9462,7 +9462,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_old_layout */ @@ -9647,7 +9647,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compact_named_vl */ @@ -9820,7 +9820,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_contig_named_vl */ @@ -10020,7 +10020,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_named_vl */ @@ -10208,7 +10208,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compressed_named_vl */ @@ -10400,7 +10400,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compact_vl_vl */ @@ -10603,7 +10603,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_contig_vl_vl */ @@ -10838,7 +10838,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_vl_vl */ @@ -11045,7 +11045,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compressed_vl_vl */ @@ -11230,7 +11230,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_contig_cmpd_vl */ @@ -11416,7 +11416,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_chunked_cmpd_vl */ @@ -11601,7 +11601,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_compact_cmpd_vl */ @@ -11792,7 +11792,7 @@ error: H5Fclose(fid2); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_null_ref */ @@ -12007,7 +12007,7 @@ error: H5Fclose(fid2); H5Fclose(fid3); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_null_ref_open */ @@ -12143,7 +12143,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_attr_crt_order */ @@ -12462,7 +12462,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_committed_datatype_merge */ @@ -12857,7 +12857,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_committed_datatype_merge_same_file */ @@ -13155,7 +13155,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_committed_dt_merge_sugg */ @@ -13385,7 +13385,7 @@ error: H5Gclose(gid); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_committed_dt_merge_attr */ @@ -13888,7 +13888,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_cdt_hier_merge */ @@ -14218,7 +14218,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_cdt_merge_cdt */ @@ -14533,7 +14533,7 @@ error: H5Tclose(tid); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_cdt_merge_suggs */ @@ -14909,7 +14909,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_cdt_merge_dset_suggs */ @@ -15537,7 +15537,7 @@ error: H5Sclose(sid); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_cdt_merge_all_suggs */ @@ -16009,7 +16009,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_set_mcdt_search_cb */ @@ -16364,7 +16364,7 @@ error: H5Dclose(did); H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_set_get_mcdt_search_cb */ @@ -16531,7 +16531,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_iterate */ @@ -16914,7 +16914,7 @@ error: H5Fclose(fid_src); H5Fclose(fid_ext); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_option */ @@ -17349,7 +17349,7 @@ error: H5Fclose(fid_dst); H5Fclose(fid_src); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_dataset_open */ diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index ebce96b..3ad5091 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -241,7 +241,7 @@ error: H5Rdestroy(&ref[0]); H5Rdestroy(&ref[1]); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -341,7 +341,7 @@ error: H5Rdestroy(&ref[0]); H5Rdestroy(&ref[1]); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -472,7 +472,7 @@ error: H5Rdestroy(&ref[0]); H5Rdestroy(&ref[1]); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -703,7 +703,7 @@ error: H5Tclose(tid2); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_attribute() */ @@ -790,7 +790,7 @@ error: H5Aclose(aid2); H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_std_attributes() */ @@ -1245,7 +1245,7 @@ error: H5Tclose(tid2); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_datasets() */ @@ -1448,7 +1448,7 @@ error: H5E_BEGIN_TRY { } - H5E_END_TRY; + H5E_END_TRY return FALSE; } /* end compare_groups() */ @@ -1831,7 +1831,7 @@ error: H5Fclose(fid_src); H5Fclose(fid_ext); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_copy_option */ diff --git a/test/ohdr.c b/test/ohdr.c index 85e10a2..b62f391 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -168,7 +168,7 @@ error: H5O_close(&oh_locB, NULL); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_cont() */ @@ -306,7 +306,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_ohdr_cache() */ @@ -457,7 +457,7 @@ error: HDremove(FILE_OHDR_SWMR); HDfree(wbuf); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_ohdr_swmr() */ @@ -496,7 +496,7 @@ test_ohdr_badness(hid_t fapl) */ fid = H5Fopen(CVE_2020_10810_FILENAME, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) FAIL_PUTS_ERROR("should not have been able to open malformed file"); @@ -510,7 +510,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -615,7 +615,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl) { did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did >= 0) { H5Dclose(did); TEST_ERROR; @@ -782,7 +782,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl) { did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did >= 0) { H5Dclose(did); TEST_ERROR; @@ -797,7 +797,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl) { did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did >= 0) { H5Dclose(did); TEST_ERROR; @@ -825,7 +825,7 @@ error: H5Sclose(sid); H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_unknown() */ @@ -1067,7 +1067,7 @@ error: (void)H5Aclose(aid); (void)H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY HDfree(in_buf); HDfree(out_buf); @@ -1298,7 +1298,7 @@ error: (void)H5Dclose(dset_F_N_id); (void)H5Dclose(dset_F_Y_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_minimized_dset_ohdr_size_comparisons */ @@ -1454,7 +1454,7 @@ error: (void)H5Dclose(dset_mZ_id); (void)H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_minimized_dset_ohdr_with_filter */ @@ -1676,7 +1676,7 @@ error: (void)H5Fclose(file_id); (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_minimized_dset_ohdr_modification_times */ @@ -1810,7 +1810,7 @@ error: (void)H5Dclose(dset_1_id); (void)H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_minimized_dset_ohdr_fillvalue_backwards_compatability */ @@ -1874,7 +1874,7 @@ main(void) { ret = H5Pset_libver_bounds(fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -2070,7 +2070,7 @@ main(void) { ret = H5O_msg_write(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0) @@ -2163,7 +2163,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/onion.c b/test/onion.c index 03730a7..830220d 100644 --- a/test/onion.c +++ b/test/onion.c @@ -734,7 +734,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(H5I_INVALID_HID, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -743,7 +743,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -753,7 +753,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; info_in.version--; @@ -764,7 +764,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -774,7 +774,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; info_in.page_size = ONION_TEST_PAGE_SIZE_1; @@ -785,7 +785,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -795,7 +795,7 @@ test_fapl(void) { ret = H5Pset_fapl_onion(fapl_id, &info_in); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; info_in.backing_fapl_id = H5P_DEFAULT; @@ -810,7 +810,7 @@ test_fapl(void) { ret = H5Pget_fapl_onion(fapl_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -819,7 +819,7 @@ test_fapl(void) { ret = H5Pget_fapl_onion(H5I_INVALID_HID, &info_out); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -828,7 +828,7 @@ test_fapl(void) { ret = H5Pget_fapl_onion(fapl_id_sec2, &info_out); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -945,7 +945,7 @@ test_header_encode_decode(void) { size_ret = H5FD__onion_header_decode(exp, &hdr_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -959,7 +959,7 @@ test_header_encode_decode(void) { size_ret = H5FD__onion_header_decode(exp, &hdr_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -968,7 +968,7 @@ test_header_encode_decode(void) { size_ret = H5FD__onion_header_decode(exp, &hdr_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -1059,7 +1059,7 @@ test_history_encode_decode_empty(void) { size_ret = H5FD__onion_history_decode(exp, &history_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -1072,7 +1072,7 @@ test_history_encode_decode_empty(void) { size_ret = H5FD__onion_history_decode(exp, &history_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -1081,7 +1081,7 @@ test_history_encode_decode_empty(void) { size_ret = H5FD__onion_history_decode(exp, &history_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -1421,7 +1421,7 @@ test_revision_record_encode_decode(void) { size_ret = H5FD__onion_revision_record_decode(exp, &r_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; exp[2] = 'R'; /* reset */ @@ -1432,7 +1432,7 @@ test_revision_record_encode_decode(void) { size_ret = H5FD__onion_revision_record_decode(exp, &r_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; @@ -1442,7 +1442,7 @@ test_revision_record_encode_decode(void) { size_ret = H5FD__onion_revision_record_decode(exp, &r_out); } - H5E_END_TRY; + H5E_END_TRY if (0 != size_ret) TEST_ERROR; exp[4] = H5FD_ONION_REVISION_RECORD_VERSION_CURR; /* reset */ @@ -1858,7 +1858,7 @@ verify_stored_onion_create_0_open(struct onion_filepaths *paths, H5FD_onion_fapl { err_ret = H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, 1, act_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret != FAIL) TEST_ERROR; @@ -1972,7 +1972,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) { vfile_raw = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); } - H5E_END_TRY; + H5E_END_TRY /* Check if onion history for onion-open created file */ if (NULL != vfile_raw) @@ -2008,7 +2008,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) { vfile_ro = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); } - H5E_END_TRY; + H5E_END_TRY /* check if onionization (creation) not complete; nothing to open */ if (vfile_ro != NULL) TEST_ERROR; @@ -2095,7 +2095,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) { vfile_raw = H5FDopen(paths->recovery, H5F_ACC_RDONLY, onion_info.backing_fapl_id, HADDR_UNDEF); } - H5E_END_TRY; + H5E_END_TRY if (NULL != vfile_raw) TEST_ERROR; @@ -2192,7 +2192,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_create_oniontarget() */ @@ -2546,7 +2546,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_several_revisions_with_logical_gaps() */ @@ -2643,7 +2643,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf_vfy); @@ -2854,7 +2854,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_page_aligned_history_create() */ @@ -3190,7 +3190,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(wdata); HDfree(rdata); @@ -3449,7 +3449,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(wdata); HDfree(rdata); @@ -3811,7 +3811,7 @@ error: H5Sclose(space); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_integration_create_delete_objects */ @@ -4086,7 +4086,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_integration_dset_extension */ @@ -4266,7 +4266,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -4648,7 +4648,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -4888,7 +4888,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(wdata); HDfree(rdata); diff --git a/test/page_buffer.c b/test/page_buffer.c index a6f7f0a..b15aff5 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -198,7 +198,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return (1); } /* create_file */ @@ -292,7 +292,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return 1; } #endif /* H5_HAVE_PARALLEL */ @@ -411,7 +411,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr) { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) TEST_ERROR; @@ -432,7 +432,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr) { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) TEST_ERROR; @@ -444,7 +444,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr) { ret = H5Pset_page_buffer_size(fapl, 512, 50, 51); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -535,7 +535,7 @@ error: H5Pclose(fapl); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_args */ @@ -800,7 +800,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_raw_data_handling */ @@ -1042,7 +1042,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_lru_processing */ @@ -1662,7 +1662,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return 1; @@ -1952,7 +1952,7 @@ error: if (data) HDfree(data); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_stats_collection */ @@ -2013,7 +2013,7 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr) { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) TEST_ERROR; @@ -2045,7 +2045,7 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr) { file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) TEST_ERROR; @@ -2068,7 +2068,7 @@ error: H5Pclose(fcpl); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; @@ -2160,7 +2160,7 @@ error: { H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); diff --git a/test/ros3.c b/test/ros3.c index bc9eb86..7eb4230 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -588,7 +588,7 @@ test_fapl_config_validation(void) */ success = H5Pset_fapl_ros3(fapl_id, &case_ptr->config); } - H5E_END_TRY; + H5E_END_TRY JSVERIFY(case_ptr->expected, success, case_ptr->msg) @@ -629,7 +629,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; } /* test_fapl_config_validation */ @@ -706,7 +706,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; @@ -877,7 +877,7 @@ test_vfd_open(void) { fd = H5FDopen(T.url, T.flags, _fapl_id, T.maxaddr); } - H5E_END_TRY; + H5E_END_TRY if (NULL != fd) JSVERIFY(1, 0, T.message); /* wrapper to print message and fail */ } @@ -921,14 +921,14 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (fapl_file_access >= 0) { H5E_BEGIN_TRY { (void)H5Pclose(fapl_file_access); } - H5E_END_TRY; + H5E_END_TRY } if (curl_ready == TRUE) { curl_global_cleanup(); @@ -1062,7 +1062,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1131,7 +1131,7 @@ test_H5FDread_without_eoa_set_fails(void) H5E_BEGIN_TRY{/* mute stack trace on expected failure */ JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer), - "cannot read before eoa is set")} H5E_END_TRY; + "cannot read before eoa is set")} H5E_END_TRY JSVERIFY_STR("", buffer, "buffer should remain untouched") /************ @@ -1160,7 +1160,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1330,7 +1330,7 @@ test_read(void) { open_return = H5FDread(file_raven, H5FD_MEM_DRAW, H5P_DEFAULT, test.addr, test.len, buffer); } - H5E_END_TRY; + H5E_END_TRY JSVERIFY(test.success, open_return, test.message) if (open_return == SUCCEED) @@ -1363,7 +1363,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1443,12 +1443,12 @@ test_noops_and_autofails(void) /* auto-fail calls to write and truncate */ H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data), - "write must fail")} H5E_END_TRY; + "write must fail")} H5E_END_TRY - H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY; + H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY H5E_BEGIN_TRY{ - JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY; + JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY /************ * TEARDOWN * @@ -1476,7 +1476,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (file) { (void)H5FDclose(file); @@ -1610,7 +1610,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } return 1; @@ -1683,11 +1683,11 @@ test_H5F_integration(void) /* Read-Write Open access is not allowed with this file driver. */ - H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(url_h5_public, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY; + H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(url_h5_public, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY /* H5Fcreate() is not allowed with this file driver. */ - H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY; + H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY /* Successful open. */ @@ -1719,7 +1719,7 @@ error: { (void)H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY } if (file > 0) (void)H5Fclose(file); diff --git a/test/set_extent.c b/test/set_extent.c index f3281d0..4dc5d7c 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -431,7 +431,7 @@ do_layouts(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ { @@ -460,7 +460,7 @@ error: { H5Pclose(new_fapl); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -792,7 +792,7 @@ error: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_rank1() */ @@ -1287,7 +1287,7 @@ error: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1722,7 +1722,7 @@ error: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -1983,7 +1983,7 @@ test_external(hid_t fapl) TEST_ERROR; } } - H5E_END_TRY; + H5E_END_TRY /*------------------------------------------------------------------------- * close property list @@ -2012,7 +2012,7 @@ error: H5Pclose(dcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2098,7 +2098,7 @@ test_layouts(H5D_layout_t layout, hid_t fapl) { ret = H5Dset_extent(did, dims_e); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2147,7 +2147,7 @@ test_layouts(H5D_layout_t layout, hid_t fapl) { ret = H5Dset_extent(did, dims_s); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2220,7 +2220,7 @@ error: H5Pclose(dcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2434,7 +2434,7 @@ error: H5Dclose(dset); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(rbuf); HDfree(wbuf); @@ -2729,7 +2729,7 @@ error: H5Tclose(type); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(rbuf); HDfree(wbuf); diff --git a/test/stab.c b/test/stab.c index 697bce0..45010d5 100644 --- a/test/stab.c +++ b/test/stab.c @@ -178,7 +178,7 @@ error: H5Gclose(g3); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -261,7 +261,7 @@ error: HDfree(name2); HDfree(name1); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_long() */ @@ -335,7 +335,7 @@ error: H5Gclose(cwg); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_large() */ @@ -622,7 +622,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end lifecycle() */ @@ -785,7 +785,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (objname) HDfree(objname); @@ -895,7 +895,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end read_old() */ @@ -1036,7 +1036,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end no_compact() */ @@ -1189,7 +1189,7 @@ error: H5Gclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end gcpl_on_root() */ @@ -1293,7 +1293,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif /* H5_NO_DEPRECATED_SYMBOLS */ } /* end old_api() */ @@ -1387,7 +1387,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end corrupt_stab_msg() */ diff --git a/test/swmr.c b/test/swmr.c index 4abf779..94110f4 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -170,7 +170,7 @@ test_metadata_read_attempts(hid_t in_fapl) { ret = H5Pset_metadata_read_attempts(fapl, 0); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -834,7 +834,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -1531,7 +1531,7 @@ error: H5Fclose(fid); H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -1662,7 +1662,7 @@ test_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (new_format) { if (ret < 0) TEST_ERROR; @@ -1879,7 +1879,7 @@ error: H5Sclose(sid2); H5Sclose(sid3); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_start_swmr_write() */ @@ -1990,7 +1990,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2016,7 +2016,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2043,7 +2043,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2072,7 +2072,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2091,7 +2091,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2110,7 +2110,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2143,7 +2143,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2156,7 +2156,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2204,7 +2204,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2231,7 +2231,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2260,7 +2260,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid2); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2290,7 +2290,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (bad_fid >= 0) TEST_ERROR; @@ -2302,7 +2302,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (bad_fid >= 0) TEST_ERROR; @@ -2317,7 +2317,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2335,7 +2335,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) { ret = H5Fstart_swmr_write(fid); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -2368,7 +2368,7 @@ error: */ H5Fclose(bad_fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_err_start_swmr_write() */ @@ -2523,7 +2523,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Open the test file */ fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) HDexit(EXIT_FAILURE); @@ -2793,7 +2793,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) { fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) HDexit(EXIT_FAILURE); @@ -2869,7 +2869,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) { fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) HDexit(EXIT_FAILURE); @@ -2949,7 +2949,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) HDexit(EXIT_FAILURE); @@ -3012,7 +3012,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -3177,7 +3177,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_start_swmr_write_stress_ohdr() */ @@ -3287,7 +3287,7 @@ error: H5Pclose(vds_dapl1); H5Pclose(vds_dapl2); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* tssw_persist_dapl_verify() */ @@ -3545,7 +3545,7 @@ error: H5Dclose(vdsid2); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_start_swmr_write_persist_dapl() */ @@ -3608,7 +3608,7 @@ test_object_flush_cb(hid_t in_fapl) { ret = H5Pset_object_flush_cb(fapl, NULL, &flush_ct); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3812,7 +3812,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_object_flush_cb() */ @@ -3912,7 +3912,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, 0, NULL, NULL, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3921,7 +3921,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, H5S_MAX_RANK + 1, NULL, NULL, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3930,7 +3930,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, 2, NULL, NULL, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3943,7 +3943,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, 2, boundary, NULL, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3954,7 +3954,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -3965,7 +3965,7 @@ test_append_flush_generic(void) { ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) TEST_ERROR; @@ -4011,7 +4011,7 @@ error: { H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_append_flush_generic() */ @@ -4132,7 +4132,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) { did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl); } - H5E_END_TRY; + H5E_END_TRY if (did2 >= 0) TEST_ERROR; @@ -4146,7 +4146,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) { did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl); } - H5E_END_TRY; + H5E_END_TRY if (did2 >= 0) TEST_ERROR; @@ -4161,7 +4161,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) { did2 = H5Dopen2(fid, "dataset2", dapl); } - H5E_END_TRY; + H5E_END_TRY if (did2 >= 0) TEST_ERROR; @@ -4240,7 +4240,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_append_flush_dataset_chunked() */ @@ -4447,7 +4447,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_append_flush_dataset_fixed() */ @@ -4689,7 +4689,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_append_flush_dataset_multiple() */ @@ -4803,7 +4803,7 @@ test_file_lock_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -4857,7 +4857,7 @@ error: H5Fclose(fid); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_file_lock_same() */ @@ -4911,7 +4911,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) TEST_ERROR; @@ -4922,7 +4922,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) TEST_ERROR; @@ -4933,7 +4933,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) TEST_ERROR; @@ -4944,7 +4944,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) TEST_ERROR; @@ -4962,7 +4962,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -5058,7 +5058,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -5076,7 +5076,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -5126,7 +5126,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -5144,7 +5144,7 @@ test_file_lock_swmr_same(hid_t in_fapl) { fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid2 >= 0) TEST_ERROR; @@ -5167,7 +5167,7 @@ error: H5Fclose(fid); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_file_lock_swmr_same() */ @@ -5258,7 +5258,7 @@ test_file_lock_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5335,7 +5335,7 @@ test_file_lock_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5413,7 +5413,7 @@ test_file_lock_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5491,7 +5491,7 @@ test_file_lock_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should succeed */ if (child_fid >= 0) { @@ -5557,7 +5557,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -5655,7 +5655,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5733,7 +5733,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5811,7 +5811,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5888,7 +5888,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -5965,7 +5965,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should succeed */ if (child_fid >= 0) { @@ -6045,7 +6045,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -6123,7 +6123,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -6201,7 +6201,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -6279,7 +6279,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should succeed */ if (child_fid >= 0) { @@ -6438,7 +6438,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should fail */ if (child_fid == FAIL) @@ -6516,7 +6516,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) { child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Should succeed */ if (child_fid >= 0) { @@ -6580,7 +6580,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -6699,7 +6699,7 @@ test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_overri child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl); ret = H5Fclose(child_fid); } - H5E_END_TRY; + H5E_END_TRY /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) @@ -6772,7 +6772,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -6826,7 +6826,7 @@ test_different_lock_flags(hid_t in_fapl) { fid3 = H5Fopen(filename, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (H5I_INVALID_HID != fid3) FAIL_PUTS_ERROR("Should not have been able to open a file with different locking flags"); @@ -6852,7 +6852,7 @@ error: H5Fclose(fid2); H5Fclose(fid3); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_different_lock_flags() */ @@ -6897,7 +6897,7 @@ test_swmr_vfd_flag(void) { fid = H5Fcreate(filename, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, bad_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) TEST_ERROR; @@ -6917,7 +6917,7 @@ error: H5Pclose(bad_fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_swmr_vfd_flag() */ @@ -7037,7 +7037,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_bug_refresh() */ @@ -7382,7 +7382,7 @@ error: H5Pclose(fapl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; @@ -7714,7 +7714,7 @@ error: H5Fclose(fid2); H5Fclose(fid3); } - H5E_END_TRY; + H5E_END_TRY return 1; diff --git a/test/tarray.c b/test/tarray.c index 06eac90..7f4cec4 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -239,14 +239,14 @@ test_array_funcs(void) { cset = H5Tget_cset(type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(cset, FAIL, "H5Tget_cset"); H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(strpad, FAIL, "H5Tget_strpad"); /* Close datatype */ diff --git a/test/tattr.c b/test/tattr.c index 20dbd25..6f3ecb4 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -5853,9 +5853,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Output message about test being performed */ if (use_index) - MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n")) + MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -6088,7 +6088,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info(attr, NULL); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info"); @@ -6096,7 +6096,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info_by_name(fid, ".", GET_INFO_NULL_POINTER_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info_by_name"); @@ -6104,7 +6104,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info_by_idx"); @@ -6152,7 +6152,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6160,7 +6160,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, "", INVALID_RENAME_TEST_NEW_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6168,7 +6168,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, NULL); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6176,7 +6176,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, ""); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6184,7 +6184,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6192,7 +6192,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", "", INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6200,7 +6200,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6208,7 +6208,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6258,7 +6258,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_name(attr, 1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(err_ret, FAIL, "H5Aget_name"); @@ -6266,7 +6266,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_name_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(err_ret, FAIL, "H5Aget_name_by_idx"); @@ -6315,7 +6315,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ - MESSAGE(5, ("Testing Deleting Attribute By Index\n")) + MESSAGE(5, ("Testing Deleting Attribute By Index\n")); /* Create dataspace for dataset & attributes */ sid = H5Screate(H5S_SCALAR); @@ -6346,36 +6346,36 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end else */ } /* end else */ @@ -7333,36 +7333,36 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Increasing Order w/Creation Order Index\n")) + "Increasing Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Increasing Order w/o Creation Order Index\n")) + "Increasing Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Decreasing Order w/Creation Order Index\n")) + "Decreasing Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Decreasing Order w/o Creation Order Index\n")) + "Decreasing Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order " - "w/o Creation Order Index\n")) + "w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order " - "w/o Creation Order Index\n")) + "w/o Creation Order Index\n")); } /* end else */ } /* end else */ @@ -7731,36 +7731,36 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end else */ } /* end else */ @@ -8097,9 +8097,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Print appropriate test message */ if (use_index) - MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n")) + MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -8392,9 +8392,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Print appropriate test message */ if (use_index) - MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n")) + MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); diff --git a/test/testframe.c b/test/testframe.c index f3cf781..cb730b7 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -325,7 +325,7 @@ PerformTests(void) } Test_parameters = NULL; /* clear it. */ - MESSAGE(2, ("\n\n")) + MESSAGE(2, ("\n\n")); if (num_errs) print_func("!!! %d Error(s) were detected !!!\n\n", (int)num_errs); diff --git a/test/testhdf5.h b/test/testhdf5.h index 4016fd4..1ebd619 100644 --- a/test/testhdf5.h +++ b/test/testhdf5.h @@ -38,7 +38,7 @@ } while (0) #define CHECK_I(ret, where) \ - { \ + do { \ if (VERBOSE_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %ld\n", (where), (int)__LINE__, \ __FILE__, (long)(ret)); \ @@ -48,11 +48,11 @@ (int)__LINE__, __FILE__); \ H5Eprint2(H5E_DEFAULT, stdout); \ } \ - } + } while (0) /* Check that a pointer is valid (i.e.: not NULL) */ #define CHECK_PTR(ret, where) \ - { \ + do { \ if (VERBOSE_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \ __FILE__, ((const void *)ret)); \ @@ -62,11 +62,11 @@ __FILE__); \ H5Eprint2(H5E_DEFAULT, stdout); \ } \ - } + } while (0) /* Check that a pointer is NULL */ #define CHECK_PTR_NULL(ret, where) \ - { \ + do { \ if (VERBOSE_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \ __FILE__, ((const void *)ret)); \ @@ -76,11 +76,11 @@ (int)__LINE__, __FILE__); \ H5Eprint2(H5E_DEFAULT, stdout); \ } \ - } + } while (0) /* Check that two pointers are equal */ #define CHECK_PTR_EQ(ret, val, where) \ - { \ + do { \ if (VERBOSE_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \ __FILE__, (const void *)(ret)); \ @@ -91,7 +91,7 @@ (where), (const void *)(ret), (const void *)(val), (int)__LINE__, __FILE__); \ H5Eprint2(H5E_DEFAULT, stdout); \ } \ - } + } while (0) /* Used to make certain a return value _is_ a value */ #define VERIFY(_x, _val, where) \ @@ -164,19 +164,19 @@ /* Used to document process through a test */ #if defined(H5_HAVE_PARALLEL) && defined(H5_PARALLEL_TEST) #define MESSAGE(V, A) \ - { \ + do { \ int mpi_rank; \ \ MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); \ if (mpi_rank == 0 && HDGetTestVerbosity() > (V)) \ print_func A; \ - } + } while (0) #else /* H5_HAVE_PARALLEL */ #define MESSAGE(V, A) \ - { \ + do { \ if (HDGetTestVerbosity() > (V)) \ print_func A; \ - } + } while (0) #endif /* H5_HAVE_PARALLEL */ /* Used to indicate an error that is complex to check for */ diff --git a/test/tfile.c b/test/tfile.c index f24b55d..ac931cc 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -342,43 +342,43 @@ test_file_create(void) { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE3); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE4); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE5); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE6); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); H5E_BEGIN_TRY { ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE7); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_userblock"); /* Set the new file-creation parameters */ @@ -669,7 +669,7 @@ test_file_reopen(void) /* Create a dataset in the file */ sid = H5Screate_simple(1, &dims, &dims); - CHECK_I(sid, "H5Screate_simple") + CHECK_I(sid, "H5Screate_simple"); did = H5Dcreate2(fid, REOPEN_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK_I(did, "H5Dcreate2"); @@ -1401,7 +1401,7 @@ test_get_file_id(void) { fid2 = H5Iget_file_id(plist); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Iget_file_id"); /* Close objects */ @@ -1607,7 +1607,7 @@ test_file_perm(void) { dset = H5Dcreate2(filero, F2_DSET, H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset, FAIL, "H5Dcreate2"); if (dset != FAIL) { ret = H5Dclose(dset); @@ -1666,7 +1666,7 @@ test_file_perm2(void) { group = H5Gcreate2(filero, "MY_GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(group, FAIL, "H5Gcreate2"); /* Create a dataset with the read-only file handle (should fail) */ @@ -1674,7 +1674,7 @@ test_file_perm2(void) { dset = H5Dcreate2(filero, F2_DSET, H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset, FAIL, "H5Dcreate2"); /* Create an attribute with the read-only file handle (should fail) */ @@ -1682,7 +1682,7 @@ test_file_perm2(void) { attr = H5Acreate2(filero, "MY_ATTR", H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(attr, FAIL, "H5Acreate2"); type = H5Tcopy(H5T_NATIVE_SHORT); @@ -1693,7 +1693,7 @@ test_file_perm2(void) { ret = H5Tcommit2(filero, "MY_DTYPE", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Tcommit2"); ret = H5Tclose(type); @@ -2045,7 +2045,7 @@ test_file_delete(hid_t fapl_id) { is_hdf5 = H5Fis_accessible(filename, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(is_hdf5, FAIL, "H5Fis_accessible"); /* Just in case deletion fails - silent on errors */ @@ -2076,7 +2076,7 @@ test_file_delete(hid_t fapl_id) { is_hdf5 = H5Fis_accessible(filename, fapl_id); } - H5E_END_TRY; + H5E_END_TRY CHECK(is_hdf5, TRUE, "H5Fis_accessible"); /* Try to delete it (should fail) */ @@ -2084,7 +2084,7 @@ test_file_delete(hid_t fapl_id) { ret = H5Fdelete(filename, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fdelete"); /* Delete the file */ @@ -2130,7 +2130,7 @@ test_file_open_dot(void) { did = H5Dcreate2(fid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Create a dataset with no name using the group ID */ @@ -2138,7 +2138,7 @@ test_file_open_dot(void) { did = H5Dcreate2(gid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Open a dataset with no name using the file ID */ @@ -2146,7 +2146,7 @@ test_file_open_dot(void) { did = H5Dopen2(fid, ".", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dopen2"); /* Open a dataset with no name using the group ID */ @@ -2154,7 +2154,7 @@ test_file_open_dot(void) { did = H5Dopen2(gid, ".", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dopen2"); /* Make a copy of a datatype to use for creating a named datatype */ @@ -2166,7 +2166,7 @@ test_file_open_dot(void) { ret = H5Tcommit2(fid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Tcommit2"); /* Create a named datatype with no name using the group ID */ @@ -2174,7 +2174,7 @@ test_file_open_dot(void) { ret = H5Tcommit2(gid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Tcommit2"); /* Open a named datatype with no name using the file ID */ @@ -2182,7 +2182,7 @@ test_file_open_dot(void) { tid2 = H5Topen2(fid, ".", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tid2, FAIL, "H5Topen2"); /* Open a named datatype with no name using the group ID */ @@ -2190,7 +2190,7 @@ test_file_open_dot(void) { tid2 = H5Topen2(gid, ".", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tid2, FAIL, "H5Topen2"); /* Create a group with no name using the file ID */ @@ -2198,7 +2198,7 @@ test_file_open_dot(void) { gid2 = H5Gcreate2(fid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(gid2, FAIL, "H5Gcreate2"); /* Create a group with no name using the group ID */ @@ -2206,7 +2206,7 @@ test_file_open_dot(void) { gid2 = H5Gcreate2(gid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(gid2, FAIL, "H5Gcreate2"); /* Open a group with no name using the file ID (should open the root group) */ @@ -2389,7 +2389,7 @@ test_file_getname(void) { name_len = H5Fget_name(space_id, name, (size_t)TESTA_NAME_BUF_SIZE); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_len, FAIL, "H5Fget_name"); /* Create a new dataset */ @@ -3522,7 +3522,7 @@ test_userblock_alignment(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -3555,7 +3555,7 @@ test_userblock_alignment(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -3735,7 +3735,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -3813,7 +3813,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -3853,7 +3853,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -3931,7 +3931,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) { fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fcreate"); /* Release property lists */ @@ -4124,7 +4124,7 @@ test_filespace_info(const char *env_h5_drvr) { ret = H5Pset_file_space_page_size(fcpl, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_file_space_page_size"); /* Setting to 511: should fail */ @@ -4132,7 +4132,7 @@ test_filespace_info(const char *env_h5_drvr) { ret = H5Pset_file_space_page_size(fcpl, 511); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_file_space_page_size"); /* Setting to 1GB+1: should fail */ @@ -4140,7 +4140,7 @@ test_filespace_info(const char *env_h5_drvr) { ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G + 1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_file_space_page_size"); /* Setting to 512: should succeed */ @@ -5543,7 +5543,7 @@ test_libver_bounds_open(void) { file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(file, FAIL, "Attempted to open latest file with earliest version"); /* Attempt to open latest file with (v18, v18), should fail */ @@ -5552,7 +5552,7 @@ test_libver_bounds_open(void) { file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(file, FAIL, "Attempted to open latest file with v18 bounds"); /* Opening VERBFNAME in these combination should succeed. @@ -5744,7 +5744,7 @@ test_libver_bounds_low_high(const char *env_h5_drvr) /* Set the low/high version bounds */ ret = H5Pset_libver_bounds(fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY /* Should fail: invalid combinations */ if (high == H5F_LIBVER_EARLIEST) { @@ -5959,7 +5959,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n { fid = H5Fcreate(FILE8, H5F_ACC_TRUNC | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Get the internal file pointer if the create succeeds */ if (fid >= 0) { @@ -6127,7 +6127,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non { fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY /* Retrieve the low/high bounds */ ret = H5Pget_libver_bounds(fapl, &low, &high); @@ -6161,7 +6161,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY /* Invalid combinations */ if (ret < 0) @@ -6172,7 +6172,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non { fid = H5Fopen(FILE8, H5F_ACC_RDWR | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (non_def_fsm && high < H5F_LIBVER_V110) { VERIFY(fid, H5I_INVALID_HID, "H5Fopen"); @@ -6344,7 +6344,7 @@ test_libver_bounds_obj(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid combinations */ continue; @@ -6354,7 +6354,7 @@ test_libver_bounds_obj(hid_t fapl) { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) { /* The file open succeeds */ @@ -6510,7 +6510,7 @@ test_libver_bounds_dataset(hid_t fapl) { did = H5Dcreate2(fid, DSETB, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (did >= 0) { @@ -6562,7 +6562,7 @@ test_libver_bounds_dataset(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -6572,7 +6572,7 @@ test_libver_bounds_dataset(hid_t fapl) { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) { /* The file open succeeds */ @@ -6791,7 +6791,7 @@ test_libver_bounds_dataspace(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -6801,7 +6801,7 @@ test_libver_bounds_dataspace(hid_t fapl) { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) { /* The file open succeeds */ @@ -7127,7 +7127,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -7137,7 +7137,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid) { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) { /* The file open succeeds */ @@ -7455,7 +7455,7 @@ test_libver_bounds_attributes(hid_t fapl) { ret = H5Pset_libver_bounds(new_fapl, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -7465,7 +7465,7 @@ test_libver_bounds_attributes(hid_t fapl) { fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl); } - H5E_END_TRY; + H5E_END_TRY if (fid >= 0) { /* The file open succeeds */ @@ -7622,7 +7622,7 @@ test_libver_macros2(void) { grp = H5Gopen(file, "Group"); } - H5E_END_TRY; + H5E_END_TRY VERIFY(grp, FAIL, "H5Gopen"); #endif @@ -7861,7 +7861,7 @@ test_min_dset_ohdr(void) { ret = H5Fset_dset_no_attrs_hint(-1, TRUE); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint"); /* trying to get with invalid file ID */ @@ -7869,7 +7869,7 @@ test_min_dset_ohdr(void) { ret = H5Fget_dset_no_attrs_hint(-1, &minimize); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint"); /* trying to get with invalid pointer */ @@ -7877,7 +7877,7 @@ test_min_dset_ohdr(void) { ret = H5Fget_dset_no_attrs_hint(file_id, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint"); /************/ @@ -8243,5 +8243,5 @@ cleanup_file(void) H5Fdelete(FILE7, H5P_DEFAULT); H5Fdelete(DST_FILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/th5_system.c b/test/th5_system.c index 4c652c1..0e22b8a 100644 --- a/test/th5_system.c +++ b/test/th5_system.c @@ -44,7 +44,7 @@ test_h5_dirname(void) { ret = H5_dirname(NULL, &dirname); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5_dirname with NULL path"); H5Eclear2(H5E_DEFAULT); @@ -55,7 +55,7 @@ test_h5_dirname(void) { ret = H5_dirname(path, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5_dirname with NULL dirname pointer"); H5Eclear2(H5E_DEFAULT); @@ -248,7 +248,7 @@ test_h5_basename(void) { ret = H5_basename(NULL, &basename); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5_basename with NULL path"); H5Eclear2(H5E_DEFAULT); @@ -259,7 +259,7 @@ test_h5_basename(void) { ret = H5_basename(path, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5_basename with NULL basename pointer"); H5Eclear2(H5E_DEFAULT); @@ -513,7 +513,7 @@ test_h5_strndup(void) { str = H5_strndup(NULL, 20); } - H5E_END_TRY; + H5E_END_TRY CHECK_PTR_NULL(str, "H5_strndup with NULL string pointer"); H5Eclear2(H5E_DEFAULT); diff --git a/test/th5o.c b/test/th5o.c index 027445e..4468bab 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -989,7 +989,7 @@ test_h5o_link(void) { ret = H5Pset_libver_bounds(fapl_id, low, high); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0) /* Invalid low/high combinations */ continue; @@ -1180,7 +1180,7 @@ test_h5o_comment(void) { ret = H5Oset_comment(dspace, "dataspace comment"); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Oset_comment"); /* Close the file */ @@ -1355,7 +1355,7 @@ test_h5o_comment_by_name(void) { ret = H5Oset_comment_by_name(dspace, ".", "dataspace comment", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Oset_comment"); /* Close the file */ @@ -1872,5 +1872,5 @@ cleanup_h5o(void) h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); H5Fdelete(filename, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/th5s.c b/test/th5s.c index 40d8b06..31944e6 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -184,7 +184,7 @@ test_h5s_basic(void) { sid1 = H5Screate_simple(H5S_MAX_RANK + 1, dims3, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(sid1, FAIL, "H5Screate_simple"); /* @@ -400,7 +400,7 @@ test_h5s_null(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_hyperslab"); /* Check to be sure we can't set a point selection on a null dataspace */ @@ -411,7 +411,7 @@ test_h5s_null(void) coord[0][0] = 0; ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_elements"); /* Create first dataset */ @@ -745,7 +745,7 @@ test_h5s_zero_dim(void) { ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dwrite"); /* Change to "none" selection */ @@ -764,7 +764,7 @@ test_h5s_zero_dim(void) { ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dwrite"); /* Restore the selection to all */ @@ -864,7 +864,7 @@ test_h5s_zero_dim(void) { ret = H5Dset_extent(dset1, extend_dims); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dset_extent"); ret = H5Pclose(plist_id); @@ -1265,7 +1265,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) { ret_id = H5Sdecode(sbuf); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Sdecode"); /* Encode the simple dataspace in a buffer with the fapl setting */ @@ -1457,7 +1457,7 @@ test_h5s_encode1(void) { ret_id = H5Sdecode(sbuf); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Sdecode"); /* Encode the simple dataspace in a buffer */ diff --git a/test/titerate.c b/test/titerate.c index 82d8e9f..674405c 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -233,7 +233,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Lget_name_by_idx"); ret = H5Gclose(root_group); @@ -264,7 +264,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Lget_name_by_idx"); /* Test invalid indices for starting iteration */ @@ -274,7 +274,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Literate2"); /* Test skipping exactly as many entries as in the group */ @@ -283,7 +283,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Literate2"); /* Test skipping more entries than are in the group */ @@ -292,7 +292,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Literate2"); /* Test all objects in group, when callback always returns 0 */ @@ -473,7 +473,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); /* Test skipping more attributes than there are */ @@ -482,7 +482,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); /* Test all attributes on dataset, when callback always returns 0 */ @@ -857,7 +857,7 @@ test_grp_memb_funcs(hid_t fapl) (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Lget_name_by_idx"); /* Sort the dataset names */ diff --git a/test/tmisc.c b/test/tmisc.c index 4638d74..76aed7b 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -1924,7 +1924,7 @@ test_misc11(void) { ret = H5Pset_sym_k(fcpl, 32770, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_sym_k"); ret = H5Pset_sym_k(fcpl, MISC11_SYM_IK, MISC11_SYM_LK); @@ -1935,7 +1935,7 @@ test_misc11(void) { ret = H5Pset_istore_k(fcpl, 32770); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_istore_k"); ret = H5Pset_istore_k(fcpl, MISC11_ISTORE_IK); @@ -3203,7 +3203,7 @@ test_misc19(void) { ret = H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Check H5I operations on property lists */ @@ -3237,7 +3237,7 @@ test_misc19(void) { ret = H5Pclose(plid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pclose"); /* Check H5I operations on property classes */ @@ -3271,7 +3271,7 @@ test_misc19(void) { ret = H5Pclose_class(pcid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pclose_class"); /* Check H5I operations on datatypes */ @@ -3305,7 +3305,7 @@ test_misc19(void) { ret = H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Tclose"); /* Check H5I operations on dataspaces */ @@ -3339,7 +3339,7 @@ test_misc19(void) { ret = H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sclose"); /* Check H5I operations on datasets */ @@ -3381,7 +3381,7 @@ test_misc19(void) { ret = H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dclose"); /* Close the dataspace */ @@ -3435,7 +3435,7 @@ test_misc19(void) { ret = H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aclose"); /* Close the root group */ @@ -3485,7 +3485,7 @@ test_misc19(void) { ret = H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Gclose"); /* Close the file */ @@ -3523,7 +3523,7 @@ test_misc19(void) { ret = H5Eunregister_class(ecid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Eunregister_class"); /* Check H5I operations on error messages */ @@ -3561,7 +3561,7 @@ test_misc19(void) { ret = H5Eclose_msg(emid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Eclose_msg"); /* Close the error class */ @@ -3599,7 +3599,7 @@ test_misc19(void) { ret = H5Eclose_stack(esid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Eclose_stack"); /* Check H5I operations on virtual file drivers */ @@ -3637,7 +3637,7 @@ test_misc19(void) { ret = H5FDunregister(vfdid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5FDunregister"); HDfree(vfd_cls); @@ -3677,7 +3677,7 @@ test_misc19(void) { ret = H5VLunregister_connector(volid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5VLunregister_connector"); HDfree(vol_cls); @@ -4127,7 +4127,7 @@ test_misc23(void) { tmp_id = H5Gcreate1(file_id, "/A/B00a/grp", (size_t)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gcreate1"); /* Make sure that size_hint values that can't fit into a 32-bit @@ -4139,7 +4139,7 @@ test_misc23(void) { tmp_id = H5Gcreate1(file_id, "/size_hint_too_large", SIZE_MAX); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gcreate1"); } @@ -4148,7 +4148,7 @@ test_misc23(void) { tmp_id = H5Gcreate1(file_id, "/largest_size_hint", UINT32_MAX); } - H5E_END_TRY; + H5E_END_TRY CHECK(tmp_id, FAIL, "H5Gcreate1"); status = H5Gclose(tmp_id); CHECK(status, FAIL, "H5Gclose"); @@ -4162,7 +4162,7 @@ test_misc23(void) { tmp_id = H5Dcreate1(file_id, "/A/B00c/dset", type_id, space_id, create_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dcreate1"); tmp_id = H5Dcreate1(file_id, "/A/dset", type_id, space_id, create_id); @@ -4497,84 +4497,84 @@ test_misc24(void) { tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); /* Try again, with the object already open through valid call */ @@ -4586,28 +4586,28 @@ test_misc24(void) { tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); ret = H5Gclose(group_id); @@ -4621,28 +4621,28 @@ test_misc24(void) { tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); H5E_BEGIN_TRY { tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Topen2"); ret = H5Dclose(dset_id); @@ -4656,28 +4656,28 @@ test_misc24(void) { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Gopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); H5E_BEGIN_TRY { tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_id, FAIL, "H5Dopen2"); ret = H5Tclose(type_id); @@ -5284,7 +5284,7 @@ test_misc27(void) { gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(gid, FAIL, "H5Gopen2"); #else /* H5_STRICT_FORMAT_CHECKS */ /* Open group with incorrect # of object header messages */ @@ -5798,7 +5798,7 @@ test_misc33(void) { ret = H5Oget_info_by_name3(fid, "/soft_two", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Oget_info_by_name3"); /* Case (2) */ @@ -5806,7 +5806,7 @@ test_misc33(void) { ret = H5Oget_info_by_name3(fid, "/dsetA", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Oget_info_by_name3"); /* Case (3) */ @@ -5814,7 +5814,7 @@ test_misc33(void) { ret = H5Oget_info_by_name3(fid, "/soft_one", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Oget_info_by_name3"); /* Close the file */ diff --git a/test/trefer.c b/test/trefer.c index 2c62234..e1cee21 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -1302,7 +1302,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { dset1 = H5Dcreate2(fid1, "Dataset1", H5T_STD_REF, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset1 < 0) { VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2"); @@ -1465,7 +1465,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { dset2 = H5Ropen_object(&rdata_NA[0], H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object"); /* Close and release resources. */ @@ -1478,7 +1478,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { ret = H5Dclose(dset2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dclose"); /* @@ -1633,7 +1633,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { ret = H5Rget_obj_type3(&nvrbuf[j], H5P_DEFAULT, &obj_type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type3"); } /* end for */ @@ -1758,7 +1758,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) { dset1 = H5Dcreate2(fid1, "Dataset1", H5T_STD_REF, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset1 < 0) { diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index 8d75fed..0128874 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -465,7 +465,7 @@ test_reference_obj(void) { ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &nvrbuf[j], &obj_type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type2"); } /* end for */ @@ -665,7 +665,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { ret = H5Rcreate(&wbuf[2], fid1, "/Dataset2", H5R_DATASET_REGION, sid2); } - H5E_END_TRY; + H5E_END_TRY if (libver_high < H5F_LIBVER_V110) VERIFY(ret, FAIL, "H5Rcreate"); @@ -743,7 +743,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { dset2 = H5Rdereference2(dset_NA, H5P_DEFAULT, H5R_DATASET_REGION, &rdata_NA[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, FAIL, "H5Rdereference2"); /* Close and release resources. */ @@ -756,7 +756,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { ret = H5Dclose(dset2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dclose"); /* @@ -913,7 +913,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) { ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &nvrbuf[j], &obj_type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type2"); } /* end for */ diff --git a/test/tselect.c b/test/tselect.c index d67e5bd..97061fe 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -290,7 +290,7 @@ test_select_hyper(hid_t xfer_plist) { ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_hyperslab"); /* Test selecting stride<block to verify failure */ @@ -310,7 +310,7 @@ test_select_hyper(hid_t xfer_plist) { ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_hyperslab"); /* Select 2x15x13 hyperslab for disk dataset */ @@ -353,13 +353,13 @@ test_select_hyper(hid_t xfer_plist) { ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dwrite"); H5E_BEGIN_TRY { ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dwrite"); /* Close memory dataspace */ @@ -403,13 +403,13 @@ test_select_hyper(hid_t xfer_plist) { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dread"); H5E_BEGIN_TRY { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dread"); /* Check that the values match with a dataset iterator */ @@ -8235,7 +8235,7 @@ test_scalar_select2(void) { ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)&coord1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_elements"); /* Select one element in memory with a hyperslab selection */ @@ -8245,7 +8245,7 @@ test_scalar_select2(void) { ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sselect_hyperslab"); /* Select no elements in memory & file with "none" selection */ @@ -13914,7 +13914,7 @@ test_select_bounds(void) { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_select_bounds"); /* Set point selection */ @@ -13948,7 +13948,7 @@ test_select_bounds(void) { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_select_bounds"); /* Set valid offset for selection */ @@ -14002,7 +14002,7 @@ test_select_bounds(void) { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_select_bounds"); /* Set valid offset for selection */ @@ -14056,7 +14056,7 @@ test_select_bounds(void) { ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_select_bounds"); /* Set valid offset for selection */ @@ -14121,7 +14121,7 @@ test_hyper_regular(void) { is_regular = H5Sis_regular_hyperslab(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); /* Query regular hyperslab selection info (should fail) */ @@ -14129,7 +14129,7 @@ test_hyper_regular(void) { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); /* Set 'none' selection */ @@ -14141,7 +14141,7 @@ test_hyper_regular(void) { is_regular = H5Sis_regular_hyperslab(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); /* Query regular hyperslab selection info (should fail) */ @@ -14149,7 +14149,7 @@ test_hyper_regular(void) { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); /* Set point selection */ @@ -14173,7 +14173,7 @@ test_hyper_regular(void) { is_regular = H5Sis_regular_hyperslab(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); /* Query regular hyperslab selection info (should fail) */ @@ -14181,7 +14181,7 @@ test_hyper_regular(void) { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); /* Set "regular" hyperslab selection */ @@ -14239,7 +14239,7 @@ test_hyper_regular(void) { ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); /* 'XOR' in the point again, to remove it, which should make it regular again */ @@ -15162,19 +15162,19 @@ test_sel_iter(void) { /* Bad dataspace ID */ iter_id = H5Ssel_iter_create(H5I_INVALID_HID, (size_t)1, (unsigned)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(iter_id, FAIL, "H5Ssel_iter_create"); H5E_BEGIN_TRY { /* Bad element size */ iter_id = H5Ssel_iter_create(sid, (size_t)0, (unsigned)0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(iter_id, FAIL, "H5Ssel_iter_create"); H5E_BEGIN_TRY { /* Bad flag(s) */ iter_id = H5Ssel_iter_create(sid, (size_t)1, (unsigned)0xffff); } - H5E_END_TRY; + H5E_END_TRY VERIFY(iter_id, FAIL, "H5Ssel_iter_create"); /* Try closing selection iterator, with bad parameters */ @@ -15182,13 +15182,13 @@ test_sel_iter(void) { /* Invalid ID */ ret = H5Ssel_iter_close(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_close"); H5E_BEGIN_TRY { /* Not a selection iterator ID */ ret = H5Ssel_iter_close(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_close"); /* Try with no selection sharing, and with sharing */ @@ -15212,7 +15212,7 @@ test_sel_iter(void) { /* Invalid ID */ ret = H5Ssel_iter_close(iter_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_close"); /* Create selection iterator object */ @@ -15224,13 +15224,13 @@ test_sel_iter(void) { ret = H5Ssel_iter_reset(H5I_INVALID_HID, sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_reset"); H5E_BEGIN_TRY { ret = H5Ssel_iter_reset(iter_id, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_reset"); /* Try retrieving sequences, with bad parameters */ @@ -15238,31 +15238,31 @@ test_sel_iter(void) { /* Invalid ID */ ret = H5Ssel_iter_get_seq_list(H5I_INVALID_HID, (size_t)1, (size_t)1, &nseq, &nbytes, off, len); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list"); H5E_BEGIN_TRY { /* Invalid nseq pointer */ ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, NULL, &nbytes, off, len); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list"); H5E_BEGIN_TRY { /* Invalid nbytes pointer */ ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, NULL, off, len); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list"); H5E_BEGIN_TRY { /* Invalid offset array */ ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, NULL, len); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list"); H5E_BEGIN_TRY { /* Invalid length array */ ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, off, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list"); /* Close selection iterator */ @@ -15686,31 +15686,31 @@ test_select_intersect_block(void) { /* Bad dataspace ID */ status = H5Sselect_intersect_block(H5I_INVALID_HID, block_start, block_end); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status, FAIL, "H5Sselect_intersect_block"); H5E_BEGIN_TRY { /* Bad start pointer */ status = H5Sselect_intersect_block(sid, NULL, block_end); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status, FAIL, "H5Sselect_intersect_block"); H5E_BEGIN_TRY { /* Bad end pointer */ status = H5Sselect_intersect_block(sid, block_start, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status, FAIL, "H5Sselect_intersect_block"); H5E_BEGIN_TRY { /* Invalid block */ status = H5Sselect_intersect_block(sid, block_start, block_end2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status, FAIL, "H5Sselect_intersect_block"); H5E_BEGIN_TRY { /* Another invalid block */ status = H5Sselect_intersect_block(sid, block_start, block_end3); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status, FAIL, "H5Sselect_intersect_block"); /* Set selection to 'none' */ diff --git a/test/tsohm.c b/test/tsohm.c index 7d9964f..9f2dd50 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -1344,7 +1344,7 @@ test_sohm_attrs(void) ret = H5Pclose(fcpl_id); CHECK_I(ret, "H5Pclose"); } - H5E_END_TRY; + H5E_END_TRY /* three shared message indices */ @@ -2157,9 +2157,9 @@ test_sohm_size2(int close_reopen) herr_t ret; if (close_reopen == 0) - MESSAGE(5, ("Testing that shared object header messages save space\n")) + MESSAGE(5, ("Testing that shared object header messages save space\n")); else - MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n")) + MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n")); /* Create an fcpl with SOHMs disabled */ fcpl_id = H5Pcreate(H5P_FILE_CREATE); diff --git a/test/tvltypes.c b/test/tvltypes.c index 1e0de1c..f8b8056 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -139,7 +139,7 @@ test_vltypes_dataset_create(void) { dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dataset, FAIL, "H5Dcreate2"); /* Close datatype */ @@ -208,14 +208,14 @@ test_vltypes_funcs(void) { cset = H5Tget_cset(type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(cset, FAIL, "H5Tget_cset"); H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); } - H5E_END_TRY; + H5E_END_TRY VERIFY(strpad, FAIL, "H5Tget_strpad"); /* Close datatype */ diff --git a/test/unlink.c b/test/unlink.c index e18ae73..50781d9 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -118,7 +118,7 @@ test_one(hid_t file) { status = H5Ldelete(grp, ".", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed."); if (H5Gclose(grp) < 0) @@ -137,7 +137,7 @@ error: H5Gclose(work); H5Gclose(grp); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_one() */ @@ -244,7 +244,7 @@ error: H5Gclose(work); H5Gclose(grp); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -289,7 +289,7 @@ error: { H5Gclose(work); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_symlink() */ @@ -353,7 +353,7 @@ error: H5Gclose(foo); H5Gclose(inner); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_rename() */ @@ -410,7 +410,7 @@ test_new_move(hid_t fapl) FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Move a group across files. Should fail. */ H5E_BEGIN_TRY @@ -418,7 +418,7 @@ test_new_move(hid_t fapl) if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR; } - H5E_END_TRY; + H5E_END_TRY /* Move a group across groups in the same file. */ if (H5Lmove(grp_1, "group_move", grp_2, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -454,7 +454,7 @@ error: H5Fclose(file_a); H5Fclose(file_b); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1243,7 +1243,7 @@ test_filespace(hid_t fapl) { dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dataset >= 0) { H5Dclose(dataset); TEST_ERROR; @@ -1285,7 +1285,7 @@ test_filespace(hid_t fapl) { group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group >= 0) { H5Gclose(group); TEST_ERROR; @@ -1335,7 +1335,7 @@ test_filespace(hid_t fapl) { status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) TEST_ERROR; if (H5Tclose(type) < 0) @@ -1390,7 +1390,7 @@ test_filespace(hid_t fapl) { attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr >= 0) { H5Aclose(attr); TEST_ERROR; @@ -1784,7 +1784,7 @@ error: { H5Gclose(gids[n]); } - H5E_END_TRY; + H5E_END_TRY } /* end if */ HDfree(gids); } /* end if */ @@ -1792,7 +1792,7 @@ error: { H5Gclose(rootid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlink_rightleaf() */ @@ -1874,7 +1874,7 @@ error: { H5Gclose(gids[n]); } - H5E_END_TRY; + H5E_END_TRY } /* end if */ HDfree(gids); } /* end if */ @@ -1882,7 +1882,7 @@ error: { H5Gclose(rootid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlink_rightnode() */ @@ -2250,7 +2250,7 @@ error: { H5Gclose(gids[n]); } - H5E_END_TRY; + H5E_END_TRY } /* end if */ HDfree(gids); } /* end if */ @@ -2258,7 +2258,7 @@ error: { H5Gclose(rootid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlink_middlenode() */ @@ -2342,7 +2342,7 @@ error: H5Dclose(d); H5Fclose(f); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_resurrect_dataset() */ @@ -2422,7 +2422,7 @@ error: H5Tclose(type); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_resurrect_datatype() */ @@ -2500,7 +2500,7 @@ error: H5Gclose(group); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_resurrect_group() */ @@ -2598,7 +2598,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlink_chunked_dataset() */ @@ -2759,7 +2759,7 @@ error: H5Gclose(gid); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_full_group_compact() */ @@ -2937,7 +2937,7 @@ error: H5Pclose(gcpl); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_full_group_dense() */ diff --git a/test/unregister.c b/test/unregister.c index 104e638..db6cfd1 100644 --- a/test/unregister.c +++ b/test/unregister.c @@ -152,7 +152,7 @@ test_unregister_filters(hid_t fapl_id) { ret = H5Zunregister(H5Z_FILTER_DUMMY); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__); @@ -203,7 +203,7 @@ test_unregister_filters(hid_t fapl_id) { ret = H5Zunregister(H5Z_FILTER_DUMMY); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__); @@ -258,7 +258,7 @@ error: H5Dclose(did); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -511,7 +511,7 @@ error: H5Fclose(file); H5Dclose(dset); } - H5E_END_TRY; + H5E_END_TRY if (plist_buf) HDfree(plist_buf); @@ -1165,7 +1165,7 @@ error: H5Pclose(dcpl); H5Pclose(ex_dcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_api() */ @@ -1435,7 +1435,7 @@ error: H5Pclose(dapl); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY if (HDsetenv("HDF5_VDS_PREFIX", "", 1) < 0) TEST_ERROR_SUPPRESSED; @@ -4368,7 +4368,7 @@ error: H5Sclose(memspace); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY HDfree(srcfilename); HDfree(srcfilename_map); @@ -7382,7 +7382,7 @@ error: H5Pclose(srcdcpl); H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_unlim() */ @@ -11088,7 +11088,7 @@ error: H5Pclose(dcpl); H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY HDfree(srcfilename); HDfree(srcfilename_map); @@ -12125,7 +12125,7 @@ error: H5Pclose(dcpl); H5Pclose(srcdcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_all() */ @@ -12277,7 +12277,7 @@ error: H5Sclose(src_sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_dapl_values() */ diff --git a/test/vds_env.c b/test/vds_env.c index 74b3caa..2f362d9 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -307,7 +307,7 @@ error: H5Pclose(dapl); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_vds_prefix2 */ @@ -78,12 +78,14 @@ const char *FILENAME[] = {"sec2_file", /*0*/ */ static int __k; #define HEXPRINT(size, buf) \ - for (__k = 0; __k < (size); __k++) { \ - if (__k % 16 == 0) { \ - HDprintf("\n%04x", __k); \ + do { \ + for (__k = 0; __k < (size); __k++) { \ + if (__k % 16 == 0) { \ + HDprintf("\n%04x", __k); \ + } \ + HDprintf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ } \ - HDprintf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ - } /* end #define HEXPRINT() */ + } while (0) /* end #define HEXPRINT() */ /* Macro SET_SIZE() * @@ -290,7 +292,7 @@ error: H5Pclose(fapl_id_out); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_sec2() */ @@ -676,7 +678,7 @@ error: H5Pclose(fapl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (data_w) HDfree(data_w); @@ -747,7 +749,7 @@ test_direct(void) { file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file < 0) { H5Pclose(fapl); SKIPPED(); @@ -903,7 +905,7 @@ error: H5Dclose(dset2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (proto_points) HDfree(proto_points); @@ -950,7 +952,7 @@ test_family_opens(char *fname, hid_t fa_pl) { file = H5Fopen(first_name, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file >= 0) TEST_ERROR; @@ -959,7 +961,7 @@ test_family_opens(char *fname, hid_t fa_pl) { file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file >= 0) TEST_ERROR; @@ -971,7 +973,7 @@ test_family_opens(char *fname, hid_t fa_pl) { file = H5Fopen(fname, H5F_ACC_RDWR, fa_pl); } - H5E_END_TRY; + H5E_END_TRY if (file >= 0) TEST_ERROR; @@ -990,7 +992,7 @@ test_family_opens(char *fname, hid_t fa_pl) { file = H5Fopen(wrong_name, H5F_ACC_RDWR, fa_pl); } - H5E_END_TRY; + H5E_END_TRY if (file >= 0) TEST_ERROR; @@ -1193,7 +1195,7 @@ error: H5Pclose(fapl2); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -1307,7 +1309,7 @@ error: H5Fclose(file); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_family_compat() */ @@ -1424,7 +1426,7 @@ error: H5Pclose(fapl_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -1467,7 +1469,7 @@ test_multi_opens(char *fname) { fid = H5Fopen(sf_name, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY return (fid >= 0 ? FAIL : SUCCEED); } /* end test_multi_opens() */ @@ -1716,7 +1718,7 @@ error: H5Fclose(file); H5Aclose(attr); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -1908,7 +1910,7 @@ error: H5Pclose(fapl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY HDfree(buf); HDfree(buf_data); @@ -1954,7 +1956,7 @@ test_log(void) { ret = H5Pset_fapl_log(H5I_INVALID_HID, LOG_FILENAME, 0, 0); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) TEST_ERROR; @@ -2038,7 +2040,7 @@ error: H5Pclose(fapl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2145,7 +2147,7 @@ error: H5Pclose(fapl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2268,7 +2270,7 @@ error: H5Pclose(fapl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return -1; #endif /* H5_HAVE_WINDOWS */ @@ -2366,7 +2368,7 @@ error: H5Pclose(fapl_id_out); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; #endif /* H5_HAVE_ROS3_VFD */ } /* end test_ros3() */ @@ -2381,7 +2383,7 @@ error: * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define SPLITTER_TEST_FAULT(mesg) \ - { \ + do { \ H5_FAILED(); \ AT(); \ HDfprintf(stderr, mesg); \ @@ -2389,7 +2391,7 @@ error: HDfflush(stderr); \ ret_value = -1; \ goto done; \ - } + } while (0) /*------------------------------------------------------------------------- * Function: compare_splitter_config_info @@ -2615,7 +2617,7 @@ done: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY } if (logfile != NULL) @@ -2669,7 +2671,7 @@ driver_is_splitter_compatible(hid_t fapl_id) { ret = H5Pset_fapl_splitter(split_fapl_id, vfd_config); } - H5E_END_TRY; + H5E_END_TRY if (SUCCEED == ret) { ret_value = -1; } @@ -2688,7 +2690,7 @@ error: { H5Pclose(split_fapl_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(vfd_config); @@ -2752,7 +2754,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { SPLITTER_TEST_FAULT("R/O open on nonexistent files unexpectedly successful\n"); } @@ -2768,7 +2770,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { SPLITTER_TEST_FAULT("R/O open with extant W/O file unexpectedly successful\n"); } @@ -2785,7 +2787,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { SPLITTER_TEST_FAULT("R/O open with extant R/W file unexpectedly successful\n"); } @@ -2823,7 +2825,7 @@ done: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY } HDfree(vfd_config); @@ -2962,7 +2964,7 @@ done: H5Sclose(space_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY } /* end if error */ return ret_value; } /* end splitter_create_single_file_at() */ @@ -3023,7 +3025,7 @@ done: { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY } return ret_value; } /* end splitter_compare_expected_data() */ @@ -3124,7 +3126,7 @@ splitter_tentative_open_test(hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id != H5I_INVALID_HID) { SPLITTER_TEST_FAULT("open with both nonexistent files unexpectedly succeeded\n"); } @@ -3148,7 +3150,7 @@ splitter_tentative_open_test(hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id != H5I_INVALID_HID) { SPLITTER_TEST_FAULT("open with nonexistent R/W file unexpectedly succeeded\n"); } @@ -3176,7 +3178,7 @@ splitter_tentative_open_test(hid_t child_fapl_id) { file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id != H5I_INVALID_HID) { SPLITTER_TEST_FAULT("open with nonexistent W/O unexpectedly succeeded\n"); } @@ -3314,7 +3316,7 @@ done: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY } HDfree(vfd_config); @@ -3345,7 +3347,7 @@ file_exists(const char *filename, hid_t fapl_id) { file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (file_id != H5I_INVALID_HID) { ret_value = 1; if (H5Fclose(file_id) < 0) { @@ -3360,7 +3362,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } /* end file_exists() */ @@ -3695,7 +3697,7 @@ run_ctl_test(uint64_t op_code, uint64_t flags, ctl_test_opc_type opc_type, hid_t { ctl_result = H5FDctl(file_drv_ptr, op_code, flags, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY } else ctl_result = H5FDctl(file_drv_ptr, op_code, flags, NULL, NULL); @@ -3722,7 +3724,7 @@ error: { H5FDclose(file_drv_ptr); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -4021,7 +4023,7 @@ error: H5Pclose(sub_fapl_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -4945,7 +4947,7 @@ error: H5Pclose(fapl_id); H5FDclose(lf); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_vector_io() */ @@ -5926,7 +5928,7 @@ error: H5Sclose(file_spaces[i]); } } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end test_selection_io() */ diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c index 182c048..e722405 100644 --- a/test/vfd_plugin.c +++ b/test/vfd_plugin.c @@ -82,7 +82,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -149,7 +149,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -261,7 +261,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -322,7 +322,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -708,7 +708,7 @@ test_vol_registration(void) { vol_id = H5VLregister_connector(&fake_vol_g, lapl_id); } - H5E_END_TRY; + H5E_END_TRY if (H5I_INVALID_HID != vol_id) FAIL_PUTS_ERROR("should not be able to register a connector with an incorrect property list"); if (H5Pclose(lapl_id) < 0) @@ -723,7 +723,7 @@ test_vol_registration(void) { vol_id = H5VLregister_connector(bad_fake_vol_class, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (H5I_INVALID_HID != vol_id) FAIL_PUTS_ERROR("should not be able to register a connector with an incompatible version #"); HDfree(bad_fake_vol_class); @@ -790,7 +790,7 @@ test_vol_registration(void) { ret = H5VLunregister_connector(native_id); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to unregister the native VOL connector"); @@ -804,7 +804,7 @@ error: H5Pclose(lapl_id); H5Pclose(vipl_id); } - H5E_END_TRY; + H5E_END_TRY if (bad_fake_vol_class) HDfree(bad_fake_vol_class); @@ -1030,7 +1030,7 @@ error: H5Pclose(fapl_id2); H5Pclose(fcpl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1137,7 +1137,7 @@ error: H5Pclose(fapl_id); H5Pclose(gcpl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1325,7 +1325,7 @@ error: H5Pclose(dapl_id); H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1438,7 +1438,7 @@ error: H5Aclose(aid); H5Aclose(aid_name); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1518,7 +1518,7 @@ error: H5Pclose(fapl_id); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1597,7 +1597,7 @@ error: H5Fclose(gid); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1694,7 +1694,7 @@ error: H5Tclose(tid); H5Tclose(tid_anon); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -1797,7 +1797,7 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s ret = (*reg_opt_op.obj_op)(__FILE__, __func__, __LINE__, obj_id, &vol_cb_args, H5P_DEFAULT, H5ES_NONE); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to perform an optional operation with a NULL callback"); if ((-1) != fake_obj) @@ -1956,7 +1956,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_NONE, "fail", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'NONE' VOL subclass"); if ((-1) != op_val) @@ -1965,7 +1965,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_INFO, "fail2", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'INFO' VOL subclass"); if ((-1) != op_val) @@ -1974,7 +1974,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_WRAP, "fail3", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'WRAP' VOL subclass"); if ((-1) != op_val) @@ -1983,7 +1983,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_BLOB, "fail4", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'BLOB' VOL subclass"); if ((-1) != op_val) @@ -1992,7 +1992,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_TOKEN, "fail5", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'TOKEN' VOL subclass"); if ((-1) != op_val) @@ -2003,7 +2003,7 @@ test_register_opt_operation(void) { ret = H5VLregister_opt_operation(H5VL_SUBCLS_FILE, "fail6", NULL); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to register an optional operation with a NULL 'op_val'"); @@ -2012,7 +2012,7 @@ test_register_opt_operation(void) { ret = H5VLfind_opt_operation(H5VL_SUBCLS_DATASET, "fail", &op_val); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to find a non-existent optional operation"); @@ -2021,7 +2021,7 @@ test_register_opt_operation(void) { ret = H5VLunregister_opt_operation(H5VL_SUBCLS_DATASET, "fail"); } - H5E_END_TRY; + H5E_END_TRY if (FAIL != ret) FAIL_PUTS_ERROR("should not be able to unregister a non-existent optional operation"); @@ -2054,7 +2054,7 @@ error: H5VLunregister_connector(fake_vol_id); H5VLunregister_connector(reg_opt_vol_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_register_opt_operation() */ @@ -2208,7 +2208,7 @@ error: H5Pclose(fapl_id); H5VLunregister_connector(vol_id); } - H5E_END_TRY; + H5E_END_TRY HDfree(conn_env_str); return FAIL; @@ -2313,7 +2313,7 @@ error: H5VLunregister_connector(vol_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_vol_cap_flags() */ @@ -2383,7 +2383,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_get_vol_name() */ diff --git a/test/vol_plugin.c b/test/vol_plugin.c index c7baf5a..4b8d263 100644 --- a/test/vol_plugin.c +++ b/test/vol_plugin.c @@ -75,7 +75,7 @@ error: { H5VLunregister_connector(vol_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_registration_by_value() */ @@ -132,7 +132,7 @@ error: { H5VLunregister_connector(vol_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_registration_by_name() */ @@ -237,7 +237,7 @@ error: for (i = 0; i < N_REGISTRATIONS; i++) H5VLunregister_connector(vol_ids[i]); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_multiple_registration() */ @@ -313,7 +313,7 @@ error: H5VLclose(vol_id_out); H5VLunregister_connector(vol_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_getters() */ |