mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the last of the -Wextra-semi-stmt warnings (#3326)

Browse Source 
* 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>
This commit is contained in:
Sean McBride 2023-08-02 18:46:26 -04:00 committed by GitHub
parent 86ddedf522
commit 07df0d252c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 1561 additions and 1551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/getting-started-with-hdf5-development.md
View File

@ -713,7 +713,7 @@ error:
{
H5Fclose(fid);
}
H5E_END_TRY;
H5E_END_TRY
return FAIL;
}

40
src/H5Cpkg.h
View File

@ -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 */

4
src/H5Epublic.h
View File

@ -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

12
src/H5FDmulti.c
View File

@ -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);

2
src/H5Fint.c
View File

@ -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
}
/*

26
test/API/H5_api_async_test.c
View File

@ -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() */

362
test/API/H5_api_attribute_test.c
View File

File diff suppressed because it is too large Load Diff

294
test/API/H5_api_dataset_test.c
View File

File diff suppressed because it is too large Load Diff

98
test/API/H5_api_datatype_test.c
View File

@ -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;
}

110
test/API/H5_api_file_test.c
View File

@ -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);

106
test/API/H5_api_group_test.c
View File

@ -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();

518
test/API/H5_api_link_test.c
View File

File diff suppressed because it is too large Load Diff

16
test/API/H5_api_misc_test.c
View File

@ -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;
}

210
test/API/H5_api_object_test.c
View File

@ -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 */

2
test/API/H5_api_test_util.c
View File

@ -712,7 +712,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
H5E_END_TRY;
H5E_END_TRY
return -1;
}

4
test/API/tarray.c
View File

@ -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 */

116
test/API/tattr.c
View File

@ -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 */

15
test/API/tconfig.c
View File

@ -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. */

2
test/API/testhdf5.c
View File

@ -695,7 +695,7 @@ main(int argc, char *argv[])
cleanup_genprop();
cleanup_unicode();
cleanup_misc();
H5E_END_TRY;
H5E_END_TRY
printf("\n");
}

158
test/API/tfile.c
View File

@ -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
}

12
test/API/tgenprop.c
View File

@ -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 */

8
test/API/th5o.c
View File

@ -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
}

20
test/API/th5s.c
View File

@ -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 */

16
test/API/titerate.c
View File

@ -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 */

102
test/API/tmisc.c
View File

@ -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() */

62
test/API/trefer.c
View File

@ -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) {

100
test/API/tselect.c
View File

@ -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' */

6
test/API/tvltypes.c
View File

@ -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 */

54
test/dtransform.c
View File

@ -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;

12
test/enum.c
View File

@ -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;
}

2
test/links.c
View File

@ -13807,7 +13807,7 @@ error:
{
H5Fclose(fid);
}
H5E_END_TRY;
H5E_END_TRY
return FAIL;
} /* end external_link_public_macros() */

2
test/objcopy.c
View File

@ -16214,7 +16214,7 @@ error:
H5Pclose(ocpypl_id);
H5Fclose(file_id);
}
H5E_END_TRY;
H5E_END_TRY
return 1;
}

22
test/select_io_dset.c
View File

@ -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() */

2
test/tarray.c
View File

@ -2245,5 +2245,5 @@ cleanup_array(void)
{
H5Fdelete(FILENAME, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
} /* end cleanup_array() */

92
test/tattr.c
View File

@ -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
}

15
test/tconfig.c
View File

@ -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. */

2
test/tcoords.c
View File

@ -719,5 +719,5 @@ cleanup_coords(void)
{
H5Fdelete(FILENAME, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

42
test/tfile.c
View File

@ -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() */

14
test/tgenprop.c
View File

@ -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
}

6
test/th5s.c
View File

@ -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
}

2
test/titerate.c
View File

@ -1212,5 +1212,5 @@ cleanup_iterate(void)
{
H5Fdelete(DATAFILE, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

10
test/tmisc.c
View File

@ -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() */

54
test/trefer.c
View File

@ -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
}

28
test/tselect.c
View File

@ -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
}

2
test/ttime.c
View File

@ -226,5 +226,5 @@ cleanup_time(void)
{
H5Fdelete(DATAFILE, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

2
test/tunicode.c
View File

@ -863,5 +863,5 @@ cleanup_unicode(void)
{
H5Fdelete(FILENAME, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

2
test/tvlstr.c
View File

@ -1003,5 +1003,5 @@ cleanup_vlstrings(void)
H5Fdelete(DATAFILE2, H5P_DEFAULT);
H5Fdelete(DATAFILE3, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

2
test/tvltypes.c
View File

@ -3260,5 +3260,5 @@ cleanup_vltypes(void)
{
H5Fdelete(FILENAME, H5P_DEFAULT);
}
H5E_END_TRY;
H5E_END_TRY
}

14
test/twriteorder.c
View File

@ -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();
/* ============= */

8
test/use.h
View File

@ -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 */

18
test/use_disable_mdc_flushes.c
View File

@ -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;

8
test/vol.c
View File

@ -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() */

26
testpar/API/H5_api_async_test_parallel.c
View File

@ -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;
}

204
testpar/API/H5_api_dataset_test_parallel.c
View File

@ -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;
}

10
testpar/API/H5_api_file_test_parallel.c
View File

@ -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;
}

2
testpar/API/H5_api_test_parallel.c
View File

@ -453,7 +453,7 @@ error:
H5VLclose(registered_con_id);
H5Pclose(fapl_id);
}
H5E_END_TRY;
H5E_END_TRY
MPI_Finalize();

2
testpar/API/t_bigio.c
View File

@ -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);
}

4
testpar/API/t_file.c
View File

@ -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 */

2
testpar/t_file.c
View File

@ -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 */

6
testpar/t_subfiling_vfd.c
View File

@ -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");

2
tools/libtest/h5tools_test_utils.c
View File

@ -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) {

8
tools/src/h5perf/pio_engine.c
View File

@ -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) \

8
tools/src/h5perf/sio_engine.c
View File

@ -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) \