summaryrefslogtreecommitdiffstats
path: root/test/dtypes.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-07-31 18:58:46 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-07-31 18:58:46 (GMT)
commitbfe04875838d8c3baea58c3fbfb16d9ee88d3beb (patch)
treef21d4753e48dad48367633f5a55a23e72cd9dbf6 /test/dtypes.c
parentf977c4dfd0e5eb6f6e8527bdc9e48edebe500d78 (diff)
downloadhdf5-bfe04875838d8c3baea58c3fbfb16d9ee88d3beb.zip
hdf5-bfe04875838d8c3baea58c3fbfb16d9ee88d3beb.tar.gz
hdf5-bfe04875838d8c3baea58c3fbfb16d9ee88d3beb.tar.bz2
Normalization and warning fixes from develop
Diffstat (limited to 'test/dtypes.c')
-rw-r--r--test/dtypes.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/dtypes.c b/test/dtypes.c
index 6d81392..c89688c 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -659,8 +659,8 @@ error:
* destination are the same except for the order of the
* elements.
*
- * Return: Success: 0
- * Failure: number of errors
+ * Return: Success: 0
+ * Failure: number of errors
*
* Programmer: Robb Matzke
* Thursday, June 17, 1999
@@ -6099,7 +6099,8 @@ test_int_float_except(void)
/* Convert second buffer */
HDmemset(&e, 0, sizeof(except_info_t));
- if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR
+ if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0)
+ TEST_ERROR
/* Check the buffer after conversion, as floats */
for(u = 0; u < CONVERT_SIZE; u++) {
@@ -6116,7 +6117,8 @@ test_int_float_except(void)
/* Convert buffer */
HDmemset(&e, 0, sizeof(except_info_t));
- if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR
+ if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0)
+ TEST_ERROR
/* Check the buffer after conversion, as integers */
for(u = 0; u < CONVERT_SIZE; u++) {
@@ -6660,7 +6662,7 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl,
hid_t my_fapl; /* Copy of file access property list ID */
hid_t dcpl; /* Dataset creation property list ID */
unsigned use_at_least_v18;/* Whether to use old or new format */
- herr_t status; /* Generic return value */
+ herr_t H5_ATTR_NDEBUG_UNUSED status; /* Generic return value */
/* Make copy of FAPL */
my_fapl = H5Pcopy(fapl);
@@ -7757,8 +7759,8 @@ error:
int
main(void)
{
- long nerrors = 0;
- hid_t fapl = -1;
+ long nerrors = 0;
+ hid_t fapl = H5I_INVALID_HID;
/* Set the random # seed */
HDsrandom((unsigned)HDtime(NULL));