diff options
| author | Sean McBride <sean@rogue-research.com> | 2023-08-02 22:46:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 22:46:26 (GMT) |
| commit | 07df0d252cc72fde5ead0abad12e23c8b522c2ee (patch) | |
| tree | 4e2bea9eb00f7f97fa8d22bac6c38f37a9576b26 | |
| parent | 86ddedf522aa8a72cfe03b9275ae16800d1fb5b9 (diff) | |
| download | hdf5-07df0d252cc72fde5ead0abad12e23c8b522c2ee.zip hdf5-07df0d252cc72fde5ead0abad12e23c8b522c2ee.tar.gz hdf5-07df0d252cc72fde5ead0abad12e23c8b522c2ee.tar.bz2 | |
Fixes the last of the -Wextra-semi-stmt warnings (#3326)
* Fixed extra semi warning by adjusting alternative macro definitions
* Find-replace H5E_END_TRY; -> H5E_END_TRY
* Made H5Epush_goto a do-while loop, fixed indentation
* Made GOTOERROR and ERRMSG do-while loops
* Made Hgoto_error and Hgoto_done do-while loops
* Made vrfy_cint_type and vrfy_ctype do-while loops
* Made TEST_TYPE_CONTIG and others do-while loops
* Removed extraneous semi-colons
* Committing clang-format changes
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
63 files changed, 1561 insertions, 1551 deletions
diff --git a/doc/getting-started-with-hdf5-development.md b/doc/getting-started-with-hdf5-development.md index 0365db7..3754df7 100644 --- a/doc/getting-started-with-hdf5-development.md +++ b/doc/getting-started-with-hdf5-development.md @@ -713,7 +713,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index 027cba9..cccb47f 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -531,26 +531,26 @@ do { \ #else /* H5C_COLLECT_CACHE_STATS */ -#define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr) -#define H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr) {} -#define H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr) -#define H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr) -#define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size) -#define H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) -#define H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) -#define H5C__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth) -#define H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr) -#define H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr) {} -#define H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr) -#define H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr, take_ownership) -#define H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit) -#define H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr) -#define H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr) -#define H5C__UPDATE_STATS_FOR_PREFETCH(cache_ptr, dirty) -#define H5C__UPDATE_STATS_FOR_PREFETCH_HIT(cache_ptr) -#define H5C__UPDATE_STATS_FOR_SLIST_SCAN_RESTART(cache_ptr) -#define H5C__UPDATE_STATS_FOR_LRU_SCAN_RESTART(cache_ptr) -#define H5C__UPDATE_STATS_FOR_INDEX_SCAN_RESTART(cache_ptr) +#define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size) do {} while(0) +#define H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth) do {} while(0) +#define H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr, take_ownership) do {} while(0) +#define H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit) do {} while(0) +#define H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_PREFETCH(cache_ptr, dirty) do {} while(0) +#define H5C__UPDATE_STATS_FOR_PREFETCH_HIT(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_SLIST_SCAN_RESTART(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_LRU_SCAN_RESTART(cache_ptr) do {} while(0) +#define H5C__UPDATE_STATS_FOR_INDEX_SCAN_RESTART(cache_ptr) do {} while(0) #endif /* H5C_COLLECT_CACHE_STATS */ diff --git a/src/H5Epublic.h b/src/H5Epublic.h index a62c462..8db118b 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -149,10 +149,10 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g; * And goto a label after pushing error onto stack. */ #define H5Epush_goto(func, cls, maj, min, str, label) \ - { \ + do { \ H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str); \ goto label; \ - } + } while (0) /** * Error stack traversal direction diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 1bccdaf..9f8a77c 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1115,11 +1115,11 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr close_fapl = fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (env && !strcmp(env, "split")) { if (H5Pset_fapl_split(fapl_id, NULL, H5P_DEFAULT, NULL, H5P_DEFAULT) < 0) - H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error) + H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error); } else { if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE) < 0) - H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error) + H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error); } fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id); @@ -1142,11 +1142,11 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr file->name = my_strdup(name); if (close_fapl >= 0) if (H5Pclose(close_fapl) < 0) - H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", error) + H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", error); - /* Compute derived properties and open member files */ - if (compute_next(file) < 0) H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, - "compute_next() failed", error); + /* Compute derived properties and open member files */ + if (compute_next(file) < 0) + H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", error); if (open_members(file) < 0) H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", error); diff --git a/src/H5Fint.c b/src/H5Fint.c index f212385..1b5b75b 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -1833,7 +1833,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) { lf = H5FD_open(name, tent_flags, fapl_id, HADDR_UNDEF); } - H5E_END_TRY; + H5E_END_TRY } /* diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c index 89b231f..282f04a 100644 --- a/test/API/H5_api_async_test.c +++ b/test/API/H5_api_async_test.c @@ -311,7 +311,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_one_dataset_io() */ @@ -564,7 +564,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_multi_dataset_io() */ @@ -873,7 +873,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_multi_file_dataset_io() */ @@ -1182,7 +1182,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_multi_file_grp_dset_io() */ @@ -1396,7 +1396,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_set_extent() */ @@ -1516,7 +1516,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_attribute_io() */ @@ -1659,7 +1659,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_attribute_io() */ @@ -1794,7 +1794,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_attribute_io_tconv() */ @@ -2110,7 +2110,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_attribute_io_compound() */ @@ -2277,7 +2277,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_group() */ @@ -2474,7 +2474,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_link() */ @@ -2589,7 +2589,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_ocopy_orefresh() */ @@ -2660,7 +2660,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_file_reopen() */ diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index 5c8efe9..1b3ef96 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -240,7 +240,7 @@ error: H5Aclose(attr_id2); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -425,7 +425,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -600,7 +600,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -711,7 +711,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -822,7 +822,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -928,7 +928,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -997,7 +997,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate2(H5I_INVALID_HID, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1018,7 +1018,7 @@ test_create_attribute_invalid_params(void) { attr_id = H5Acreate2(group_id, NULL, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1031,7 +1031,7 @@ test_create_attribute_invalid_params(void) { attr_id = H5Acreate2(group_id, "", attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1053,7 +1053,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, H5I_INVALID_HID, space_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1075,7 +1075,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1097,7 +1097,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1119,7 +1119,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1142,7 +1142,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1164,7 +1164,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate_by_name(group_id, NULL, ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1178,7 +1178,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate_by_name(group_id, "", ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1200,7 +1200,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate_by_name(container_group, ATTRIBUTE_CREATE_INVALID_PARAMS_GROUP_NAME, NULL, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1214,7 +1214,7 @@ test_create_attribute_invalid_params(void) attr_id = H5Acreate_by_name(container_group, ATTRIBUTE_CREATE_INVALID_PARAMS_GROUP_NAME, "", attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1238,7 +1238,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, H5I_INVALID_HID, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1261,7 +1261,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1284,7 +1284,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1307,7 +1307,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1330,7 +1330,7 @@ test_create_attribute_invalid_params(void) ATTRIBUTE_CREATE_INVALID_PARAMS_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1372,7 +1372,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1775,7 +1775,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1854,7 +1854,7 @@ test_open_attribute_invalid_params(void) { attr_id = H5Aopen(H5I_INVALID_HID, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1876,7 +1876,7 @@ test_open_attribute_invalid_params(void) { attr_id = H5Aopen(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1890,7 +1890,7 @@ test_open_attribute_invalid_params(void) { attr_id = H5Aopen(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1912,7 +1912,7 @@ test_open_attribute_invalid_params(void) { attr_id = H5Aopen(group_id, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1936,7 +1936,7 @@ test_open_attribute_invalid_params(void) H5Aopen_by_name(H5I_INVALID_HID, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1959,7 +1959,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_name(container_group, NULL, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1974,7 +1974,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_name(container_group, "", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -1997,7 +1997,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_name(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2012,7 +2012,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_name(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2037,7 +2037,7 @@ test_open_attribute_invalid_params(void) ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2061,7 +2061,7 @@ test_open_attribute_invalid_params(void) ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2084,7 +2084,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(H5I_INVALID_HID, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2107,7 +2107,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2122,7 +2122,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, "", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2145,7 +2145,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_UNKNOWN, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2161,7 +2161,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_N, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2184,7 +2184,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2200,7 +2200,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_N, 0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2224,7 +2224,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2247,7 +2247,7 @@ test_open_attribute_invalid_params(void) attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -2290,7 +2290,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2419,7 +2419,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2521,7 +2521,7 @@ test_write_attribute_invalid_params(void) { err_ret = H5Awrite(H5I_INVALID_HID, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2541,7 +2541,7 @@ test_write_attribute_invalid_params(void) { err_ret = H5Awrite(attr_id, H5I_INVALID_HID, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2561,7 +2561,7 @@ test_write_attribute_invalid_params(void) { err_ret = H5Awrite(attr_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2608,7 +2608,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2764,7 +2764,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2889,7 +2889,7 @@ test_read_attribute_invalid_params(void) { err_ret = H5Aread(H5I_INVALID_HID, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2909,7 +2909,7 @@ test_read_attribute_invalid_params(void) { err_ret = H5Aread(attr_id, H5I_INVALID_HID, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2929,7 +2929,7 @@ test_read_attribute_invalid_params(void) { err_ret = H5Aread(attr_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2978,7 +2978,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3105,7 +3105,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3138,7 +3138,7 @@ test_close_attribute_invalid_id(void) { err_ret = H5Aclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3158,7 +3158,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3316,7 +3316,7 @@ test_get_attribute_space_and_type(void) { H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY attr_id = H5I_INVALID_HID; } if (tmp_type_id >= 0) { @@ -3324,7 +3324,7 @@ test_get_attribute_space_and_type(void) { H5Tclose(tmp_type_id); } - H5E_END_TRY; + H5E_END_TRY tmp_type_id = H5I_INVALID_HID; } if (tmp_space_id >= 0) { @@ -3332,7 +3332,7 @@ test_get_attribute_space_and_type(void) { H5Sclose(tmp_space_id); } - H5E_END_TRY; + H5E_END_TRY tmp_space_id = H5I_INVALID_HID; } @@ -3373,7 +3373,7 @@ test_get_attribute_space_and_type(void) { H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY attr_id = H5I_INVALID_HID; } @@ -3420,7 +3420,7 @@ test_get_attribute_space_and_type(void) { H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY attr_id = H5I_INVALID_HID; } @@ -3463,7 +3463,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3559,7 +3559,7 @@ test_get_attribute_space_and_type_invalid_params(void) { tmp_type_id = H5Aget_type(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (tmp_type_id >= 0) { H5_FAILED(); @@ -3579,7 +3579,7 @@ test_get_attribute_space_and_type_invalid_params(void) { tmp_space_id = H5Aget_space(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (tmp_space_id >= 0) { H5_FAILED(); @@ -3624,7 +3624,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3803,7 +3803,7 @@ test_attribute_property_lists(void) { H5Pclose(acpl_id1); } - H5E_END_TRY; + H5E_END_TRY acpl_id1 = H5I_INVALID_HID; } if (acpl_id2 >= 0) { @@ -3811,7 +3811,7 @@ test_attribute_property_lists(void) { H5Pclose(acpl_id2); } - H5E_END_TRY; + H5E_END_TRY acpl_id2 = H5I_INVALID_HID; } if (attr_id1 >= 0) { @@ -3819,7 +3819,7 @@ test_attribute_property_lists(void) { H5Aclose(attr_id1); } - H5E_END_TRY; + H5E_END_TRY attr_id1 = H5I_INVALID_HID; } if (attr_id2 >= 0) { @@ -3827,7 +3827,7 @@ test_attribute_property_lists(void) { H5Aclose(attr_id2); } - H5E_END_TRY; + H5E_END_TRY attr_id2 = H5I_INVALID_HID; } @@ -3909,7 +3909,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4105,7 +4105,7 @@ test_get_attribute_name(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Aget_name_by_idx_crt_order_increasing) { @@ -4406,7 +4406,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4514,7 +4514,7 @@ test_get_attribute_name_invalid_params(void) { name_buf_size = H5Aget_name(H5I_INVALID_HID, (size_t)name_buf_size + 1, name_buf); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4535,7 +4535,7 @@ test_get_attribute_name_invalid_params(void) name_buf_size = 1; name_buf_size = H5Aget_name(attr_id, (size_t)name_buf_size, NULL); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4557,7 +4557,7 @@ test_get_attribute_name_invalid_params(void) H5I_INVALID_HID, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4578,7 +4578,7 @@ test_get_attribute_name_invalid_params(void) name_buf_size = H5Aget_name_by_idx(container_group, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4591,7 +4591,7 @@ test_get_attribute_name_invalid_params(void) name_buf_size = H5Aget_name_by_idx(container_group, "", H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4614,7 +4614,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_UNKNOWN, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4629,7 +4629,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_N, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4652,7 +4652,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4667,7 +4667,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_N, 0, name_buf, (size_t)name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4691,7 +4691,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, NULL, (size_t)name_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4714,7 +4714,7 @@ test_get_attribute_name_invalid_params(void) container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size + 1, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (name_buf_size >= 0) { H5_FAILED(); @@ -4764,7 +4764,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4969,7 +4969,7 @@ test_get_attribute_info(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Aget_info_by_name) { @@ -5424,7 +5424,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5518,7 +5518,7 @@ test_get_attribute_info_invalid_params(void) { err_ret = H5Aget_info(H5I_INVALID_HID, &attr_info); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5538,7 +5538,7 @@ test_get_attribute_info_invalid_params(void) { err_ret = H5Aget_info(attr_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5560,7 +5560,7 @@ test_get_attribute_info_invalid_params(void) ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5582,7 +5582,7 @@ test_get_attribute_info_invalid_params(void) H5Aget_info_by_name(group_id, NULL, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5595,7 +5595,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_name(group_id, "", ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5616,7 +5616,7 @@ test_get_attribute_info_invalid_params(void) { err_ret = H5Aget_info_by_name(group_id, ".", NULL, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5629,7 +5629,7 @@ test_get_attribute_info_invalid_params(void) { err_ret = H5Aget_info_by_name(group_id, ".", "", &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5651,7 +5651,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5673,7 +5673,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, &attr_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5694,7 +5694,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5715,7 +5715,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5728,7 +5728,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5750,7 +5750,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5764,7 +5764,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5786,7 +5786,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5800,7 +5800,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, &attr_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5821,7 +5821,7 @@ test_get_attribute_info_invalid_params(void) { err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5843,7 +5843,7 @@ test_get_attribute_info_invalid_params(void) err_ret = H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5886,7 +5886,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6103,7 +6103,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6215,7 +6215,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename(H5I_INVALID_HID, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6235,7 +6235,7 @@ test_rename_attribute_invalid_params(void) { err_ret = H5Arename(group_id, NULL, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6247,7 +6247,7 @@ test_rename_attribute_invalid_params(void) { err_ret = H5Arename(group_id, "", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6267,7 +6267,7 @@ test_rename_attribute_invalid_params(void) { err_ret = H5Arename(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6279,7 +6279,7 @@ test_rename_attribute_invalid_params(void) { err_ret = H5Arename(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ""); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6301,7 +6301,7 @@ test_rename_attribute_invalid_params(void) H5Arename_by_name(H5I_INVALID_HID, ".", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6322,7 +6322,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, NULL, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6335,7 +6335,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, "", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6356,7 +6356,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, ".", NULL, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6369,7 +6369,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, ".", "", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6391,7 +6391,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, ".", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6404,7 +6404,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, ".", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6426,7 +6426,7 @@ test_rename_attribute_invalid_params(void) err_ret = H5Arename_by_name(group_id, ".", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_NEW_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6472,7 +6472,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6864,7 +6864,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7288,7 +7288,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7703,7 +7703,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7871,7 +7871,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate2(H5I_INVALID_HID, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7892,7 +7892,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate2(group_id, H5_INDEX_UNKNOWN, H5_ITER_INC, NULL, attr_iter_callback2, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7905,7 +7905,7 @@ test_attribute_iterate_invalid_params(void) { err_ret = H5Aiterate2(group_id, H5_INDEX_N, H5_ITER_INC, NULL, attr_iter_callback2, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7926,7 +7926,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_UNKNOWN, NULL, attr_iter_callback2, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7939,7 +7939,7 @@ test_attribute_iterate_invalid_params(void) { err_ret = H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_N, NULL, attr_iter_callback2, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7961,7 +7961,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7982,7 +7982,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7995,7 +7995,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, "", H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8017,7 +8017,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8031,7 +8031,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, ".", H5_INDEX_N, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8053,7 +8053,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8067,7 +8067,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, ".", H5_INDEX_NAME, H5_ITER_N, NULL, attr_iter_callback2, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8089,7 +8089,7 @@ test_attribute_iterate_invalid_params(void) err_ret = H5Aiterate_by_name(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8141,7 +8141,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8328,7 +8328,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8468,7 +8468,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Adelete_by_name) { @@ -8534,7 +8534,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Adelete_by_idx_crt_order_increasing) { @@ -8785,7 +8785,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Adelete_by_idx_crt_order_decreasing) { @@ -9036,7 +9036,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Adelete_by_idx_name_order_increasing) { @@ -9281,7 +9281,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Adelete_by_idx_name_order_decreasing) { @@ -9526,7 +9526,7 @@ test_delete_attribute(void) H5Aclose(attr_id); attr_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -9560,7 +9560,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -9654,7 +9654,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete(H5I_INVALID_HID, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9674,7 +9674,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete(group_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9686,7 +9686,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete(group_id, ""); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9707,7 +9707,7 @@ test_delete_attribute_invalid_params(void) err_ret = H5Adelete_by_name(H5I_INVALID_HID, ".", ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9728,7 +9728,7 @@ test_delete_attribute_invalid_params(void) err_ret = H5Adelete_by_name(group_id, NULL, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9741,7 +9741,7 @@ test_delete_attribute_invalid_params(void) err_ret = H5Adelete_by_name(group_id, "", ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9762,7 +9762,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_name(group_id, ".", NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9774,7 +9774,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_name(group_id, ".", "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9796,7 +9796,7 @@ test_delete_attribute_invalid_params(void) err_ret = H5Adelete_by_name(group_id, ".", ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9816,7 +9816,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9836,7 +9836,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9848,7 +9848,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9869,7 +9869,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9882,7 +9882,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9903,7 +9903,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9916,7 +9916,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9937,7 +9937,7 @@ test_delete_attribute_invalid_params(void) { err_ret = H5Adelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9980,7 +9980,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10120,7 +10120,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10212,7 +10212,7 @@ test_attribute_exists_invalid_params(void) { err_ret = H5Aexists(H5I_INVALID_HID, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10232,7 +10232,7 @@ test_attribute_exists_invalid_params(void) { err_ret = H5Aexists(group_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10244,7 +10244,7 @@ test_attribute_exists_invalid_params(void) { err_ret = H5Aexists(group_id, ""); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10265,7 +10265,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(H5I_INVALID_HID, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10286,7 +10286,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(file_id, NULL, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10299,7 +10299,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(file_id, "", ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10320,7 +10320,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(file_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10333,7 +10333,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(file_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10354,7 +10354,7 @@ test_attribute_exists_invalid_params(void) err_ret = H5Aexists_by_name(file_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -10397,7 +10397,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10507,7 +10507,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10620,7 +10620,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10799,7 +10799,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10959,7 +10959,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index 9c7e5dc..c64769c 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -214,7 +214,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -302,7 +302,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -371,7 +371,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(H5I_INVALID_HID, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -393,7 +393,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, NULL, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -407,7 +407,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, "", dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -429,7 +429,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, H5I_INVALID_HID, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -451,7 +451,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, dset_dtype, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -473,7 +473,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -495,7 +495,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -517,7 +517,7 @@ test_create_dataset_invalid_params(void) dset_id = H5Dcreate2(group_id, DATASET_CREATE_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -559,7 +559,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -644,7 +644,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -714,7 +714,7 @@ test_create_anonymous_dataset_invalid_params(void) { dset_id = H5Dcreate_anon(H5I_INVALID_HID, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -735,7 +735,7 @@ test_create_anonymous_dataset_invalid_params(void) { dset_id = H5Dcreate_anon(group_id, H5I_INVALID_HID, fspace_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -756,7 +756,7 @@ test_create_anonymous_dataset_invalid_params(void) { dset_id = H5Dcreate_anon(group_id, dset_dtype, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -777,7 +777,7 @@ test_create_anonymous_dataset_invalid_params(void) { dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -798,7 +798,7 @@ test_create_anonymous_dataset_invalid_params(void) { dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -840,7 +840,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -937,7 +937,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1034,7 +1034,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1137,7 +1137,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1235,7 +1235,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1339,7 +1339,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1424,7 +1424,7 @@ test_create_dataset_string_types(void) { H5Dclose(dset_id_fixed); } - H5E_END_TRY; + H5E_END_TRY dset_id_fixed = H5I_INVALID_HID; } @@ -1456,7 +1456,7 @@ test_create_dataset_string_types(void) { H5Dclose(dset_id_variable); } - H5E_END_TRY; + H5E_END_TRY dset_id_variable = H5I_INVALID_HID; } @@ -1508,7 +1508,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1678,7 +1678,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1820,7 +1820,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2022,7 +2022,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2132,7 +2132,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2147,7 +2147,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } } @@ -2157,7 +2157,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2208,7 +2208,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2223,7 +2223,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } } @@ -2233,7 +2233,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2272,7 +2272,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2289,7 +2289,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -2297,7 +2297,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2341,7 +2341,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2356,7 +2356,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } } @@ -2366,7 +2366,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2442,7 +2442,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2459,7 +2459,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2468,7 +2468,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2529,7 +2529,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2544,7 +2544,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } } @@ -2554,7 +2554,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2598,7 +2598,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2615,7 +2615,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2638,7 +2638,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2655,7 +2655,7 @@ test_create_dataset_creation_properties(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -2663,7 +2663,7 @@ test_create_dataset_creation_properties(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } @@ -2707,7 +2707,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2809,7 +2809,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2901,7 +2901,7 @@ test_open_dataset_invalid_params(void) { dset_id = H5Dopen2(H5I_INVALID_HID, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -2922,7 +2922,7 @@ test_open_dataset_invalid_params(void) { dset_id = H5Dopen2(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -2935,7 +2935,7 @@ test_open_dataset_invalid_params(void) { dset_id = H5Dopen2(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -2956,7 +2956,7 @@ test_open_dataset_invalid_params(void) { dset_id = H5Dopen2(group_id, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -2998,7 +2998,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3032,7 +3032,7 @@ test_close_dataset_invalid_params(void) { err_ret = H5Dclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3052,7 +3052,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3195,7 +3195,7 @@ test_get_dataset_space_and_type(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } if (tmp_type_id >= 0) { @@ -3203,7 +3203,7 @@ test_get_dataset_space_and_type(void) { H5Tclose(tmp_type_id); } - H5E_END_TRY; + H5E_END_TRY tmp_type_id = H5I_INVALID_HID; } if (tmp_space_id >= 0) { @@ -3211,7 +3211,7 @@ test_get_dataset_space_and_type(void) { H5Sclose(tmp_space_id); } - H5E_END_TRY; + H5E_END_TRY tmp_space_id = H5I_INVALID_HID; } @@ -3252,7 +3252,7 @@ test_get_dataset_space_and_type(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -3299,7 +3299,7 @@ test_get_dataset_space_and_type(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -3342,7 +3342,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3422,7 +3422,7 @@ test_get_dataset_space_and_type_invalid_params(void) { tmp_type_id = H5Dget_type(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (tmp_type_id >= 0) { H5_FAILED(); @@ -3442,7 +3442,7 @@ test_get_dataset_space_and_type_invalid_params(void) { tmp_space_id = H5Dget_space(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (tmp_space_id >= 0) { H5_FAILED(); @@ -3487,7 +3487,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3675,7 +3675,7 @@ test_dataset_property_lists(void) { err_ret = H5Pget_chunk(dcpl_id2, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims); } - H5E_END_TRY; + H5E_END_TRY /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { @@ -3725,7 +3725,7 @@ test_dataset_property_lists(void) { H5Pclose(dapl_id1); } - H5E_END_TRY; + H5E_END_TRY dapl_id1 = H5I_INVALID_HID; } @@ -3798,7 +3798,7 @@ test_dataset_property_lists(void) { H5Pclose(dcpl_id1); } - H5E_END_TRY; + H5E_END_TRY dcpl_id1 = H5I_INVALID_HID; } if (dcpl_id2 >= 0) { @@ -3806,7 +3806,7 @@ test_dataset_property_lists(void) { H5Pclose(dcpl_id2); } - H5E_END_TRY; + H5E_END_TRY dcpl_id2 = H5I_INVALID_HID; } if (dset_id1 >= 0) { @@ -3814,7 +3814,7 @@ test_dataset_property_lists(void) { H5Dclose(dset_id1); } - H5E_END_TRY; + H5E_END_TRY dset_id1 = H5I_INVALID_HID; } if (dset_id2 >= 0) { @@ -3822,7 +3822,7 @@ test_dataset_property_lists(void) { H5Dclose(dset_id2); } - H5E_END_TRY; + H5E_END_TRY dset_id2 = H5I_INVALID_HID; } @@ -3877,7 +3877,7 @@ test_dataset_property_lists(void) { err_ret = H5Pget_chunk(dcpl_id2, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims); } - H5E_END_TRY; + H5E_END_TRY /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { @@ -3960,7 +3960,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4149,7 +4149,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4276,7 +4276,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4405,7 +4405,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4902,7 +4902,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_dataset_io_point_selections() */ @@ -4985,7 +4985,7 @@ test_read_dataset_invalid_params(void) err_ret = H5Dread(H5I_INVALID_HID, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5005,7 +5005,7 @@ test_read_dataset_invalid_params(void) { err_ret = H5Dread(dset_id, H5I_INVALID_HID, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5026,7 +5026,7 @@ test_read_dataset_invalid_params(void) err_ret = H5Dread(dset_id, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, H5I_INVALID_HID, H5S_ALL, H5P_DEFAULT, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5047,7 +5047,7 @@ test_read_dataset_invalid_params(void) err_ret = H5Dread(dset_id, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5I_INVALID_HID, H5P_DEFAULT, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5068,7 +5068,7 @@ test_read_dataset_invalid_params(void) err_ret = H5Dread(dset_id, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5I_INVALID_HID, read_buf); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5089,7 +5089,7 @@ test_read_dataset_invalid_params(void) err_ret = H5Dread(dset_id, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5136,7 +5136,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5264,7 +5264,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5395,7 +5395,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5527,7 +5527,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5635,7 +5635,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5643,7 +5643,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -5770,7 +5770,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -5778,7 +5778,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5786,7 +5786,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -5930,7 +5930,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -5938,7 +5938,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5946,7 +5946,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6042,7 +6042,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6132,7 +6132,7 @@ test_write_dataset_invalid_params(void) err_ret = H5Dwrite(H5I_INVALID_HID, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6152,7 +6152,7 @@ test_write_dataset_invalid_params(void) { err_ret = H5Dwrite(dset_id, H5I_INVALID_HID, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6173,7 +6173,7 @@ test_write_dataset_invalid_params(void) err_ret = H5Dwrite(dset_id, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPE, H5I_INVALID_HID, H5S_ALL, H5P_DEFAULT, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6194,7 +6194,7 @@ test_write_dataset_invalid_params(void) err_ret = H5Dwrite(dset_id, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5I_INVALID_HID, H5P_DEFAULT, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6215,7 +6215,7 @@ test_write_dataset_invalid_params(void) err_ret = H5Dwrite(dset_id, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5I_INVALID_HID, data); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6236,7 +6236,7 @@ test_write_dataset_invalid_params(void) err_ret = H5Dwrite(dset_id, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6283,7 +6283,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6404,7 +6404,7 @@ test_dataset_builtin_type_conversion(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -6412,7 +6412,7 @@ test_dataset_builtin_type_conversion(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6543,7 +6543,7 @@ test_dataset_builtin_type_conversion(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -6551,7 +6551,7 @@ test_dataset_builtin_type_conversion(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -6559,7 +6559,7 @@ test_dataset_builtin_type_conversion(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6707,7 +6707,7 @@ test_dataset_builtin_type_conversion(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -6715,7 +6715,7 @@ test_dataset_builtin_type_conversion(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -6723,7 +6723,7 @@ test_dataset_builtin_type_conversion(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6821,7 +6821,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7083,7 +7083,7 @@ error: H5Tclose(a_type_id); H5Tclose(b_type_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7315,7 +7315,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7595,7 +7595,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7934,7 +7934,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_set_extent_data */ @@ -8076,7 +8076,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_set_extent_double_handles */ @@ -8232,7 +8232,7 @@ test_dataset_set_extent_invalid_params(void) { err_ret = H5Dset_extent(compact_dset_id, new_dims); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8252,7 +8252,7 @@ test_dataset_set_extent_invalid_params(void) { err_ret = H5Dset_extent(contiguous_dset_id, new_dims); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8272,7 +8272,7 @@ test_dataset_set_extent_invalid_params(void) { err_ret = H5Dset_extent(H5I_INVALID_HID, new_dims); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8292,7 +8292,7 @@ test_dataset_set_extent_invalid_params(void) { err_ret = H5Dset_extent(chunked_dset_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8353,7 +8353,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_set_extent_invalid_params */ @@ -8584,7 +8584,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8718,7 +8718,7 @@ test_write_single_chunk_dataset(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -8726,7 +8726,7 @@ test_write_single_chunk_dataset(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -8805,7 +8805,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8983,7 +8983,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -9185,7 +9185,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -9193,7 +9193,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -9310,7 +9310,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -9511,7 +9511,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -9519,7 +9519,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -9647,7 +9647,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -9868,7 +9868,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -9876,7 +9876,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -9982,7 +9982,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10212,7 +10212,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -10220,7 +10220,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -10329,7 +10329,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10512,7 +10512,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10804,7 +10804,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10960,7 +10960,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* end test_get_vlen_buf_size() */ diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c index c1af758..5d6aa26 100644 --- a/test/API/H5_api_datatype_test.c +++ b/test/API/H5_api_datatype_test.c @@ -148,7 +148,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -217,7 +217,7 @@ test_create_committed_datatype_invalid_params(void) err_ret = H5Tcommit2(H5I_INVALID_HID, DATATYPE_CREATE_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -237,7 +237,7 @@ test_create_committed_datatype_invalid_params(void) { err_ret = H5Tcommit2(group_id, NULL, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -249,7 +249,7 @@ test_create_committed_datatype_invalid_params(void) { err_ret = H5Tcommit2(group_id, "", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -270,7 +270,7 @@ test_create_committed_datatype_invalid_params(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_INVALID_PARAMS_TEST_TYPE_NAME, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -291,7 +291,7 @@ test_create_committed_datatype_invalid_params(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -312,7 +312,7 @@ test_create_committed_datatype_invalid_params(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -333,7 +333,7 @@ test_create_committed_datatype_invalid_params(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -370,7 +370,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -449,7 +449,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -517,7 +517,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) { err_ret = H5Tcommit_anon(H5I_INVALID_HID, type_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -537,7 +537,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) { err_ret = H5Tcommit_anon(group_id, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -557,7 +557,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) { err_ret = H5Tcommit_anon(group_id, type_id, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -577,7 +577,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) { err_ret = H5Tcommit_anon(group_id, type_id, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -614,7 +614,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -683,7 +683,7 @@ test_create_committed_datatype_empty_types(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_CMPD_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -715,7 +715,7 @@ test_create_committed_datatype_empty_types(void) { H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY type_id = H5I_INVALID_HID; } @@ -736,7 +736,7 @@ test_create_committed_datatype_empty_types(void) err_ret = H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_ENUM_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -768,7 +768,7 @@ test_create_committed_datatype_empty_types(void) { H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY type_id = H5I_INVALID_HID; } } @@ -789,7 +789,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -867,7 +867,7 @@ test_recommit_committed_type(void) { err_ret = H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -896,7 +896,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -985,7 +985,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1062,7 +1062,7 @@ test_open_committed_datatype_invalid_params(void) { type_id = H5Topen2(H5I_INVALID_HID, DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (type_id >= 0) { H5_FAILED(); @@ -1083,7 +1083,7 @@ test_open_committed_datatype_invalid_params(void) { type_id = H5Topen2(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (type_id >= 0) { H5_FAILED(); @@ -1096,7 +1096,7 @@ test_open_committed_datatype_invalid_params(void) { type_id = H5Topen2(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (type_id >= 0) { H5_FAILED(); @@ -1117,7 +1117,7 @@ test_open_committed_datatype_invalid_params(void) { type_id = H5Topen2(group_id, DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (type_id >= 0) { H5_FAILED(); @@ -1153,7 +1153,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1304,7 +1304,7 @@ test_reopen_committed_datatype_indirect(void) H5Dclose(dset_id); dset_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(reopen_enum_type) { @@ -1386,7 +1386,7 @@ test_reopen_committed_datatype_indirect(void) H5Dclose(dset_id); dset_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(reopen_vlen_type) { @@ -1452,7 +1452,7 @@ test_reopen_committed_datatype_indirect(void) H5Dclose(dset_id); dset_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(reopen_opaque_type) { @@ -1526,7 +1526,7 @@ test_reopen_committed_datatype_indirect(void) H5Dclose(dset_id); dset_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(reopen_array_type) { @@ -1594,7 +1594,7 @@ test_reopen_committed_datatype_indirect(void) H5Dclose(dset_id); dset_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -1625,7 +1625,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1660,7 +1660,7 @@ test_close_committed_datatype_invalid_id(void) { err_ret = H5Tclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1680,7 +1680,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1800,7 +1800,7 @@ test_datatype_property_lists(void) { H5Pclose(tcpl_id1); } - H5E_END_TRY; + H5E_END_TRY tcpl_id1 = H5I_INVALID_HID; } if (tcpl_id2 >= 0) { @@ -1808,7 +1808,7 @@ test_datatype_property_lists(void) { H5Pclose(tcpl_id2); } - H5E_END_TRY; + H5E_END_TRY tcpl_id2 = H5I_INVALID_HID; } if (type_id1 >= 0) { @@ -1816,7 +1816,7 @@ test_datatype_property_lists(void) { H5Tclose(type_id1); } - H5E_END_TRY; + H5E_END_TRY type_id1 = H5I_INVALID_HID; } if (type_id2 >= 0) { @@ -1824,7 +1824,7 @@ test_datatype_property_lists(void) { H5Tclose(type_id2); } - H5E_END_TRY; + H5E_END_TRY type_id2 = H5I_INVALID_HID; } @@ -1896,7 +1896,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2039,7 +2039,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2172,7 +2172,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2284,7 +2284,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2425,7 +2425,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2519,7 +2519,7 @@ test_cant_commit_predefined(void) err_ret = H5Tcommit2(group_id, "committed_predefined_type", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2545,7 +2545,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2624,7 +2624,7 @@ test_cant_modify_committed_type(void) { err_ret = H5Tset_precision(type_id, (size_t)256); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2653,7 +2653,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c index 1455f64..5f3af25 100644 --- a/test/API/H5_api_file_test.c +++ b/test/API/H5_api_file_test.c @@ -98,7 +98,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -140,7 +140,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate(NULL, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -153,7 +153,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate("", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -174,7 +174,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -187,7 +187,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate(prefixed_filename, H5F_ACC_CREAT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -200,7 +200,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate(prefixed_filename, H5F_ACC_SWMR_READ, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -221,7 +221,7 @@ test_create_file_invalid_params(void) { file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -249,7 +249,7 @@ error: H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -299,7 +299,7 @@ test_create_file_excl(void) { file_id = H5Fcreate(prefixed_filename, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -330,7 +330,7 @@ error: H5Fclose(file_id); H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -375,7 +375,7 @@ test_open_file(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -398,7 +398,7 @@ test_open_file(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -415,7 +415,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -448,7 +448,7 @@ test_open_file_invalid_params(void) { file_id = H5Fopen(NULL, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -461,7 +461,7 @@ test_open_file_invalid_params(void) { file_id = H5Fopen("", H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -482,7 +482,7 @@ test_open_file_invalid_params(void) { file_id = H5Fopen(H5_api_test_filename, H5F_ACC_TRUNC, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -495,7 +495,7 @@ test_open_file_invalid_params(void) { file_id = H5Fopen(H5_api_test_filename, H5F_ACC_EXCL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -517,7 +517,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -552,7 +552,7 @@ test_open_nonexistent_file(void) { file_id = H5Fopen(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (file_id >= 0) { H5_FAILED(); @@ -572,7 +572,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -660,7 +660,7 @@ test_file_permission(void) group_id = H5Gcreate2(file_id, FILE_PERMISSION_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -672,7 +672,7 @@ test_file_permission(void) { group_id = H5Gcreate_anon(file_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -694,7 +694,7 @@ test_file_permission(void) dset_id = H5Dcreate2(file_id, FILE_PERMISSION_TEST_DSET2_NAME, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -706,7 +706,7 @@ test_file_permission(void) { dset_id = H5Dcreate_anon(file_id, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -728,7 +728,7 @@ test_file_permission(void) attr_id = H5Acreate2(file_id, FILE_PERMISSION_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (attr_id >= 0) { H5_FAILED(); @@ -756,7 +756,7 @@ test_file_permission(void) h5_ret = H5Tcommit2(file_id, FILE_PERMISSION_TEST_NAMED_DTYPE, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (h5_ret >= 0) { H5_FAILED(); @@ -768,7 +768,7 @@ test_file_permission(void) { h5_ret = H5Tcommit_anon(file_id, dtype_id, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (h5_ret >= 0) { H5_FAILED(); @@ -808,7 +808,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -860,7 +860,7 @@ error: H5Fclose(file_id); H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -886,7 +886,7 @@ test_close_file_invalid_id(void) { err_ret = H5Fclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1016,7 +1016,7 @@ error: H5Dclose(dset_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -1081,7 +1081,7 @@ test_file_is_accessible(void) { is_accessible = H5Fis_accessible(prefixed_filename, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (is_accessible > 0) { H5_FAILED(); @@ -1268,7 +1268,7 @@ test_file_property_lists(void) { H5Pclose(fcpl_id1); } - H5E_END_TRY; + H5E_END_TRY fcpl_id1 = H5I_INVALID_HID; } if (fcpl_id2 >= 0) { @@ -1276,7 +1276,7 @@ test_file_property_lists(void) { H5Pclose(fcpl_id2); } - H5E_END_TRY; + H5E_END_TRY fcpl_id2 = H5I_INVALID_HID; } if (fapl_id1 >= 0) { @@ -1284,7 +1284,7 @@ test_file_property_lists(void) { H5Pclose(fapl_id1); } - H5E_END_TRY; + H5E_END_TRY fapl_id1 = H5I_INVALID_HID; } if (fapl_id2 >= 0) { @@ -1292,7 +1292,7 @@ test_file_property_lists(void) { H5Pclose(fapl_id2); } - H5E_END_TRY; + H5E_END_TRY fapl_id2 = H5I_INVALID_HID; } if (file_id1 >= 0) { @@ -1300,7 +1300,7 @@ test_file_property_lists(void) { H5Fclose(file_id1); } - H5E_END_TRY; + H5E_END_TRY file_id1 = H5I_INVALID_HID; } if (file_id2 >= 0) { @@ -1308,7 +1308,7 @@ test_file_property_lists(void) { H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY file_id2 = H5I_INVALID_HID; } @@ -1405,7 +1405,7 @@ error: H5Fclose(file_id1); H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename1); free(prefixed_filename2); @@ -1476,7 +1476,7 @@ test_get_file_intent(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -1512,7 +1512,7 @@ test_get_file_intent(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -1547,7 +1547,7 @@ test_get_file_intent(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } } @@ -1563,7 +1563,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -1907,7 +1907,7 @@ error: H5Fclose(file_id); H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename1); free(prefixed_filename2); @@ -2046,7 +2046,7 @@ error: H5Fclose(file_id); H5Fclose(file_id2); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -2135,7 +2135,7 @@ error: H5Fclose(file_id); H5Fclose(child_fid); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); @@ -2254,7 +2254,7 @@ test_get_file_name(void) { H5Gclose(group_id); } - H5E_END_TRY; + H5E_END_TRY group_id = H5I_INVALID_HID; } @@ -2299,7 +2299,7 @@ test_get_file_name(void) { H5Sclose(dspace_id); } - H5E_END_TRY; + H5E_END_TRY dspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -2307,7 +2307,7 @@ test_get_file_name(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2352,7 +2352,7 @@ test_get_file_name(void) { H5Sclose(dspace_id); } - H5E_END_TRY; + H5E_END_TRY dspace_id = H5I_INVALID_HID; } if (attr_id >= 0) { @@ -2360,7 +2360,7 @@ test_get_file_name(void) { H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY attr_id = H5I_INVALID_HID; } @@ -2405,7 +2405,7 @@ test_get_file_name(void) { H5Tclose(named_dtype_id); } - H5E_END_TRY; + H5E_END_TRY named_dtype_id = H5I_INVALID_HID; } @@ -2431,7 +2431,7 @@ test_get_file_name(void) { name_len = H5Fget_name(dspace_id, file_name_buf, (size_t)file_name_buf_len + 1); } - H5E_END_TRY; + H5E_END_TRY if (name_len >= 0) { H5_FAILED(); @@ -2444,7 +2444,7 @@ test_get_file_name(void) { H5Sclose(dspace_id); } - H5E_END_TRY; + H5E_END_TRY dspace_id = H5I_INVALID_HID; } @@ -2483,7 +2483,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY free(prefixed_filename); diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index d3093bb..7b95655 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -103,7 +103,7 @@ error: H5Gclose(parent_gid); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -180,7 +180,7 @@ error: H5Gclose(parent_group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -260,7 +260,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -326,7 +326,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -368,7 +368,7 @@ error: { H5Gclose(child_gid); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -516,7 +516,7 @@ error: H5Fclose(file_id); H5Pclose(crt_intmd_lcpl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -561,7 +561,7 @@ test_create_group_invalid_params(void) group_id = H5Gcreate2(H5I_INVALID_HID, GROUP_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -582,7 +582,7 @@ test_create_group_invalid_params(void) { group_id = H5Gcreate2(file_id, NULL, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -595,7 +595,7 @@ test_create_group_invalid_params(void) { group_id = H5Gcreate2(file_id, "", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -617,7 +617,7 @@ test_create_group_invalid_params(void) group_id = H5Gcreate2(file_id, GROUP_CREATE_INVALID_PARAMS_GROUP_NAME, H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -639,7 +639,7 @@ test_create_group_invalid_params(void) group_id = H5Gcreate2(file_id, GROUP_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -661,7 +661,7 @@ test_create_group_invalid_params(void) group_id = H5Gcreate2(file_id, GROUP_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -691,7 +691,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -751,7 +751,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -801,7 +801,7 @@ test_create_anonymous_group_invalid_params(void) { new_group_id = H5Gcreate_anon(H5I_INVALID_HID, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (new_group_id >= 0) { H5_FAILED(); @@ -822,7 +822,7 @@ test_create_anonymous_group_invalid_params(void) { new_group_id = H5Gcreate_anon(container_group, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (new_group_id >= 0) { H5_FAILED(); @@ -843,7 +843,7 @@ test_create_anonymous_group_invalid_params(void) { new_group_id = H5Gcreate_anon(container_group, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (new_group_id >= 0) { H5_FAILED(); @@ -876,7 +876,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -910,7 +910,7 @@ test_open_nonexistent_group(void) { group_id = H5Gopen2(file_id, OPEN_NONEXISTENT_GROUP_TEST_GNAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -931,7 +931,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -975,7 +975,7 @@ test_open_group_invalid_params(void) { group_id = H5Gopen2(H5I_INVALID_HID, GROUP_TEST_GROUP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -996,7 +996,7 @@ test_open_group_invalid_params(void) { group_id = H5Gopen2(file_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -1009,7 +1009,7 @@ test_open_group_invalid_params(void) { group_id = H5Gopen2(file_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -1030,7 +1030,7 @@ test_open_group_invalid_params(void) { group_id = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -1060,7 +1060,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1087,7 +1087,7 @@ test_close_group_invalid_id(void) { err_ret = H5Gclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1243,7 +1243,7 @@ test_group_property_lists(void) { H5Pclose(gcpl_id1); } - H5E_END_TRY; + H5E_END_TRY gcpl_id1 = H5I_INVALID_HID; } if (gcpl_id2 >= 0) { @@ -1251,7 +1251,7 @@ test_group_property_lists(void) { H5Pclose(gcpl_id2); } - H5E_END_TRY; + H5E_END_TRY gcpl_id2 = H5I_INVALID_HID; } if (group_id1 >= 0) { @@ -1259,7 +1259,7 @@ test_group_property_lists(void) { H5Gclose(group_id1); } - H5E_END_TRY; + H5E_END_TRY group_id1 = H5I_INVALID_HID; } if (group_id2 >= 0) { @@ -1267,7 +1267,7 @@ test_group_property_lists(void) { H5Gclose(group_id2); } - H5E_END_TRY; + H5E_END_TRY group_id2 = H5I_INVALID_HID; } @@ -1370,7 +1370,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1801,7 +1801,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1847,7 +1847,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info(H5I_INVALID_HID, &group_info); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1867,7 +1867,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info(file_id, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1887,7 +1887,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_name(H5I_INVALID_HID, ".", &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1907,7 +1907,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_name(file_id, NULL, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1919,7 +1919,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_name(file_id, "", &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1939,7 +1939,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_name(file_id, ".", NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1960,7 +1960,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_name(file_id, ".", &group_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1981,7 +1981,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2002,7 +2002,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2015,7 +2015,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2037,7 +2037,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2051,7 +2051,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_N, H5_ITER_INC, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2073,7 +2073,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2087,7 +2087,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, &group_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2108,7 +2108,7 @@ test_get_group_info_invalid_params(void) { err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2130,7 +2130,7 @@ test_get_group_info_invalid_params(void) err_ret = H5Gget_info_by_idx(file_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &group_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2158,7 +2158,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2228,7 +2228,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2255,7 +2255,7 @@ test_flush_group_invalid_params(void) { status = H5Gflush(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -2336,7 +2336,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2363,7 +2363,7 @@ test_refresh_group_invalid_params(void) { status = H5Grefresh(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index 901ff96..caeafa6 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -246,7 +246,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -355,7 +355,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (objname) free(objname); @@ -539,7 +539,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -670,7 +670,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -734,7 +734,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(H5I_INVALID_HID, "/", group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -755,7 +755,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, NULL, group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -768,7 +768,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, "", group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -789,7 +789,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, "/", H5I_INVALID_HID, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -809,7 +809,7 @@ test_create_hard_link_invalid_params(void) { err_ret = H5Lcreate_hard(file_id, "/", group_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -821,7 +821,7 @@ test_create_hard_link_invalid_params(void) { err_ret = H5Lcreate_hard(file_id, "/", group_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -842,7 +842,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, "/", group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -863,7 +863,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, "/", group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -884,7 +884,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(H5L_SAME_LOC, "/", H5L_SAME_LOC, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -914,7 +914,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(file_id, "/", ext_file_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -927,7 +927,7 @@ test_create_hard_link_invalid_params(void) err_ret = H5Lcreate_hard(ext_file_id, "/", group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -987,7 +987,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_create_hard_link_invalid_params */ @@ -1094,7 +1094,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1189,7 +1189,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1262,7 +1262,7 @@ test_create_soft_link_dangling_relative(void) { object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_id >= 0) { H5_FAILED(); @@ -1310,7 +1310,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1384,7 +1384,7 @@ test_create_soft_link_dangling_absolute(void) { object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_id >= 0) { H5_FAILED(); @@ -1432,7 +1432,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1541,7 +1541,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (objname) free(objname); @@ -1675,7 +1675,7 @@ test_create_soft_link_many(void) { object_id = H5Gopen2(group_id, "soft16", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_id >= 0) { H5_FAILED(); @@ -1737,7 +1737,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1799,7 +1799,7 @@ test_create_soft_link_invalid_params(void) err_ret = H5Lcreate_soft(NULL, group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1813,7 +1813,7 @@ test_create_soft_link_invalid_params(void) err_ret = H5Lcreate_soft("", group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1835,7 +1835,7 @@ test_create_soft_link_invalid_params(void) err_ret = H5Lcreate_soft("/", H5I_INVALID_HID, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1856,7 +1856,7 @@ test_create_soft_link_invalid_params(void) { err_ret = H5Lcreate_soft("/", group_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1869,7 +1869,7 @@ test_create_soft_link_invalid_params(void) { err_ret = H5Lcreate_soft("/", group_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1891,7 +1891,7 @@ test_create_soft_link_invalid_params(void) err_ret = H5Lcreate_soft("/", group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1913,7 +1913,7 @@ test_create_soft_link_invalid_params(void) err_ret = H5Lcreate_soft("/", group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -1971,7 +1971,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2078,7 +2078,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2159,7 +2159,7 @@ test_create_external_link_dangling(void) { object_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_id >= 0) { H5_FAILED(); @@ -2211,7 +2211,7 @@ error: H5Fclose(file_id); H5Fclose(ext_file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2570,7 +2570,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2831,7 +2831,7 @@ error: H5Gclose(group_id2); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2906,7 +2906,7 @@ test_create_external_link_invalid_params(void) err_ret = H5Lcreate_external(NULL, "/", group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2920,7 +2920,7 @@ test_create_external_link_invalid_params(void) err_ret = H5Lcreate_external("", "/", group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2943,7 +2943,7 @@ test_create_external_link_invalid_params(void) H5Lcreate_external(ext_link_filename, NULL, group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2958,7 +2958,7 @@ test_create_external_link_invalid_params(void) H5Lcreate_external(ext_link_filename, "", group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2981,7 +2981,7 @@ test_create_external_link_invalid_params(void) H5Lcreate_external(ext_link_filename, "/", H5I_INVALID_HID, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3003,7 +3003,7 @@ test_create_external_link_invalid_params(void) err_ret = H5Lcreate_external(ext_link_filename, "/", group_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3016,7 +3016,7 @@ test_create_external_link_invalid_params(void) { err_ret = H5Lcreate_external(ext_link_filename, "/", group_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3039,7 +3039,7 @@ test_create_external_link_invalid_params(void) EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3062,7 +3062,7 @@ test_create_external_link_invalid_params(void) EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3120,7 +3120,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3209,7 +3209,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3277,7 +3277,7 @@ test_create_user_defined_link_invalid_params(void) H5Lcreate_ud(H5I_INVALID_HID, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3299,7 +3299,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, NULL, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3313,7 +3313,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, "", H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3335,7 +3335,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5L_TYPE_HARD, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3357,7 +3357,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, NULL, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3379,7 +3379,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3401,7 +3401,7 @@ test_create_user_defined_link_invalid_params(void) err_ret = H5Lcreate_ud(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3457,7 +3457,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3595,7 +3595,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_hard_indirect) { @@ -3678,7 +3678,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_soft) { @@ -3747,7 +3747,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_external) { @@ -3834,7 +3834,7 @@ test_delete_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_ud) { @@ -3852,7 +3852,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_hard_crt_order_increasing) { @@ -4085,7 +4085,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_hard_crt_order_decreasing) { @@ -4318,7 +4318,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_hard_name_order_increasing) { @@ -4545,7 +4545,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_hard_name_order_decreasing) { @@ -4772,7 +4772,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_soft_crt_order_increasing) { @@ -5008,7 +5008,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_soft_crt_order_decreasing) { @@ -5244,7 +5244,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_soft_name_order_increasing) { @@ -5474,7 +5474,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_soft_name_order_decreasing) { @@ -5704,7 +5704,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_external_crt_order_increasing) { @@ -5986,7 +5986,7 @@ test_delete_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_external_crt_order_decreasing) { @@ -6268,7 +6268,7 @@ test_delete_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_external_name_order_increasing) { @@ -6544,7 +6544,7 @@ test_delete_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_external_name_order_decreasing) { @@ -6820,7 +6820,7 @@ test_delete_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_ud_crt_order_increasing) { @@ -6838,7 +6838,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_ud_crt_order_decreasing) { @@ -6856,7 +6856,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_ud_name_order_increasing) { @@ -6874,7 +6874,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_by_idx_ud_name_order_decreasing) { @@ -6892,7 +6892,7 @@ test_delete_link(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -6921,7 +6921,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7069,7 +7069,7 @@ test_delete_link_reset_grp_max_crt_order(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Ldelete_links_top_down) { @@ -7149,7 +7149,7 @@ test_delete_link_reset_grp_max_crt_order(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -7177,7 +7177,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7258,7 +7258,7 @@ test_delete_link_invalid_params(void) err_ret = H5Ldelete(H5I_INVALID_HID, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7278,7 +7278,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7290,7 +7290,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7311,7 +7311,7 @@ test_delete_link_invalid_params(void) err_ret = H5Ldelete(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7331,7 +7331,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7351,7 +7351,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7363,7 +7363,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7383,7 +7383,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7395,7 +7395,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7415,7 +7415,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7427,7 +7427,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7447,7 +7447,7 @@ test_delete_link_invalid_params(void) { err_ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -7504,7 +7504,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8356,7 +8356,7 @@ test_copy_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lcopy_external_check) { @@ -8567,7 +8567,7 @@ test_copy_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lcopy_external_same_loc) { @@ -8710,7 +8710,7 @@ test_copy_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lcopy_ud_no_check) { @@ -8774,7 +8774,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -8917,7 +8917,7 @@ test_copy_link_invalid_params(void) H5Lcopy(H5I_INVALID_HID, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8939,7 +8939,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, NULL, dst_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8953,7 +8953,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, "", dst_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8975,7 +8975,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5I_INVALID_HID, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -8996,7 +8996,7 @@ test_copy_link_invalid_params(void) err_ret = H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9009,7 +9009,7 @@ test_copy_link_invalid_params(void) err_ret = H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9031,7 +9031,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9053,7 +9053,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9075,7 +9075,7 @@ test_copy_link_invalid_params(void) H5Lcopy(H5L_SAME_LOC, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5L_SAME_LOC, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9106,7 +9106,7 @@ test_copy_link_invalid_params(void) H5Lcopy(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, ext_file_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -9153,7 +9153,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10163,7 +10163,7 @@ test_move_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lmove_external_check) { @@ -10374,7 +10374,7 @@ test_move_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lmove_external_same_loc) { @@ -10513,7 +10513,7 @@ test_move_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lmove_external_rename) { @@ -10615,7 +10615,7 @@ test_move_link(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lmove_ud_no_check) { @@ -10690,7 +10690,7 @@ error: H5Fclose(file_id); H5Fclose(ext_file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -10877,7 +10877,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -11081,7 +11081,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -11197,7 +11197,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(H5I_INVALID_HID, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11218,7 +11218,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, NULL, dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11231,7 +11231,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, "", dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11252,7 +11252,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5I_INVALID_HID, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11273,7 +11273,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11286,7 +11286,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11307,7 +11307,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11328,7 +11328,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11388,7 +11388,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(H5L_SAME_LOC, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5L_SAME_LOC, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11419,7 +11419,7 @@ test_move_link_invalid_params(void) err_ret = H5Lmove(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, ext_file_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -11482,7 +11482,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -11634,7 +11634,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_external) { @@ -11745,7 +11745,7 @@ test_get_link_val(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_ud) { @@ -11763,7 +11763,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_soft_crt_order_increasing) { @@ -11957,7 +11957,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_soft_crt_order_decreasing) { @@ -12151,7 +12151,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_soft_name_order_increasing) { @@ -12339,7 +12339,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_soft_name_order_decreasing) { @@ -12527,7 +12527,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_external_crt_order_increasing) { @@ -12777,7 +12777,7 @@ test_get_link_val(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_external_crt_order_decreasing) { @@ -13027,7 +13027,7 @@ test_get_link_val(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_external_name_order_increasing) { @@ -13271,7 +13271,7 @@ test_get_link_val(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_external_name_order_decreasing) { @@ -13515,7 +13515,7 @@ test_get_link_val(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_ud_crt_order_increasing) { @@ -13531,7 +13531,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_ud_crt_order_decreasing) { @@ -13547,7 +13547,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_ud_name_order_increasing) { @@ -13563,7 +13563,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_val_by_idx_ud_name_order_decreasing) { @@ -13579,7 +13579,7 @@ test_get_link_val(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -13608,7 +13608,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -13712,7 +13712,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val(H5I_INVALID_HID, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13732,7 +13732,7 @@ test_get_link_val_invalid_params(void) { err_ret = H5Lget_val(group_id, NULL, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13744,7 +13744,7 @@ test_get_link_val_invalid_params(void) { err_ret = H5Lget_val(group_id, "", link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13765,7 +13765,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val(group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, link_val_buf, link_val_buf_size, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13788,7 +13788,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13809,7 +13809,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13822,7 +13822,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13843,7 +13843,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13856,7 +13856,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13877,7 +13877,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13890,7 +13890,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, link_val_buf, link_val_buf_size, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13911,7 +13911,7 @@ test_get_link_val_invalid_params(void) err_ret = H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, link_val_buf_size, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -13955,7 +13955,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -14098,7 +14098,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_soft) { @@ -14181,7 +14181,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_external) { @@ -14277,7 +14277,7 @@ test_get_link_info(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_ud) { @@ -14295,7 +14295,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_hard_crt_order_increasing) { @@ -14458,7 +14458,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_hard_crt_order_decreasing) { @@ -14621,7 +14621,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_hard_name_order_increasing) { @@ -14784,7 +14784,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_hard_name_order_decreasing) { @@ -14947,7 +14947,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_soft_crt_order_increasing) { @@ -15146,7 +15146,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_soft_crt_order_decreasing) { @@ -15345,7 +15345,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_soft_name_order_increasing) { @@ -15544,7 +15544,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_soft_name_order_decreasing) { @@ -15743,7 +15743,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_external_crt_order_increasing) { @@ -15947,7 +15947,7 @@ test_get_link_info(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_external_crt_order_decreasing) { @@ -16151,7 +16151,7 @@ test_get_link_info(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_external_name_order_increasing) { @@ -16355,7 +16355,7 @@ test_get_link_info(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_external_name_order_decreasing) { @@ -16559,7 +16559,7 @@ test_get_link_info(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_ud_crt_order_increasing) { @@ -16575,7 +16575,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_ud_crt_order_decreasing) { @@ -16591,7 +16591,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_ud_name_order_increasing) { @@ -16607,7 +16607,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_info_by_idx_ud_name_order_decreasing) { @@ -16623,7 +16623,7 @@ test_get_link_info(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -16652,7 +16652,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -16747,7 +16747,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info2(H5I_INVALID_HID, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16767,7 +16767,7 @@ test_get_link_info_invalid_params(void) { err_ret = H5Lget_info2(group_id, NULL, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16779,7 +16779,7 @@ test_get_link_info_invalid_params(void) { err_ret = H5Lget_info2(group_id, "", &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16800,7 +16800,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info2(group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, &link_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16823,7 +16823,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16844,7 +16844,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16857,7 +16857,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16878,7 +16878,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16891,7 +16891,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16912,7 +16912,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16926,7 +16926,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, &link_info, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16947,7 +16947,7 @@ test_get_link_info_invalid_params(void) err_ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -16984,7 +16984,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -17223,7 +17223,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_hard_crt_order_decreasing) { @@ -17391,7 +17391,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_hard_name_order_increasing) { @@ -17553,7 +17553,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_hard_name_order_decreasing) { @@ -17715,7 +17715,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_soft_crt_order_increasing) { @@ -17883,7 +17883,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_soft_crt_order_decreasing) { @@ -18051,7 +18051,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_soft_name_order_increasing) { @@ -18213,7 +18213,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_soft_name_order_decreasing) { @@ -18375,7 +18375,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_external_crt_order_increasing) { @@ -18564,7 +18564,7 @@ test_get_link_name(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_external_crt_order_decreasing) { @@ -18753,7 +18753,7 @@ test_get_link_name(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_external_name_order_increasing) { @@ -18936,7 +18936,7 @@ test_get_link_name(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_external_name_order_decreasing) { @@ -19119,7 +19119,7 @@ test_get_link_name(void) H5Fclose(ext_file_id); ext_file_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_ud_crt_order_increasing) { @@ -19137,7 +19137,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_ud_crt_order_decreasing) { @@ -19155,7 +19155,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_ud_name_order_increasing) { @@ -19173,7 +19173,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY PART_BEGIN(H5Lget_name_by_idx_ud_name_order_decreasing) { @@ -19191,7 +19191,7 @@ test_get_link_name(void) H5Gclose(subgroup_id); subgroup_id = H5I_INVALID_HID; } - H5E_END_TRY; + H5E_END_TRY } END_MULTIPART; @@ -19220,7 +19220,7 @@ error: H5Fclose(ext_file_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -19319,7 +19319,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19340,7 +19340,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19353,7 +19353,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, "", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19374,7 +19374,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19387,7 +19387,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_N, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19408,7 +19408,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19421,7 +19421,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_N, 0, link_name_buf, link_name_buf_size + 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19442,7 +19442,7 @@ test_get_link_name_invalid_params(void) ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, link_name_buf_size + 1, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -19483,7 +19483,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -19856,7 +19856,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -20209,7 +20209,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -20574,7 +20574,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -21090,7 +21090,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -21237,7 +21237,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate2(H5I_INVALID_HID, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21258,7 +21258,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate2(group_id, H5_INDEX_UNKNOWN, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21271,7 +21271,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate2(group_id, H5_INDEX_N, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21292,7 +21292,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_UNKNOWN, NULL, link_iter_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21305,7 +21305,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_N, NULL, link_iter_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21327,7 +21327,7 @@ test_link_iterate_invalid_params(void) H5I_INVALID_HID, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21348,7 +21348,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate_by_name2(file_id, NULL, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21361,7 +21361,7 @@ test_link_iterate_invalid_params(void) err_ret = H5Literate_by_name2(file_id, "", H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21383,7 +21383,7 @@ test_link_iterate_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_UNKNOWN, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21397,7 +21397,7 @@ test_link_iterate_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_N, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21419,7 +21419,7 @@ test_link_iterate_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_UNKNOWN, NULL, link_iter_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21434,7 +21434,7 @@ test_link_iterate_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_N, NULL, link_iter_invalid_params_cb, &i, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21456,7 +21456,7 @@ test_link_iterate_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_invalid_params_cb, NULL, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -21499,7 +21499,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -21737,7 +21737,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -22137,7 +22137,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -22517,7 +22517,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -22911,7 +22911,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -23424,7 +23424,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -23797,7 +23797,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -24176,7 +24176,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -24561,7 +24561,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -25024,7 +25024,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -25221,7 +25221,7 @@ test_link_visit_invalid_params(void) err_ret = H5Lvisit2(H5I_INVALID_HID, H5_INDEX_NAME, H5_ITER_INC, link_visit_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25242,7 +25242,7 @@ test_link_visit_invalid_params(void) err_ret = H5Lvisit2(group_id, H5_INDEX_UNKNOWN, H5_ITER_INC, link_visit_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25254,7 +25254,7 @@ test_link_visit_invalid_params(void) { err_ret = H5Lvisit2(group_id, H5_INDEX_N, H5_ITER_INC, link_visit_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25275,7 +25275,7 @@ test_link_visit_invalid_params(void) err_ret = H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_UNKNOWN, link_visit_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25287,7 +25287,7 @@ test_link_visit_invalid_params(void) { err_ret = H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_N, link_visit_invalid_params_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25310,7 +25310,7 @@ test_link_visit_invalid_params(void) "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25331,7 +25331,7 @@ test_link_visit_invalid_params(void) err_ret = H5Lvisit_by_name2(file_id, NULL, H5_INDEX_NAME, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25344,7 +25344,7 @@ test_link_visit_invalid_params(void) err_ret = H5Lvisit_by_name2(file_id, "", H5_INDEX_NAME, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25366,7 +25366,7 @@ test_link_visit_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_UNKNOWN, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25380,7 +25380,7 @@ test_link_visit_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_N, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25402,7 +25402,7 @@ test_link_visit_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_UNKNOWN, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25416,7 +25416,7 @@ test_link_visit_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_N, link_visit_invalid_params_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25438,7 +25438,7 @@ test_link_visit_invalid_params(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_invalid_params_cb, NULL, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -25485,7 +25485,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -25719,7 +25719,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c index 4e32f97..2e53804 100644 --- a/test/API/H5_api_misc_test.c +++ b/test/API/H5_api_misc_test.c @@ -125,7 +125,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -359,7 +359,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -702,7 +702,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -773,7 +773,7 @@ test_dot_for_object_name(void) { group_id = H5Gcreate2(subgroup_id, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id >= 0) { H5_FAILED(); @@ -795,7 +795,7 @@ test_dot_for_object_name(void) dset_id = H5Dcreate2(subgroup_id, ".", H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (dset_id >= 0) { H5_FAILED(); @@ -822,7 +822,7 @@ test_dot_for_object_name(void) { ret = H5Tcommit2(subgroup_id, ".", dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); @@ -869,7 +869,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1031,7 +1031,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c index a809d0e..992071e 100644 --- a/test/API/H5_api_object_test.c +++ b/test/API/H5_api_object_test.c @@ -175,7 +175,7 @@ test_open_object(void) { H5Gclose(group_id2); } - H5E_END_TRY; + H5E_END_TRY if ((group_id2 = H5Oopen(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -214,7 +214,7 @@ test_open_object(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY if ((dset_id = H5Oopen(group_id, OBJECT_OPEN_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -259,7 +259,7 @@ test_open_object(void) { H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY if ((type_id = H5Oopen(group_id, OBJECT_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -288,7 +288,7 @@ test_open_object(void) { H5Gclose(group_id2); } - H5E_END_TRY; + H5E_END_TRY group_id2 = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -296,7 +296,7 @@ test_open_object(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } if (type_id >= 0) { @@ -304,7 +304,7 @@ test_open_object(void) { H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY type_id = H5I_INVALID_HID; } @@ -359,7 +359,7 @@ test_open_object(void) { H5Gclose(group_id2); } - H5E_END_TRY; + H5E_END_TRY group_id2 = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -367,7 +367,7 @@ test_open_object(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } if (type_id >= 0) { @@ -375,7 +375,7 @@ test_open_object(void) { H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY type_id = H5I_INVALID_HID; } } @@ -410,7 +410,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -496,7 +496,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen(H5I_INVALID_HID, OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -517,7 +517,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -530,7 +530,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -551,7 +551,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen(group_id, OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -573,7 +573,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(H5I_INVALID_HID, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -594,7 +594,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen_by_idx(container_group, NULL, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -607,7 +607,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen_by_idx(container_group, "", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -629,7 +629,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_UNKNOWN, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -643,7 +643,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_N, H5_ITER_INC, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -665,7 +665,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_UNKNOWN, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -679,7 +679,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_N, 0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -701,7 +701,7 @@ test_open_object_invalid_params(void) group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -722,7 +722,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen_by_token(H5I_INVALID_HID, H5O_TOKEN_UNDEF); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -743,7 +743,7 @@ test_open_object_invalid_params(void) { group_id2 = H5Oopen_by_token(file_id, H5O_TOKEN_UNDEF); } - H5E_END_TRY; + H5E_END_TRY if (group_id2 >= 0) { H5_FAILED(); @@ -782,7 +782,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1047,7 +1047,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1119,7 +1119,7 @@ test_object_exists_invalid_params(void) object_exists = H5Oexists_by_name(H5I_INVALID_HID, OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_exists >= 0) { H5_FAILED(); @@ -1139,7 +1139,7 @@ test_object_exists_invalid_params(void) { object_exists = H5Oexists_by_name(group_id, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_exists >= 0) { H5_FAILED(); @@ -1151,7 +1151,7 @@ test_object_exists_invalid_params(void) { object_exists = H5Oexists_by_name(group_id, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (object_exists >= 0) { H5_FAILED(); @@ -1172,7 +1172,7 @@ test_object_exists_invalid_params(void) object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (object_exists >= 0) { H5_FAILED(); @@ -1207,7 +1207,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1392,7 +1392,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1460,7 +1460,7 @@ test_link_object_invalid_params(void) status = H5Olink(H5I_INVALID_HID, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1481,7 +1481,7 @@ test_link_object_invalid_params(void) status = H5Olink(group_id2, H5I_INVALID_HID, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1501,7 +1501,7 @@ test_link_object_invalid_params(void) { status = H5Olink(group_id2, group_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1513,7 +1513,7 @@ test_link_object_invalid_params(void) { status = H5Olink(group_id2, group_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1534,7 +1534,7 @@ test_link_object_invalid_params(void) status = H5Olink(group_id2, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1555,7 +1555,7 @@ test_link_object_invalid_params(void) status = H5Olink(group_id2, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1592,7 +1592,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1890,7 +1890,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_incr_decr_object_refcount */ @@ -1923,7 +1923,7 @@ test_incr_decr_object_refcount_invalid_params(void) { status = H5Oincr_refcount(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -1943,7 +1943,7 @@ test_incr_decr_object_refcount_invalid_params(void) { status = H5Odecr_refcount(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -2306,7 +2306,7 @@ test_object_copy_basic(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } @@ -2396,7 +2396,7 @@ test_object_copy_basic(void) { H5Dclose(tmp_dset_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dset_id = H5I_INVALID_HID; } @@ -2486,7 +2486,7 @@ test_object_copy_basic(void) { H5Tclose(tmp_dtype_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dtype_id = H5I_INVALID_HID; } } @@ -2534,7 +2534,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2640,7 +2640,7 @@ test_object_copy_already_existing(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME, group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2661,7 +2661,7 @@ test_object_copy_already_existing(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME, group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2682,7 +2682,7 @@ test_object_copy_already_existing(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME, group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -2732,7 +2732,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2959,7 +2959,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3215,7 +3215,7 @@ test_object_copy_no_attributes(void) { H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY ocpypl_id = H5I_INVALID_HID; } if (tmp_group_id >= 0) { @@ -3223,7 +3223,7 @@ test_object_copy_no_attributes(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } @@ -3315,7 +3315,7 @@ test_object_copy_no_attributes(void) { H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY ocpypl_id = H5I_INVALID_HID; } if (tmp_dset_id >= 0) { @@ -3323,7 +3323,7 @@ test_object_copy_no_attributes(void) { H5Dclose(tmp_dset_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dset_id = H5I_INVALID_HID; } @@ -3415,7 +3415,7 @@ test_object_copy_no_attributes(void) { H5Pclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY ocpypl_id = H5I_INVALID_HID; } if (tmp_dtype_id >= 0) { @@ -3423,7 +3423,7 @@ test_object_copy_no_attributes(void) { H5Tclose(tmp_dtype_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dtype_id = H5I_INVALID_HID; } } @@ -3472,7 +3472,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3736,7 +3736,7 @@ test_object_copy_by_soft_link(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } @@ -3762,7 +3762,7 @@ test_object_copy_by_soft_link(void) H5Ocopy(group_id, OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME, group_id, OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME "2", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -3804,7 +3804,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4006,7 +4006,7 @@ test_object_copy_group_with_soft_links(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } @@ -4124,7 +4124,7 @@ test_object_copy_group_with_soft_links(void) { H5Gclose(ocpypl_id); } - H5E_END_TRY; + H5E_END_TRY ocpypl_id = H5I_INVALID_HID; } if (tmp_group_id >= 0) { @@ -4132,7 +4132,7 @@ test_object_copy_group_with_soft_links(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } } @@ -4163,7 +4163,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4530,7 +4530,7 @@ test_object_copy_between_files(void) { H5Gclose(tmp_group_id); } - H5E_END_TRY; + H5E_END_TRY tmp_group_id = H5I_INVALID_HID; } @@ -4624,7 +4624,7 @@ test_object_copy_between_files(void) { H5Dclose(tmp_dset_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dset_id = H5I_INVALID_HID; } @@ -4719,7 +4719,7 @@ test_object_copy_between_files(void) { H5Tclose(tmp_dtype_id); } - H5E_END_TRY; + H5E_END_TRY tmp_dtype_id = H5I_INVALID_HID; } } @@ -4771,7 +4771,7 @@ error: H5Fclose(file_id2); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4840,7 +4840,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(H5I_INVALID_HID, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4861,7 +4861,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, NULL, group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4874,7 +4874,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, "", group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4895,7 +4895,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, H5I_INVALID_HID, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4916,7 +4916,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, group_id, NULL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4929,7 +4929,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, group_id, "", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4950,7 +4950,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5I_INVALID_HID, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -4971,7 +4971,7 @@ test_object_copy_invalid_params(void) err_ret = H5Ocopy(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME2, H5P_DEFAULT, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -5008,7 +5008,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5559,7 +5559,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6049,7 +6049,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6118,7 +6118,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit3(H5I_INVALID_HID, H5_INDEX_NAME, H5_ITER_INC, object_visit_noop_callback, NULL, H5O_INFO_ALL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6139,7 +6139,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit3(group_id, H5_INDEX_UNKNOWN, H5_ITER_INC, object_visit_noop_callback, NULL, H5O_INFO_ALL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6152,7 +6152,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit3(group_id, H5_INDEX_N, H5_ITER_INC, object_visit_noop_callback, NULL, H5O_INFO_ALL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6173,7 +6173,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_UNKNOWN, object_visit_noop_callback, NULL, H5O_INFO_ALL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6186,7 +6186,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6207,7 +6207,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(H5I_INVALID_HID, ".", H5_INDEX_NAME, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6228,7 +6228,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, NULL, H5_INDEX_NAME, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6241,7 +6241,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, "", H5_INDEX_NAME, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6262,7 +6262,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, ".", H5_INDEX_UNKNOWN, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6275,7 +6275,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, ".", H5_INDEX_N, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6296,7 +6296,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_UNKNOWN, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6309,7 +6309,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_N, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6330,7 +6330,7 @@ test_object_visit_invalid_params(void) err_ret = H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_noop_callback, NULL, H5O_INFO_ALL, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6367,7 +6367,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6445,7 +6445,7 @@ test_close_object(void) { H5Gclose(group_id2); } - H5E_END_TRY; + H5E_END_TRY if ((group_id2 = H5Oopen(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -6478,7 +6478,7 @@ test_close_object(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY if ((dset_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -6517,7 +6517,7 @@ test_close_object(void) { H5Tclose(dtype_id); } - H5E_END_TRY; + H5E_END_TRY if ((dtype_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); @@ -6566,7 +6566,7 @@ error: H5Gclose(container_group); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6600,7 +6600,7 @@ test_close_object_invalid_params(void) { err_ret = H5Oclose(H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY if (err_ret >= 0) { H5_FAILED(); @@ -6620,7 +6620,7 @@ error: { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6698,7 +6698,7 @@ test_close_invalid_objects(void) { status = H5Oclose(file_id); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -6718,7 +6718,7 @@ test_close_invalid_objects(void) { status = H5Oclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -6738,7 +6738,7 @@ test_close_invalid_objects(void) { status = H5Oclose(attr_space_id); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -6758,7 +6758,7 @@ test_close_invalid_objects(void) { status = H5Oclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY if (status >= 0) { H5_FAILED(); @@ -6804,7 +6804,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_close_invalid_objects */ diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c index 9e9cc6a..916f2ca 100644 --- a/test/API/H5_api_test_util.c +++ b/test/API/H5_api_test_util.c @@ -712,7 +712,7 @@ error: H5Gclose(group_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } diff --git a/test/API/tarray.c b/test/API/tarray.c index 39bb419..e05cab3 100644 --- a/test/API/tarray.c +++ b/test/API/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/API/tattr.c b/test/API/tattr.c index 182d62d..a1ff6c6 100644 --- a/test/API/tattr.c +++ b/test/API/tattr.c @@ -257,7 +257,7 @@ test_attr_basic_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -405,7 +405,7 @@ test_attr_basic_write(hid_t fapl) { ret_id = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -786,7 +786,7 @@ test_attr_compound_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR4_NAME, tid1, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -1013,7 +1013,7 @@ test_attr_scalar_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR5_NAME, H5T_NATIVE_FLOAT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -1162,7 +1162,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -1192,7 +1192,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -1222,7 +1222,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR3_NAME, H5T_NATIVE_DOUBLE, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); } @@ -1622,7 +1622,7 @@ test_attr_delete(hid_t fapl) { ret = H5Adelete(dataset, "Bogus"); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete"); } @@ -2329,7 +2329,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) { attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(attr, FAIL, "H5Acreate2"); } @@ -4339,7 +4339,7 @@ test_attr_deprec(hid_t fcpl, hid_t fapl) { ret = H5Aget_num_attrs((hid_t)-1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_num_attrs"); /* Get number of attributes */ @@ -4553,7 +4553,7 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) { ret = H5Pset_attr_creation_order(dcpl, H5P_CRT_ORDER_INDEXED); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_attr_creation_order"); #if 0 @@ -6058,14 +6058,14 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create attributes, up to limit of compact form */ @@ -6103,21 +6103,21 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create more attributes, to push into dense form */ @@ -6168,21 +6168,21 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); } /* end for */ @@ -6239,7 +6239,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"); @@ -6247,7 +6247,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"); @@ -6255,7 +6255,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"); @@ -6303,7 +6303,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"); @@ -6311,7 +6311,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"); @@ -6319,7 +6319,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"); @@ -6327,7 +6327,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"); @@ -6335,7 +6335,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"); @@ -6343,7 +6343,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"); @@ -6351,7 +6351,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"); @@ -6359,7 +6359,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"); @@ -6409,7 +6409,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"); @@ -6417,7 +6417,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"); @@ -6586,7 +6586,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); /* Create attributes, up to limit of compact form */ @@ -6624,7 +6624,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6757,7 +6757,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6825,7 +6825,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6996,7 +6996,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -7406,7 +7406,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx { ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_fail_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); skip = 0; @@ -7415,7 +7415,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); skip = 0; @@ -7424,7 +7424,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Retrieve current # of errors */ @@ -7639,7 +7639,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; @@ -7648,7 +7648,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; @@ -7657,7 +7657,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored compactly */ @@ -7741,7 +7741,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; @@ -7750,7 +7750,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; @@ -7759,7 +7759,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored densely */ @@ -7999,7 +7999,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Create attributes, up to limit of compact form */ @@ -8038,7 +8038,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -8116,7 +8116,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -8337,21 +8337,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Create attributes, up to limit of compact form */ @@ -8388,21 +8388,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ @@ -8481,21 +8481,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ diff --git a/test/API/tconfig.c b/test/API/tconfig.c index 2438e33..3d49524 100644 --- a/test/API/tconfig.c +++ b/test/API/tconfig.c @@ -25,13 +25,18 @@ * with the macro size. */ #define vrfy_cint_type(ctype, uctype, ctype_macro) \ - /* check signed type size */ \ - vrfy_macrosize(ctype, ctype_macro, #ctype_macro); \ - /* check unsigned type size */ \ - vrfy_macrosize(uctype, ctype_macro, #ctype_macro); + do { \ + /* check signed type size */ \ + vrfy_macrosize(ctype, ctype_macro, #ctype_macro); \ + /* check unsigned type size */ \ + vrfy_macrosize(uctype, ctype_macro, #ctype_macro); \ + } while (0) /* verify C type sizes: verify the sizeof type with the macro size. */ -#define vrfy_ctype(type, macro) vrfy_macrosize(type, macro, #macro); +#define vrfy_ctype(type, macro) \ + do { \ + vrfy_macrosize(type, macro, #macro); \ + } while (0) /* verify if the sizeof(type) matches size defined in macro. */ /* Needs this extra step so that we can print the macro name. */ diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c index 62d4a7d..f69b1c8 100644 --- a/test/API/testhdf5.c +++ b/test/API/testhdf5.c @@ -695,7 +695,7 @@ main(int argc, char *argv[]) cleanup_genprop(); cleanup_unicode(); cleanup_misc(); - H5E_END_TRY; + H5E_END_TRY printf("\n"); } diff --git a/test/API/tfile.c b/test/API/tfile.c index 247a249..1915749 100644 --- a/test/API/tfile.c +++ b/test/API/tfile.c @@ -242,14 +242,14 @@ test_file_create(void) { H5Fdelete(FILE1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Try opening a non-existent file */ H5E_BEGIN_TRY { fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid1, FAIL, "H5Fopen"); /* Test create with various sequences of H5F_ACC_EXCL and */ @@ -268,7 +268,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); } @@ -280,7 +280,7 @@ test_file_create(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /*file should not have been open */ /* @@ -291,7 +291,7 @@ test_file_create(void) { fid1 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid1, FAIL, "H5Fcreate"); /* Test create with H5F_ACC_TRUNC. This will truncate the existing file. */ @@ -307,7 +307,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); } @@ -319,7 +319,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); /* Get the file-creation template */ @@ -362,43 +362,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 */ @@ -649,7 +649,7 @@ test_file_open(const char *env_h5_drvr) { fid2 = H5Fopen(FILE2, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); /* Check that the intent fails for an invalid ID */ @@ -657,7 +657,7 @@ test_file_open(const char *env_h5_drvr) { ret = H5Fget_intent(fid1, &intent); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fget_intent"); /* Close dataset from first open */ @@ -763,7 +763,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -821,7 +821,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG); @@ -858,7 +858,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI); @@ -877,7 +877,7 @@ test_file_close(void) { ret = H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Close second open, should fail since it is SEMI and objects are @@ -886,7 +886,7 @@ test_file_close(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); ret = H5Dclose(dataset_id); @@ -908,7 +908,7 @@ test_file_close(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Same check with H5Idec_ref() (should fail also) */ @@ -916,7 +916,7 @@ test_file_close(void) { ret = H5Idec_ref(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Idec_ref"); ret = H5Gclose(group_id3); @@ -942,7 +942,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -995,7 +995,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -1308,7 +1308,7 @@ test_get_obj_ids(void) for (n = 0; n < oid_count; n++) H5Oclose(oid_list[n]); } - H5E_END_TRY; + H5E_END_TRY free(oid_list); } @@ -1430,7 +1430,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 */ @@ -1641,7 +1641,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); @@ -1700,7 +1700,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) */ @@ -1708,7 +1708,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) */ @@ -1716,7 +1716,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); @@ -1727,7 +1727,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); @@ -2094,7 +2094,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"); #if 0 @@ -2126,7 +2126,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) */ @@ -2134,7 +2134,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 */ @@ -2180,7 +2180,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 */ @@ -2188,7 +2188,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 */ @@ -2196,7 +2196,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 */ @@ -2204,7 +2204,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 */ @@ -2216,7 +2216,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 */ @@ -2224,7 +2224,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 */ @@ -2232,7 +2232,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 */ @@ -2240,7 +2240,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 */ @@ -2248,7 +2248,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 */ @@ -2256,7 +2256,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) */ @@ -2444,7 +2444,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 */ @@ -3579,7 +3579,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 */ @@ -3612,7 +3612,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 */ @@ -3790,7 +3790,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 */ @@ -3868,7 +3868,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 */ @@ -3908,7 +3908,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 */ @@ -3986,7 +3986,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 */ @@ -4181,7 +4181,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 */ @@ -4189,7 +4189,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 */ @@ -4197,7 +4197,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 */ @@ -4448,7 +4448,7 @@ test_filespace_info(const char *env_h5_drvr) { H5Fdelete(FILESPACE_NAME[0], my_fapl); } - H5E_END_TRY; + H5E_END_TRY } /* end for new_format */ } /* test_filespace_info() */ @@ -5639,7 +5639,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 */ @@ -5648,7 +5648,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. @@ -5844,7 +5844,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) { @@ -6065,7 +6065,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 #if 0 /* Get the internal file pointer if the create succeeds */ @@ -6241,7 +6241,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); @@ -6275,7 +6275,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) @@ -6286,7 +6286,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"); @@ -6461,7 +6461,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; @@ -6471,7 +6471,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 */ @@ -6627,7 +6627,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) { @@ -6679,7 +6679,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; @@ -6689,7 +6689,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 */ @@ -6908,7 +6908,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; @@ -6918,7 +6918,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 */ @@ -7244,7 +7244,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; @@ -7254,7 +7254,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 */ @@ -7572,7 +7572,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; @@ -7582,7 +7582,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 */ @@ -7739,7 +7739,7 @@ test_libver_macros2(void) { grp = H5Gopen(file, "Group"); } - H5E_END_TRY; + H5E_END_TRY VERIFY(grp, FAIL, "H5Gopen"); #endif @@ -7982,7 +7982,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 */ @@ -7990,7 +7990,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 */ @@ -7998,7 +7998,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"); /************/ @@ -8365,5 +8365,5 @@ cleanup_file(void) H5Fdelete(FILE7, H5P_DEFAULT); H5Fdelete(DST_FILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/API/tgenprop.c b/test/API/tgenprop.c index fed974c..4b64bae 100644 --- a/test/API/tgenprop.c +++ b/test/API/tgenprop.c @@ -199,7 +199,7 @@ test_genprop_basic_class_prop(void) ret = H5Pregister2(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the first property */ @@ -227,7 +227,7 @@ test_genprop_basic_class_prop(void) ret = H5Pregister2(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the second property */ @@ -272,7 +272,7 @@ test_genprop_basic_class_prop(void) { ret = H5Pget_size(cid1, PROP1_NAME, &size); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ @@ -1968,7 +1968,7 @@ test_genprop_deprec_class(void) { ret = H5Pregister1(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the first property */ @@ -1994,7 +1994,7 @@ test_genprop_deprec_class(void) { ret = H5Pregister1(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the second property */ @@ -2038,7 +2038,7 @@ test_genprop_deprec_class(void) { ret = H5Pget_size(cid1, PROP1_NAME, &size); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ diff --git a/test/API/th5o.c b/test/API/th5o.c index d733eb9..898c11d 100644 --- a/test/API/th5o.c +++ b/test/API/th5o.c @@ -994,7 +994,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; @@ -1186,7 +1186,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 */ @@ -1361,7 +1361,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 */ @@ -1882,5 +1882,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/API/th5s.c b/test/API/th5s.c index da45d28..7bf3191 100644 --- a/test/API/th5s.c +++ b/test/API/th5s.c @@ -188,7 +188,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"); #if 0 /* @@ -222,7 +222,7 @@ test_h5s_basic(void) { sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(sid1, FAIL, "H5Screate_simple"); dims1[0] = H5S_UNLIMITED; @@ -233,7 +233,7 @@ test_h5s_basic(void) { ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sset_extent_simple"); ret = H5Sclose(sid1); @@ -413,7 +413,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 */ @@ -424,7 +424,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 */ @@ -759,7 +759,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"); } @@ -780,7 +780,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"); } @@ -882,7 +882,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); @@ -1283,7 +1283,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 */ @@ -1475,7 +1475,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/API/titerate.c b/test/API/titerate.c index 1349e70..23b65fc 100644 --- a/test/API/titerate.c +++ b/test/API/titerate.c @@ -244,7 +244,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) (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); @@ -275,7 +275,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 */ @@ -285,7 +285,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 */ @@ -294,7 +294,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 */ @@ -303,7 +303,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 */ @@ -496,7 +496,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 */ @@ -505,7 +505,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 */ @@ -901,7 +901,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/API/tmisc.c b/test/API/tmisc.c index d4213d2..791d22b 100644 --- a/test/API/tmisc.c +++ b/test/API/tmisc.c @@ -1462,7 +1462,7 @@ test_misc8(void) { did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to incremental */ @@ -1475,7 +1475,7 @@ test_misc8(void) { did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to early */ @@ -1821,7 +1821,7 @@ test_misc9(void) { fid = H5Fopen(MISC9_FILE, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fopen"); ret = H5Pclose(fapl); @@ -1975,7 +1975,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); @@ -1986,7 +1986,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); @@ -3275,7 +3275,7 @@ test_misc19(void) { ret = H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Check H5I operations on property lists */ @@ -3309,7 +3309,7 @@ test_misc19(void) { ret = H5Pclose(plid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pclose"); /* Check H5I operations on property classes */ @@ -3343,7 +3343,7 @@ test_misc19(void) { ret = H5Pclose_class(pcid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pclose_class"); /* Check H5I operations on datatypes */ @@ -3377,7 +3377,7 @@ test_misc19(void) { ret = H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Tclose"); /* Check H5I operations on dataspaces */ @@ -3411,7 +3411,7 @@ test_misc19(void) { ret = H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sclose"); /* Check H5I operations on datasets */ @@ -3453,7 +3453,7 @@ test_misc19(void) { ret = H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dclose"); /* Close the dataspace */ @@ -3507,7 +3507,7 @@ test_misc19(void) { ret = H5Aclose(aid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aclose"); /* Close the root group */ @@ -3557,7 +3557,7 @@ test_misc19(void) { ret = H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Gclose"); /* Close the file */ @@ -3595,7 +3595,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 */ @@ -3633,7 +3633,7 @@ test_misc19(void) { ret = H5Eclose_msg(emid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Eclose_msg"); /* Close the error class */ @@ -3671,7 +3671,7 @@ test_misc19(void) { ret = H5Eclose_stack(esid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Eclose_stack"); #if 0 @@ -3710,7 +3710,7 @@ test_misc19(void) { ret = H5FDunregister(vfdid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5FDunregister"); free(vfd_cls); @@ -3750,7 +3750,7 @@ test_misc19(void) { ret = H5VLunregister_connector(volid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5VLunregister_connector"); free(vol_cls); @@ -4202,7 +4202,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 @@ -4214,7 +4214,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"); } @@ -4223,7 +4223,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"); @@ -4237,7 +4237,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); @@ -4580,84 +4580,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 */ @@ -4669,28 +4669,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); @@ -4704,28 +4704,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); @@ -4739,28 +4739,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); @@ -5371,7 +5371,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 */ @@ -5897,7 +5897,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) */ @@ -5905,7 +5905,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) */ @@ -5913,7 +5913,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 */ @@ -6200,7 +6200,7 @@ test_misc37(void) { ret = H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); } /* end test_misc37() */ diff --git a/test/API/trefer.c b/test/API/trefer.c index 81c2321..6e194d2 100644 --- a/test/API/trefer.c +++ b/test/API/trefer.c @@ -211,25 +211,25 @@ test_reference_params(void) { ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object ref"); H5E_BEGIN_TRY { ret = H5Rcreate_object(H5I_INVALID_HID, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object name"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, "", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object null name"); /* Test parameters to H5Rcreate_region */ @@ -237,25 +237,25 @@ test_reference_params(void) { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region ref"); H5E_BEGIN_TRY { ret = H5Rcreate_region(H5I_INVALID_HID, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, NULL, sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region name"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", H5I_INVALID_HID, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region dataspace"); /* Test parameters to H5Rcreate_attr */ @@ -263,25 +263,25 @@ test_reference_params(void) { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", "Attr", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr ref"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(H5I_INVALID_HID, "/Group1/Dataset2", "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, NULL, "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr name"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr attr_name"); /* Test parameters to H5Rdestroy */ @@ -289,7 +289,7 @@ test_reference_params(void) { ret = H5Rdestroy(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rdestroy"); /* Test parameters to H5Rget_type */ @@ -297,7 +297,7 @@ test_reference_params(void) { type = H5Rget_type(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(type, H5R_BADTYPE, "H5Rget_type ref"); /* Test parameters to H5Requal */ @@ -305,13 +305,13 @@ test_reference_params(void) { ret = H5Requal(NULL, &rbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref1"); H5E_BEGIN_TRY { ret = H5Requal(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref2"); /* Test parameters to H5Rcopy */ @@ -319,13 +319,13 @@ test_reference_params(void) { ret = H5Rcopy(NULL, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy src_ref"); H5E_BEGIN_TRY { ret = H5Rcopy(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy dest_ref"); /* Test parameters to H5Ropen_object */ @@ -333,13 +333,13 @@ test_reference_params(void) { dset2 = H5Ropen_object(&rbuf[0], H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object oapl_id"); H5E_BEGIN_TRY { dset2 = H5Ropen_object(NULL, H5P_DEFAULT, dapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object ref"); /* Test parameters to H5Ropen_region */ @@ -347,7 +347,7 @@ test_reference_params(void) { ret_id = H5Ropen_region(NULL, H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_region ref"); /* Test parameters to H5Ropen_attr */ @@ -355,7 +355,7 @@ test_reference_params(void) { ret_id = H5Ropen_attr(NULL, H5P_DEFAULT, aapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_attr ref"); /* Test parameters to H5Rget_obj_type3 */ @@ -363,7 +363,7 @@ test_reference_params(void) { ret = H5Rget_obj_type3(NULL, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type3 ref"); /* Test parameters to H5Rget_file_name */ @@ -371,7 +371,7 @@ test_reference_params(void) { name_size = H5Rget_file_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_file_name ref"); /* Test parameters to H5Rget_obj_name */ @@ -379,7 +379,7 @@ test_reference_params(void) { name_size = H5Rget_obj_name(NULL, H5P_DEFAULT, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_obj_name ref"); /* Test parameters to H5Rget_attr_name */ @@ -387,7 +387,7 @@ test_reference_params(void) { name_size = H5Rget_attr_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_attr_name ref"); /* Close disk dataspace */ @@ -1304,7 +1304,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"); @@ -1467,7 +1467,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. */ @@ -1480,7 +1480,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"); /* @@ -1635,7 +1635,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 */ @@ -1760,7 +1760,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/API/tselect.c b/test/API/tselect.c index fc6a275..49215c2 100644 --- a/test/API/tselect.c +++ b/test/API/tselect.c @@ -291,7 +291,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 */ @@ -311,7 +311,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 */ @@ -354,13 +354,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 */ @@ -404,13 +404,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 */ @@ -1030,7 +1030,7 @@ test_select_all_hyper(hid_t xfer_plist) { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, rbuf); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dread"); /* Select entire 15x26 extent for disk dataset */ @@ -5624,14 +5624,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test the invalid combination between two hyperslab but of different dimension size */ @@ -5639,14 +5639,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test invalid operation inputs to the two functions */ @@ -5654,14 +5654,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test inputs in case of non-existent space ids */ @@ -5669,14 +5669,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Close dataspaces */ @@ -6942,14 +6942,14 @@ test_select_valid(void) { sub_space = H5Screate_simple(2, dims, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(sub_space, FAIL, "H5Screate_simple"); H5E_BEGIN_TRY { valid = H5Sselect_valid(sub_space); } - H5E_END_TRY; + H5E_END_TRY VERIFY(valid, FAIL, "H5Sselect_valid"); /* Set arrays and dataspace for the rest of the cases */ @@ -6970,7 +6970,7 @@ test_select_valid(void) { valid = H5Sselect_valid(sub_space); } - H5E_END_TRY; + H5E_END_TRY VERIFY(valid, FAIL, "H5Sselect_valid"); MESSAGE(8, ("Case 3 : in the dimensions\nTry offset (4,4) and size(6,6), the original space is of size " @@ -8246,7 +8246,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 */ @@ -8256,7 +8256,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 */ @@ -13947,7 +13947,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 */ @@ -13981,7 +13981,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 */ @@ -14035,7 +14035,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 */ @@ -14089,7 +14089,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 */ @@ -14154,7 +14154,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) */ @@ -14162,7 +14162,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 */ @@ -14174,7 +14174,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) */ @@ -14182,7 +14182,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 */ @@ -14206,7 +14206,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) */ @@ -14214,7 +14214,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 */ @@ -14272,7 +14272,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 */ @@ -14735,7 +14735,7 @@ test_hyper_unlim(void) { ssize_out = H5Sget_select_hyper_nblocks(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ssize_out, (hssize_t)H5S_UNLIMITED, "H5Sget_select_hyper_nblocks"); /* Test H5Sget_select_bounds() */ @@ -15198,19 +15198,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 */ @@ -15218,13 +15218,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 */ @@ -15248,7 +15248,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 */ @@ -15260,13 +15260,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 */ @@ -15274,31 +15274,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 */ @@ -15722,31 +15722,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/API/tvltypes.c b/test/API/tvltypes.c index 53275cc..b4ccef7 100644 --- a/test/API/tvltypes.c +++ b/test/API/tvltypes.c @@ -142,7 +142,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 */ @@ -211,14 +211,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/dtransform.c b/test/dtransform.c index 3768320..6892a7c 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -70,7 +70,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, {25, 17, 10, 3, 4, 11, 19, 26, 33, 40, 48, 55, 62, 69, 4, 12, 19, 26}}; #define UCOMPARE(TYPE, VAR1, VAR2, TOL) \ - { \ + do { \ size_t i, j; \ \ for (i = 0; i < ROWS; i++) \ @@ -85,10 +85,10 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, } \ } \ PASSED(); \ - } + } while (0) #define COMPARE(TYPE, VAR1, VAR2, TOL) \ - { \ + do { \ size_t i, j; \ \ for (i = 0; i < ROWS; i++) \ @@ -101,10 +101,10 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, } \ } \ PASSED(); \ - } + } while (0) #define COMPARE_INT(VAR1, VAR2) \ - { \ + do { \ size_t i, j; \ \ for (i = 0; i < ROWS; i++) \ @@ -115,10 +115,10 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, goto error; \ } \ } \ - } + } while (0) #define TEST_TYPE_CONTIG(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED) \ - { \ + do { \ struct { \ TYPE arr[ROWS][COLS]; \ } *array = NULL; \ @@ -182,25 +182,25 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (H5Dread(dset, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) \ TEST_ERROR; \ if (SIGNED) \ - COMPARE(TYPE, array->arr, COMPARE_DATA, 2) \ + COMPARE(TYPE, array->arr, COMPARE_DATA, 2); \ else \ - UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4) \ + UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4); \ \ TESTING("contiguous, byte order conversion (" TEST_STR "->" TEST_STR ")"); \ \ if (H5Dread(dset_nn, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) \ TEST_ERROR; \ if (SIGNED) \ - COMPARE(TYPE, array->arr, COMPARE_DATA, 2) \ + COMPARE(TYPE, array->arr, COMPARE_DATA, 2); \ else \ - UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4) \ + UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4); \ \ if (SIGNED) { \ TESTING("contiguous, with type conversion (float->" TEST_STR ")"); \ \ if (H5Dread(dset_id_float, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) \ TEST_ERROR; \ - COMPARE(TYPE, array->arr, COMPARE_DATA, 2) \ + COMPARE(TYPE, array->arr, COMPARE_DATA, 2); \ } \ \ if (H5Dclose(dset_nn) < 0) \ @@ -211,7 +211,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, TEST_ERROR; \ \ free(array); \ - } + } while (0) #define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED) \ do { \ @@ -276,16 +276,16 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (H5Dread(dset_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) \ TEST_ERROR; \ if (SIGNED) \ - COMPARE(TYPE, array->arr, COMPARE_DATA, 2) \ + COMPARE(TYPE, array->arr, COMPARE_DATA, 2); \ else \ - UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4) \ + UCOMPARE(TYPE, array->arr, COMPARE_DATA, 4); \ \ if (SIGNED) { \ TESTING("chunked, with type conversion (float->" TEST_STR ")"); \ \ if (H5Dread(dset_id_float_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) \ TEST_ERROR; \ - COMPARE(TYPE, array->arr, COMPARE_DATA, 2) \ + COMPARE(TYPE, array->arr, COMPARE_DATA, 2); \ } \ \ if (H5Pclose(cparms) < 0) \ @@ -558,7 +558,7 @@ test_poly(const hid_t dxpl_id_polynomial) if (H5Dread(dset_id_int, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_polynomial, polyflread) < 0) TEST_ERROR; - COMPARE(float, polyflread, polyflres, 2.0F) + COMPARE(float, polyflread, polyflres, 2.0F); for (row = 0; row < ROWS; row++) for (col = 0; col < COLS; col++) { @@ -570,7 +570,7 @@ test_poly(const hid_t dxpl_id_polynomial) if (H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_polynomial, polyintread) < 0) TEST_ERROR; - COMPARE(int, polyintread, polyflres, 4) + COMPARE(int, polyintread, polyflres, 4); return 0; @@ -620,7 +620,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -643,7 +643,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -666,7 +666,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -689,7 +689,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -712,7 +712,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -735,7 +735,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -761,7 +761,7 @@ test_specials(hid_t file) if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) TEST_ERROR; - COMPARE_INT(read_buf, data_res) + COMPARE_INT(read_buf, data_res); if (H5Dclose(dset_id) < 0) TEST_ERROR; @@ -797,13 +797,13 @@ test_copy(const hid_t dxpl_id_c_to_f_copy, const hid_t dxpl_id_polynomial_copy) if (H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f_copy, windchillFintread) < 0) TEST_ERROR; - COMPARE(int, windchillFintread, windchillFfloat, 2) + COMPARE(int, windchillFintread, windchillFfloat, 2); TESTING("data transform, polynomial transform w/ copied property"); if (H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_polynomial_copy, polyintread) < 0) TEST_ERROR; - COMPARE(int, polyintread, polyflres, 2) + COMPARE(int, polyintread, polyflres, 2); return 0; diff --git a/test/enum.c b/test/enum.c index 4b8d7c7..8ee0606 100644 --- a/test/enum.c +++ b/test/enum.c @@ -532,7 +532,7 @@ test_value_dsnt_exist(void) { ret = H5Tenum_valueof(tid, "SAX", &val); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR("H5Tenum_valueof should not pass with a non-existing name"); @@ -541,7 +541,7 @@ test_value_dsnt_exist(void) { ret = H5Tenum_nameof(tid, &val, name, size); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR("H5Tenum_nameof should not pass with a non-existing value"); @@ -562,7 +562,7 @@ test_value_dsnt_exist(void) { ret = H5Tenum_nameof(tid, &BAD_VALUES[i], name, size); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); printf("Bad value: %d -- ", BAD_VALUES[i]); @@ -576,7 +576,7 @@ test_value_dsnt_exist(void) { ret = H5Tenum_valueof(tid, BAD_NAMES[i], &val); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) { H5_FAILED(); printf("Bad name: %s -- ", BAD_NAMES[i]); @@ -652,7 +652,7 @@ test_funcs(void) { ret = H5Tset_pad(tid, H5T_PAD_ZERO, H5T_PAD_ONE); } - H5E_END_TRY; + H5E_END_TRY if (ret >= 0) FAIL_PUTS_ERROR("H5Tset_pad should not work with enum types"); @@ -770,7 +770,7 @@ error: H5Tclose(cmpd_id); H5Tclose(copy_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/links.c b/test/links.c index 1c46fb7..8f6af5b 100644 --- a/test/links.c +++ b/test/links.c @@ -13807,7 +13807,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end external_link_public_macros() */ diff --git a/test/objcopy.c b/test/objcopy.c index ab40284..8848ab1 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -16214,7 +16214,7 @@ error: H5Pclose(ocpypl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/test/select_io_dset.c b/test/select_io_dset.c index 2746bcc..b498458 100644 --- a/test/select_io_dset.c +++ b/test/select_io_dset.c @@ -239,7 +239,7 @@ error: H5Pclose(dxpl); H5Pclose(ntrans_dxpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -379,7 +379,7 @@ error: H5Pclose(dcpl); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY if (wbuf) free(wbuf); @@ -529,7 +529,7 @@ error: H5Pclose(dxpl); H5Pclose(ntrans_dxpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -672,7 +672,7 @@ error: H5Pclose(dxpl); H5Pclose(ntrans_dxpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -989,7 +989,7 @@ error: H5Pclose(dcpl); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY if (s1_wbuf) free(s1_wbuf); @@ -1288,7 +1288,7 @@ error: H5Sclose(mem_sids[i]); H5Dclose(dset_dids[i]); } - H5E_END_TRY; + H5E_END_TRY if (total_wbuf) free(total_wbuf); @@ -1758,7 +1758,7 @@ error: H5Sclose(mem_sids[i]); H5Dclose(dset_dids[i]); } - H5E_END_TRY; + H5E_END_TRY if (total_wbuf) free(total_wbuf); @@ -2114,7 +2114,7 @@ error: H5Sclose(mem_sids[i]); H5Dclose(dset_dids[i]); } - H5E_END_TRY; + H5E_END_TRY if (total_wbuf) free(total_wbuf); @@ -2686,7 +2686,7 @@ error: H5Sclose(mem_sids[i]); H5Dclose(dset_dids[i]); } - H5E_END_TRY; + H5E_END_TRY if (total_wbuf1) free(total_wbuf1); @@ -2824,7 +2824,7 @@ error: H5Pclose(dcpl); H5Pclose(dxpl); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_set_get_select_io_mode() */ @@ -3051,7 +3051,7 @@ error: H5Dclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* test_no_selection_io_cause_mode() */ diff --git a/test/tarray.c b/test/tarray.c index 5978d9f..b5ce921 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -2245,5 +2245,5 @@ cleanup_array(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } /* end cleanup_array() */ diff --git a/test/tattr.c b/test/tattr.c index 45f9865..91cba51 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -252,7 +252,7 @@ test_attr_basic_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -397,7 +397,7 @@ test_attr_basic_write(hid_t fapl) { ret_id = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -770,7 +770,7 @@ test_attr_compound_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR4_NAME, tid1, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write complex attribute data */ @@ -995,7 +995,7 @@ test_attr_scalar_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR5_NAME, H5T_NATIVE_FLOAT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -1142,7 +1142,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 1st attribute data */ @@ -1170,7 +1170,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 2nd attribute information */ @@ -1198,7 +1198,7 @@ test_attr_mult_write(hid_t fapl) { ret_id = H5Acreate2(dataset, ATTR3_NAME, H5T_NATIVE_DOUBLE, sid2, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 3rd attribute information */ @@ -1596,7 +1596,7 @@ test_attr_delete(hid_t fapl) { ret = H5Adelete(dataset, "Bogus"); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ @@ -2291,7 +2291,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) { attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(attr, FAIL, "H5Acreate2"); /* Close dataspace */ @@ -4241,7 +4241,7 @@ test_attr_deprec(hid_t fcpl, hid_t fapl) { ret = H5Aget_num_attrs((hid_t)-1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_num_attrs"); /* Get number of attributes */ @@ -4453,7 +4453,7 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) { ret = H5Pset_attr_creation_order(dcpl, H5P_CRT_ORDER_INDEXED); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pset_attr_creation_order"); ret = H5Pget_attr_creation_order(dcpl, &crt_order_flags); CHECK(ret, FAIL, "H5Pget_attr_creation_order"); @@ -5905,14 +5905,14 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create attributes, up to limit of compact form */ @@ -5950,21 +5950,21 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create more attributes, to push into dense form */ @@ -6015,21 +6015,21 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_info_by_idx"); H5E_BEGIN_TRY { ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aget_name_by_idx"); } /* end for */ @@ -6426,7 +6426,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); /* Create attributes, up to limit of compact form */ @@ -6464,7 +6464,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6596,7 +6596,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6664,7 +6664,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6835,7 +6835,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -7228,7 +7228,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx { ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_fail_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); skip = 0; @@ -7237,7 +7237,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); skip = 0; @@ -7246,7 +7246,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Retrieve current # of errors */ @@ -7453,7 +7453,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; @@ -7462,7 +7462,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; @@ -7471,7 +7471,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored compactly */ @@ -7552,7 +7552,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; @@ -7561,7 +7561,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; @@ -7570,7 +7570,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored densely */ @@ -7803,7 +7803,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Create attributes, up to limit of compact form */ @@ -7842,7 +7842,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -7920,7 +7920,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -8139,21 +8139,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Create attributes, up to limit of compact form */ @@ -8190,21 +8190,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ @@ -8283,21 +8283,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) { ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); H5E_BEGIN_TRY { ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ @@ -11647,5 +11647,5 @@ cleanup_attr(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tconfig.c b/test/tconfig.c index 7ab442e..25e9ad5 100644 --- a/test/tconfig.c +++ b/test/tconfig.c @@ -25,13 +25,18 @@ * with the macro size. */ #define vrfy_cint_type(ctype, uctype, ctype_macro) \ - /* check signed type size */ \ - vrfy_macrosize(ctype, ctype_macro, #ctype_macro); \ - /* check unsigned type size */ \ - vrfy_macrosize(uctype, ctype_macro, #ctype_macro); + do { \ + /* check signed type size */ \ + vrfy_macrosize(ctype, ctype_macro, #ctype_macro); \ + /* check unsigned type size */ \ + vrfy_macrosize(uctype, ctype_macro, #ctype_macro); \ + } while (0) /* verify C type sizes: verify the sizeof type with the macro size. */ -#define vrfy_ctype(type, macro) vrfy_macrosize(type, macro, #macro); +#define vrfy_ctype(type, macro) \ + do { \ + vrfy_macrosize(type, macro, #macro); \ + } while (0) /* verify if the sizeof(type) matches size defined in macro. */ /* Needs this extra step so that we can print the macro name. */ diff --git a/test/tcoords.c b/test/tcoords.c index a06b103..dbe6ab1 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -719,5 +719,5 @@ cleanup_coords(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tfile.c b/test/tfile.c index a68ec03..1b98647 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -232,14 +232,14 @@ test_file_create(void) { H5Fdelete(FILE1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY /* Try opening a non-existent file */ H5E_BEGIN_TRY { fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid1, FAIL, "H5Fopen"); /* Test create with various sequences of H5F_ACC_EXCL and */ @@ -257,7 +257,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); /* Close all files */ @@ -268,7 +268,7 @@ test_file_create(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /*file should not have been open */ /* @@ -279,7 +279,7 @@ test_file_create(void) { fid1 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid1, FAIL, "H5Fcreate"); /* Test create with H5F_ACC_TRUNC. This will truncate the existing file. */ @@ -294,7 +294,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); /* @@ -305,7 +305,7 @@ test_file_create(void) { fid2 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fcreate"); /* Get the file-creation template */ @@ -626,7 +626,7 @@ test_file_open(const char *env_h5_drvr) { fid2 = H5Fopen(FILE2, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); /* Check that the intent fails for an invalid ID */ @@ -634,7 +634,7 @@ test_file_open(const char *env_h5_drvr) { ret = H5Fget_intent(fid1, &intent); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fget_intent"); /* Close dataset from first open */ @@ -699,7 +699,7 @@ test_file_reopen(void) { H5Fdelete(REOPEN_FILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } /* test_file_reopen() */ @@ -741,7 +741,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -799,7 +799,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG); @@ -836,7 +836,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI); @@ -855,7 +855,7 @@ test_file_close(void) { ret = H5Fclose(fid1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Close second open, should fail since it is SEMI and objects are @@ -864,7 +864,7 @@ test_file_close(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); ret = H5Dclose(dataset_id); @@ -886,7 +886,7 @@ test_file_close(void) { ret = H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); /* Same check with H5Idec_ref() (should fail also) */ @@ -894,7 +894,7 @@ test_file_close(void) { ret = H5Idec_ref(fid2); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Idec_ref"); ret = H5Gclose(group_id3); @@ -920,7 +920,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -973,7 +973,7 @@ test_file_close(void) { fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -1282,7 +1282,7 @@ test_get_obj_ids(void) for (n = 0; n < oid_count; n++) H5Oclose(oid_list[n]); } - H5E_END_TRY; + H5E_END_TRY free(oid_list); } @@ -5662,7 +5662,7 @@ test_libver_bounds_copy(void) { H5Fdelete(DST_FILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } /* end test_libver_bounds_copy() */ diff --git a/test/tgenprop.c b/test/tgenprop.c index c542603..b4bd6c3 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -199,7 +199,7 @@ test_genprop_basic_class_prop(void) ret = H5Pregister2(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the first property */ @@ -227,7 +227,7 @@ test_genprop_basic_class_prop(void) ret = H5Pregister2(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the second property */ @@ -272,7 +272,7 @@ test_genprop_basic_class_prop(void) { ret = H5Pget_size(cid1, PROP1_NAME, &size); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ @@ -1966,7 +1966,7 @@ test_genprop_deprec_class(void) { ret = H5Pregister1(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the first property */ @@ -1992,7 +1992,7 @@ test_genprop_deprec_class(void) { ret = H5Pregister1(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the second property */ @@ -2036,7 +2036,7 @@ test_genprop_deprec_class(void) { ret = H5Pget_size(cid1, PROP1_NAME, &size); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ @@ -2194,5 +2194,5 @@ cleanup_genprop(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/th5s.c b/test/th5s.c index 87e0de9..6d703da 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -218,7 +218,7 @@ test_h5s_basic(void) { sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(sid1, FAIL, "H5Screate_simple"); dims1[0] = H5S_UNLIMITED; @@ -229,7 +229,7 @@ test_h5s_basic(void) { ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Sset_extent_simple"); ret = H5Sclose(sid1); @@ -3517,5 +3517,5 @@ cleanup_h5s(void) H5Fdelete(ZEROFILE, H5P_DEFAULT); H5Fdelete(VERBFNAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/titerate.c b/test/titerate.c index 7bb13b0..8f5e44c 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -1212,5 +1212,5 @@ cleanup_iterate(void) { H5Fdelete(DATAFILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tmisc.c b/test/tmisc.c index 3033613..b66a80e 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -1416,7 +1416,7 @@ test_misc8(void) { did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to incremental */ @@ -1429,7 +1429,7 @@ test_misc8(void) { did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to early */ @@ -1774,7 +1774,7 @@ test_misc9(void) { fid = H5Fopen(MISC9_FILE, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY VERIFY(fid, FAIL, "H5Fopen"); ret = H5Pclose(fapl); @@ -6097,7 +6097,7 @@ test_misc37(void) { ret = H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Fclose"); } /* end test_misc37() */ @@ -6226,5 +6226,5 @@ cleanup_misc(void) H5Fdelete(MISC31_FILE, H5P_DEFAULT); #endif /* H5_NO_DEPRECATED_SYMBOLS */ } - H5E_END_TRY; + H5E_END_TRY } /* end cleanup_misc() */ diff --git a/test/trefer.c b/test/trefer.c index 0aff270..577fc69 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -209,25 +209,25 @@ test_reference_params(void) { ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object ref"); H5E_BEGIN_TRY { ret = H5Rcreate_object(H5I_INVALID_HID, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object name"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, "", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object null name"); /* Test parameters to H5Rcreate_region */ @@ -235,25 +235,25 @@ test_reference_params(void) { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region ref"); H5E_BEGIN_TRY { ret = H5Rcreate_region(H5I_INVALID_HID, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, NULL, sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region name"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", H5I_INVALID_HID, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region dataspace"); /* Test parameters to H5Rcreate_attr */ @@ -261,25 +261,25 @@ test_reference_params(void) { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", "Attr", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr ref"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(H5I_INVALID_HID, "/Group1/Dataset2", "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, NULL, "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr name"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr attr_name"); /* Test parameters to H5Rdestroy */ @@ -287,7 +287,7 @@ test_reference_params(void) { ret = H5Rdestroy(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rdestroy"); /* Test parameters to H5Rget_type */ @@ -295,7 +295,7 @@ test_reference_params(void) { type = H5Rget_type(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(type, H5R_BADTYPE, "H5Rget_type ref"); /* Test parameters to H5Requal */ @@ -303,13 +303,13 @@ test_reference_params(void) { ret = H5Requal(NULL, &rbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref1"); H5E_BEGIN_TRY { ret = H5Requal(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref2"); /* Test parameters to H5Rcopy */ @@ -317,13 +317,13 @@ test_reference_params(void) { ret = H5Rcopy(NULL, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy src_ref"); H5E_BEGIN_TRY { ret = H5Rcopy(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy dest_ref"); /* Test parameters to H5Ropen_object */ @@ -331,13 +331,13 @@ test_reference_params(void) { dset2 = H5Ropen_object(&rbuf[0], H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object oapl_id"); H5E_BEGIN_TRY { dset2 = H5Ropen_object(NULL, H5P_DEFAULT, dapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object ref"); /* Test parameters to H5Ropen_region */ @@ -345,7 +345,7 @@ test_reference_params(void) { ret_id = H5Ropen_region(NULL, H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_region ref"); /* Test parameters to H5Ropen_attr */ @@ -353,7 +353,7 @@ test_reference_params(void) { ret_id = H5Ropen_attr(NULL, H5P_DEFAULT, aapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_attr ref"); /* Test parameters to H5Rget_obj_type3 */ @@ -361,7 +361,7 @@ test_reference_params(void) { ret = H5Rget_obj_type3(NULL, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type3 ref"); /* Test parameters to H5Rget_file_name */ @@ -369,7 +369,7 @@ test_reference_params(void) { name_size = H5Rget_file_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_file_name ref"); /* Test parameters to H5Rget_obj_name */ @@ -377,7 +377,7 @@ test_reference_params(void) { name_size = H5Rget_obj_name(NULL, H5P_DEFAULT, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_obj_name ref"); /* Test parameters to H5Rget_attr_name */ @@ -385,7 +385,7 @@ test_reference_params(void) { name_size = H5Rget_attr_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_attr_name ref"); /* Close disk dataspace */ @@ -3628,5 +3628,5 @@ cleanup_reference(void) H5Fdelete(FILE_REF_EXT2, H5P_DEFAULT); H5Fdelete(FILE_REF_COMPAT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tselect.c b/test/tselect.c index 879f4f7..a7d9f8e 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1029,7 +1029,7 @@ test_select_all_hyper(hid_t xfer_plist) { ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, rbuf); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Dread"); /* Select entire 15x26 extent for disk dataset */ @@ -5613,14 +5613,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test the invalid combination between two hyperslab but of different dimension size */ @@ -5628,14 +5628,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test invalid operation inputs to the two functions */ @@ -5643,14 +5643,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test inputs in case of non-existent space ids */ @@ -5658,14 +5658,14 @@ test_select_hyper_valid_combination(void) { tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Scombine_select"); H5E_BEGIN_TRY { tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Close dataspaces */ @@ -6931,14 +6931,14 @@ test_select_valid(void) { sub_space = H5Screate_simple(2, dims, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(sub_space, FAIL, "H5Screate_simple"); H5E_BEGIN_TRY { valid = H5Sselect_valid(sub_space); } - H5E_END_TRY; + H5E_END_TRY VERIFY(valid, FAIL, "H5Sselect_valid"); /* Set arrays and dataspace for the rest of the cases */ @@ -6959,7 +6959,7 @@ test_select_valid(void) { valid = H5Sselect_valid(sub_space); } - H5E_END_TRY; + H5E_END_TRY VERIFY(valid, FAIL, "H5Sselect_valid"); MESSAGE(8, ("Case 3 : in the dimensions\nTry offset (4,4) and size(6,6), the original space is of size " @@ -14702,7 +14702,7 @@ test_hyper_unlim(void) { ssize_out = H5Sget_select_hyper_nblocks(sid); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ssize_out, (hssize_t)H5S_UNLIMITED, "H5Sget_select_hyper_nblocks"); /* Test H5Sget_select_bounds() */ @@ -16264,5 +16264,5 @@ cleanup_select(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/ttime.c b/test/ttime.c index 4a77e18..32e6859 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -226,5 +226,5 @@ cleanup_time(void) { H5Fdelete(DATAFILE, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tunicode.c b/test/tunicode.c index 29a3cda..6b6e584 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -863,5 +863,5 @@ cleanup_unicode(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tvlstr.c b/test/tvlstr.c index 90d05d5..e36239d 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -1003,5 +1003,5 @@ cleanup_vlstrings(void) H5Fdelete(DATAFILE2, H5P_DEFAULT); H5Fdelete(DATAFILE3, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/tvltypes.c b/test/tvltypes.c index 2bc747c..88401d4 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -3260,5 +3260,5 @@ cleanup_vltypes(void) { H5Fdelete(FILENAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } diff --git a/test/twriteorder.c b/test/twriteorder.c index c542161..b5ae2ea 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -71,10 +71,10 @@ #define NLINKEDBLOCKS_DFT 512 /* default 512 */ #define SIZE_BLKADDR 4 /* expected sizeof blkaddr */ #define Hgoto_error(val) \ - { \ + do { \ ret_value = val; \ goto done; \ - } + } while (0) /* type declarations */ typedef enum part_t { @@ -142,21 +142,21 @@ parse_option(int argc, char *const argv[]) fprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case 'n': /* number of planes to write/read */ if ((nlinkedblock_g = atoi(optarg)) < 2) { fprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case 'p': /* number of planes to write/read */ if ((part_size_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case 'l': /* launch reader or writer only */ switch (*optarg) { @@ -381,8 +381,8 @@ main(int argc, char *argv[]) if ((childpid = fork()) < 0) { HDperror("fork"); Hgoto_error(1); - }; - }; + } + } mypid = HDgetpid(); /* ============= */ @@ -17,14 +17,14 @@ /* Macro definitions */ #define Hgoto_error(val) \ - { \ + do { \ ret_value = val; \ goto done; \ - } + } while (0) #define Hgoto_done \ - { \ + do { \ goto done; \ - } + } while (0) #define Chunksize_DFT 256 /* chunksize default */ #define ErrorReportMax 10 /* max number of errors reported */ /* these two definitions must match each other */ diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index d11f71c..49dfa96 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -35,10 +35,10 @@ static const char *progname_g = "use_disable_mdc_flushes"; /* program name */ #define UC_RANK 3 /* use case dataset rank */ #define Chunksize_DFT 256 /* chunksize default */ #define Hgoto_error(val) \ - { \ + do { \ ret_value = val; \ goto done; \ - } + } while (0) static char *filename_g; static hsize_t nplanes_g; @@ -112,14 +112,14 @@ parse_option(int argc, char *const argv[]) fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case 's': /* use swmr file open mode */ if ((use_swmr_g = atoi(optarg)) < 0) { fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); usage(progname_g); Hgoto_error(-1); - }; + } break; case 'y': /* Number of planes per chunk */ if ((chunkplanes_g = atoi(optarg)) <= 0) { @@ -127,14 +127,14 @@ parse_option(int argc, char *const argv[]) optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case 'z': /* size of chunk=(z,z) */ if ((chunksize_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); - }; + } break; case '?': fprintf(stderr, "getopt returned '%c'.\n", c); @@ -152,7 +152,7 @@ parse_option(int argc, char *const argv[]) if ((filename_g = (char *)malloc(HDstrlen(progname_g) + 4)) == NULL) { fprintf(stderr, "malloc: failed\n"); Hgoto_error(-1); - }; + } HDstrcpy(filename_g, progname_g); HDstrcat(filename_g, ".h5"); } @@ -375,7 +375,7 @@ write_file(void) if ((buffer = (UC_CTYPE *)malloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { fprintf(stderr, "malloc: failed\n"); return -1; - }; + } /* * Get dataset rank and dimension. @@ -403,7 +403,7 @@ write_file(void) if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) { fprintf(stderr, "H5Screate_simple for memory failed\n"); return -1; - }; + } /* write planes */ count[0] = 1; @@ -2431,7 +2431,7 @@ test_wrap_register(void) { wrap_id = H5VLwrap_register(vol_obj, H5I_GROUP); } - H5E_END_TRY; + H5E_END_TRY if (H5I_INVALID_HID != wrap_id) FAIL_PUTS_ERROR("should not be able to call H5VLwrap_register in an application"); @@ -2458,7 +2458,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_wrap_register() */ @@ -2529,7 +2529,7 @@ error: H5VLunregister_connector(vol_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_info_to_str() */ @@ -2608,7 +2608,7 @@ error: H5Fclose(file_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end test_query_optional() */ diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c index 06cbd08..23e3544 100644 --- a/testpar/API/H5_api_async_test_parallel.c +++ b/testpar/API/H5_api_async_test_parallel.c @@ -408,7 +408,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -732,7 +732,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1157,7 +1157,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1572,7 +1572,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1916,7 +1916,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2069,7 +2069,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2278,7 +2278,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2473,7 +2473,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2885,7 +2885,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3062,7 +3062,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3322,7 +3322,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3483,7 +3483,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3565,7 +3565,7 @@ error: H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed); H5ESclose(es_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/testpar/API/H5_api_dataset_test_parallel.c b/testpar/API/H5_api_dataset_test_parallel.c index c2f5b93..5639348 100644 --- a/testpar/API/H5_api_dataset_test_parallel.c +++ b/testpar/API/H5_api_dataset_test_parallel.c @@ -160,7 +160,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; if ((dset_id = H5Dcreate2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2, @@ -174,7 +174,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; if ((dset_id = H5Dcreate2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3, @@ -188,7 +188,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; PASSED(); @@ -250,7 +250,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -258,7 +258,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -359,7 +359,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -367,7 +367,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -450,7 +450,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -458,7 +458,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -466,7 +466,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -574,7 +574,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (mspace_id >= 0) { @@ -582,7 +582,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -590,7 +590,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -684,7 +684,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -692,7 +692,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -700,7 +700,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -812,7 +812,7 @@ test_write_dataset_data_verification(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (mspace_id >= 0) { @@ -820,7 +820,7 @@ test_write_dataset_data_verification(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -828,7 +828,7 @@ test_write_dataset_data_verification(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } } @@ -888,7 +888,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1232,7 +1232,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1384,7 +1384,7 @@ test_write_dataset_one_proc_0_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -1392,7 +1392,7 @@ test_write_dataset_one_proc_0_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -1400,7 +1400,7 @@ test_write_dataset_one_proc_0_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -1529,7 +1529,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1694,7 +1694,7 @@ test_write_dataset_one_proc_none_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -1702,7 +1702,7 @@ test_write_dataset_one_proc_none_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -1710,7 +1710,7 @@ test_write_dataset_one_proc_none_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -1842,7 +1842,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -1990,7 +1990,7 @@ test_write_dataset_one_proc_all_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -1998,7 +1998,7 @@ test_write_dataset_one_proc_all_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -2006,7 +2006,7 @@ test_write_dataset_one_proc_all_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2130,7 +2130,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2265,7 +2265,7 @@ test_write_dataset_hyper_file_all_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -2273,7 +2273,7 @@ test_write_dataset_hyper_file_all_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2406,7 +2406,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; #endif @@ -2559,7 +2559,7 @@ test_write_dataset_all_file_hyper_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -2567,7 +2567,7 @@ test_write_dataset_all_file_hyper_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -2575,7 +2575,7 @@ test_write_dataset_all_file_hyper_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -2699,7 +2699,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -2883,7 +2883,7 @@ test_write_dataset_all_file_point_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -2891,7 +2891,7 @@ test_write_dataset_all_file_point_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -2899,7 +2899,7 @@ test_write_dataset_all_file_point_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -3025,7 +3025,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3201,7 +3201,7 @@ test_write_dataset_hyper_file_point_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -3209,7 +3209,7 @@ test_write_dataset_hyper_file_point_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -3217,7 +3217,7 @@ test_write_dataset_hyper_file_point_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -3349,7 +3349,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3519,7 +3519,7 @@ test_write_dataset_point_file_hyper_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -3527,7 +3527,7 @@ test_write_dataset_point_file_hyper_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -3535,7 +3535,7 @@ test_write_dataset_point_file_hyper_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -3667,7 +3667,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -3800,7 +3800,7 @@ test_read_dataset_one_proc_0_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -3808,7 +3808,7 @@ test_read_dataset_one_proc_0_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -3816,7 +3816,7 @@ test_read_dataset_one_proc_0_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -4001,7 +4001,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4135,7 +4135,7 @@ test_read_dataset_one_proc_none_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -4143,7 +4143,7 @@ test_read_dataset_one_proc_none_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -4151,7 +4151,7 @@ test_read_dataset_one_proc_none_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -4350,7 +4350,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4481,7 +4481,7 @@ test_read_dataset_one_proc_all_selection(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -4489,7 +4489,7 @@ test_read_dataset_one_proc_all_selection(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -4497,7 +4497,7 @@ test_read_dataset_one_proc_all_selection(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -4687,7 +4687,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -4835,7 +4835,7 @@ test_read_dataset_all_file_hyper_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -4843,7 +4843,7 @@ test_read_dataset_all_file_hyper_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -4851,7 +4851,7 @@ test_read_dataset_all_file_hyper_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -5034,7 +5034,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5183,7 +5183,7 @@ test_read_dataset_all_file_point_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -5191,7 +5191,7 @@ test_read_dataset_all_file_point_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5199,7 +5199,7 @@ test_read_dataset_all_file_point_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -5397,7 +5397,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5536,7 +5536,7 @@ test_read_dataset_hyper_file_point_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -5544,7 +5544,7 @@ test_read_dataset_hyper_file_point_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5552,7 +5552,7 @@ test_read_dataset_hyper_file_point_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -5755,7 +5755,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -5890,7 +5890,7 @@ test_read_dataset_point_file_hyper_mem(void) { H5Sclose(mspace_id); } - H5E_END_TRY; + H5E_END_TRY mspace_id = H5I_INVALID_HID; } if (fspace_id >= 0) { @@ -5898,7 +5898,7 @@ test_read_dataset_point_file_hyper_mem(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -5906,7 +5906,7 @@ test_read_dataset_point_file_hyper_mem(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6112,7 +6112,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6368,7 +6368,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -6376,7 +6376,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -6384,7 +6384,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -6572,7 +6572,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -6831,7 +6831,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -6839,7 +6839,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -6847,7 +6847,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -7037,7 +7037,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7232,7 +7232,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -7240,7 +7240,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -7248,7 +7248,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -7408,7 +7408,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -7493,7 +7493,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -7501,7 +7501,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -7560,7 +7560,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -7758,7 +7758,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dcpl_id >= 0) { @@ -7766,7 +7766,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY dcpl_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -7774,7 +7774,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -7936,7 +7936,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -8021,7 +8021,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Sclose(fspace_id); } - H5E_END_TRY; + H5E_END_TRY fspace_id = H5I_INVALID_HID; } if (dset_id >= 0) { @@ -8029,7 +8029,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) { H5Dclose(dset_id); } - H5E_END_TRY; + H5E_END_TRY dset_id = H5I_INVALID_HID; } @@ -8088,7 +8088,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/testpar/API/H5_api_file_test_parallel.c b/testpar/API/H5_api_file_test_parallel.c index 5e4e42e..9bbcd9c 100644 --- a/testpar/API/H5_api_file_test_parallel.c +++ b/testpar/API/H5_api_file_test_parallel.c @@ -68,7 +68,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -119,7 +119,7 @@ test_open_file(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -142,7 +142,7 @@ test_open_file(void) { H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY file_id = H5I_INVALID_HID; } @@ -167,7 +167,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -302,7 +302,7 @@ error: H5Pclose(fapl_id); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c index fb80d8a..9b1d432 100644 --- a/testpar/API/H5_api_test_parallel.c +++ b/testpar/API/H5_api_test_parallel.c @@ -453,7 +453,7 @@ error: H5VLclose(registered_con_id); H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY MPI_Finalize(); diff --git a/testpar/API/t_bigio.c b/testpar/API/t_bigio.c index f1d7a97..3ab4c38 100644 --- a/testpar/API/t_bigio.c +++ b/testpar/API/t_bigio.c @@ -1922,7 +1922,7 @@ main(int argc, char **argv) H5Fdelete(FILENAME[0], fapl_id); H5Fdelete(FILENAME[1], fapl_id); } - H5E_END_TRY; + H5E_END_TRY H5Pclose(fapl_id); } diff --git a/testpar/API/t_file.c b/testpar/API/t_file.c index ccd4e6e..c906c78 100644 --- a/testpar/API/t_file.c +++ b/testpar/API/t_file.c @@ -170,7 +170,7 @@ test_page_buffer_access(void) { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VRFY((file_id < 0), "H5Fcreate failed"); /* disable collective metadata writes for page buffering to work */ @@ -1034,7 +1034,7 @@ test_delete(void) { is_hdf5 = H5Fis_accessible(filename, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VRFY((is_hdf5 != SUCCEED), "H5Fis_accessible"); /* Release file-access plist */ diff --git a/testpar/t_file.c b/testpar/t_file.c index 69d0562..b743936 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -104,7 +104,7 @@ test_split_comm_access(void) { ret = H5Fdelete(filename, acc_tpl); } - H5E_END_TRY; + H5E_END_TRY VRFY((ret >= 0), "H5Fdelete succeeded"); /* Release file-access template */ diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 8ac413a..8a3c10e 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -250,7 +250,7 @@ test_ioc_only_fail(void) { file_id = H5Fcreate(SUBF_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VRFY((file_id < 0), "H5Fcreate failed successfully"); VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded"); @@ -1008,7 +1008,7 @@ test_selection_strategies(void) { H5Fdelete(SUBF_FILENAME, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded"); @@ -2022,7 +2022,7 @@ test_subfiling_h5fuse(void) { H5Fdelete(SUBF_FILENAME, fapl_id); } - H5E_END_TRY; + H5E_END_TRY filename_buf = malloc(PATH_MAX); VRFY(filename_buf, "malloc succeeded"); diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 87c2ce9..26f467c 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -1118,7 +1118,7 @@ test_set_configured_fapl(void) { result = h5tools_get_fapl(H5P_DEFAULT, NULL, &vfd_info); } - H5E_END_TRY; + H5E_END_TRY } if (C.expected == 0) { diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index 9b2c1c2..8830c82 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -52,15 +52,15 @@ #define ELMT_H5_TYPE H5T_NATIVE_UCHAR #define GOTOERROR(errcode) \ - { \ + do { \ ret_code = errcode; \ goto done; \ - } + } while (0) #define ERRMSG(mesg) \ - { \ + do { \ fprintf(stderr, "Proc %d: ", pio_mpi_rank_g); \ fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ - } + } while (0) /* verify: if val is false (0), print mesg. */ #define VRFY(val, mesg) \ diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index 849238f..1f73a62 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -34,14 +34,14 @@ #define ELMT_H5_TYPE H5T_NATIVE_UCHAR #define GOTOERROR(errcode) \ - { \ + do { \ ret_code = errcode; \ goto done; \ - } + } while (0) #define ERRMSG(mesg) \ - { \ + do { \ fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ - } + } while (0) /* verify: if val is false (0), print mesg. */ #define VRFY(val, mesg) \ |