diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-08-03 18:30:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-03 18:30:34 (GMT) |
commit | 27b2d6735cbc326dbfa3f8e0a07ca7ba82ffe253 (patch) | |
tree | 1ece8273bcfba450d48d1c848ea2ec3aad017d83 /test/trefer.c | |
parent | 7fc8531b767855e69fb4016783a1131ba581fd5b (diff) | |
download | hdf5-27b2d6735cbc326dbfa3f8e0a07ca7ba82ffe253.zip hdf5-27b2d6735cbc326dbfa3f8e0a07ca7ba82ffe253.tar.gz hdf5-27b2d6735cbc326dbfa3f8e0a07ca7ba82ffe253.tar.bz2 |
Merge Fixes the last of the -Wextra-semi-stmt warnings #3326 (#3338)
Diffstat (limited to 'test/trefer.c')
-rw-r--r-- | test/trefer.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/test/trefer.c b/test/trefer.c index 0aff270..577fc69 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -209,25 +209,25 @@ test_reference_params(void) { ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object ref"); H5E_BEGIN_TRY { ret = H5Rcreate_object(H5I_INVALID_HID, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object name"); H5E_BEGIN_TRY { ret = H5Rcreate_object(fid1, "", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_object null name"); /* Test parameters to H5Rcreate_region */ @@ -235,25 +235,25 @@ test_reference_params(void) { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region ref"); H5E_BEGIN_TRY { ret = H5Rcreate_region(H5I_INVALID_HID, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, NULL, sid1, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region name"); H5E_BEGIN_TRY { ret = H5Rcreate_region(fid1, "/Group1/Dataset1", H5I_INVALID_HID, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_region dataspace"); /* Test parameters to H5Rcreate_attr */ @@ -261,25 +261,25 @@ test_reference_params(void) { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", "Attr", H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr ref"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(H5I_INVALID_HID, "/Group1/Dataset2", "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr loc_id"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, NULL, "Attr", H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr name"); H5E_BEGIN_TRY { ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", NULL, H5P_DEFAULT, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcreate_attr attr_name"); /* Test parameters to H5Rdestroy */ @@ -287,7 +287,7 @@ test_reference_params(void) { ret = H5Rdestroy(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rdestroy"); /* Test parameters to H5Rget_type */ @@ -295,7 +295,7 @@ test_reference_params(void) { type = H5Rget_type(NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(type, H5R_BADTYPE, "H5Rget_type ref"); /* Test parameters to H5Requal */ @@ -303,13 +303,13 @@ test_reference_params(void) { ret = H5Requal(NULL, &rbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref1"); H5E_BEGIN_TRY { ret = H5Requal(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Requal ref2"); /* Test parameters to H5Rcopy */ @@ -317,13 +317,13 @@ test_reference_params(void) { ret = H5Rcopy(NULL, &wbuf[0]); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy src_ref"); H5E_BEGIN_TRY { ret = H5Rcopy(&rbuf[0], NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rcopy dest_ref"); /* Test parameters to H5Ropen_object */ @@ -331,13 +331,13 @@ test_reference_params(void) { dset2 = H5Ropen_object(&rbuf[0], H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object oapl_id"); H5E_BEGIN_TRY { dset2 = H5Ropen_object(NULL, H5P_DEFAULT, dapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object ref"); /* Test parameters to H5Ropen_region */ @@ -345,7 +345,7 @@ test_reference_params(void) { ret_id = H5Ropen_region(NULL, H5I_INVALID_HID, H5I_INVALID_HID); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_region ref"); /* Test parameters to H5Ropen_attr */ @@ -353,7 +353,7 @@ test_reference_params(void) { ret_id = H5Ropen_attr(NULL, H5P_DEFAULT, aapl_id); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_attr ref"); /* Test parameters to H5Rget_obj_type3 */ @@ -361,7 +361,7 @@ test_reference_params(void) { ret = H5Rget_obj_type3(NULL, H5P_DEFAULT, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(ret, FAIL, "H5Rget_obj_type3 ref"); /* Test parameters to H5Rget_file_name */ @@ -369,7 +369,7 @@ test_reference_params(void) { name_size = H5Rget_file_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_file_name ref"); /* Test parameters to H5Rget_obj_name */ @@ -377,7 +377,7 @@ test_reference_params(void) { name_size = H5Rget_obj_name(NULL, H5P_DEFAULT, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_obj_name ref"); /* Test parameters to H5Rget_attr_name */ @@ -385,7 +385,7 @@ test_reference_params(void) { name_size = H5Rget_attr_name(NULL, NULL, 0); } - H5E_END_TRY; + H5E_END_TRY VERIFY(name_size, (-1), "H5Rget_attr_name ref"); /* Close disk dataspace */ @@ -3628,5 +3628,5 @@ cleanup_reference(void) H5Fdelete(FILE_REF_EXT2, H5P_DEFAULT); H5Fdelete(FILE_REF_COMPAT, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY } |