diff options
author | Sean McBride <sean@rogue-research.com> | 2023-06-16 04:49:02 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-16 04:49:02 (GMT) |
commit | 68eba3da69e659fab69bbef5901ce42e82cea1dc (patch) | |
tree | f36805f798df6c04092c14dc6803d2cb82f6eff2 /test/tattr.c | |
parent | 10093f7c4345061bdbebc12888debbf08fe85a5b (diff) | |
download | hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.zip hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.tar.gz hdf5-68eba3da69e659fab69bbef5901ce42e82cea1dc.tar.bz2 |
Many clang -Wextra-semi-stmt fixes (#2537)
* Adds semicolons to function-like macros
* Adds a do..while(0) loop to some macros
* Removes semicolons when inappropriate, especially H5E_TRY_BEGIN/END
Diffstat (limited to 'test/tattr.c')
-rw-r--r-- | test/tattr.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/test/tattr.c b/test/tattr.c index 20dbd25..6f3ecb4 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -5853,9 +5853,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Output message about test being performed */ if (use_index) - MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n")) + MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -6088,7 +6088,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info(attr, NULL); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info"); @@ -6096,7 +6096,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info_by_name(fid, ".", GET_INFO_NULL_POINTER_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info_by_name"); @@ -6104,7 +6104,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_info_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Aget_info_by_idx"); @@ -6152,7 +6152,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6160,7 +6160,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, "", INVALID_RENAME_TEST_NEW_ATTR_NAME); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6168,7 +6168,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, NULL); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6176,7 +6176,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, ""); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename"); @@ -6184,7 +6184,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6192,7 +6192,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", "", INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6200,7 +6200,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, NULL, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6208,7 +6208,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl) { err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, "", H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY CHECK(err_ret, SUCCEED, "H5Arename_by_name"); @@ -6258,7 +6258,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_name(attr, 1, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY(err_ret, FAIL, "H5Aget_name"); @@ -6266,7 +6266,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl) { err_ret = H5Aget_name_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 1, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY VERIFY(err_ret, FAIL, "H5Aget_name_by_idx"); @@ -6315,7 +6315,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ - MESSAGE(5, ("Testing Deleting Attribute By Index\n")) + MESSAGE(5, ("Testing Deleting Attribute By Index\n")); /* Create dataspace for dataset & attributes */ sid = H5Screate(H5S_SCALAR); @@ -6346,36 +6346,36 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end else */ } /* end else */ @@ -7333,36 +7333,36 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Increasing Order w/Creation Order Index\n")) + "Increasing Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Increasing Order w/o Creation Order Index\n")) + "Increasing Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Decreasing Order w/Creation Order Index\n")) + "Decreasing Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in " - "Decreasing Order w/o Creation Order Index\n")) + "Decreasing Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order " - "w/o Creation Order Index\n")) + "w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order " - "w/o Creation Order Index\n")) + "w/o Creation Order Index\n")); } /* end else */ } /* end else */ @@ -7731,36 +7731,36 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing " - "Order w/Creation Order Index\n")) + "Order w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing " - "Order w/o Creation Order Index\n")) + "Order w/o Creation Order Index\n")); } /* end else */ } /* end if */ else { if (order == H5_ITER_INC) { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end if */ else { if (use_index) MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order " - "w/Creation Order Index\n")) + "w/Creation Order Index\n")); else MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order w/o " - "Creation Order Index\n")) + "Creation Order Index\n")); } /* end else */ } /* end else */ @@ -8097,9 +8097,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Print appropriate test message */ if (use_index) - MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n")) + MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -8392,9 +8392,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) for (use_index = FALSE; use_index <= TRUE; use_index++) { /* Print appropriate test message */ if (use_index) - MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n")) + MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n")); else - MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n")) + MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n")); /* Create file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); |