Merge test changes from develop (#959)

1 files changed, 80 insertions, 34 deletions

diff --git a/test/cmpd_dtransform.c b/test/cmpd_dtransform.c
index ef5ad75..76ff287 100644
--- a/test/cmpd_dtransform.c
+++ b/test/cmpd_dtransform.c
@@ -31,59 +31,75 @@ typedef struct {
 int
 main(void)
 {
-    hsize_t dima[] = {1};
-    hsize_t dims[] = {LENGTH};
-    hid_t   str_dtyp_id, att_dtyp_id, file_id, fspace_id, dset_id, att_dspc_id, att_attr_id, dxpl_id;
+    hsize_t     dima[]      = {1};
+    hsize_t     dims[]      = {LENGTH};
+    hid_t       str_dtyp_id = H5I_INVALID_HID, att_dtyp_id = H5I_INVALID_HID;
+    hid_t       file_id     = H5I_INVALID_HID;
+    hid_t       fspace_id   = H5I_INVALID_HID;
+    hid_t       dset_id     = H5I_INVALID_HID;
+    hid_t       att_dspc_id = H5I_INVALID_HID;
+    hid_t       att_attr_id = H5I_INVALID_HID;
+    hid_t       dxpl_id     = H5I_INVALID_HID;
+    const char *expr        = "2*x";
+    int *       data        = NULL;
+    int *       data_res    = NULL;
+    att_t *     atts        = NULL;
+    att_t *     atts_res    = NULL;
 
     /* Compound datatype */
-    att_t *atts = HDmalloc(sizeof(att_t));
+    if (NULL == (atts = HDmalloc(sizeof(att_t))))
+        TEST_ERROR;
     HDstrcpy(atts[0].name, "Name");
     HDstrcpy(atts[0].unit, "Unit");
 
     /* String type */
     if ((str_dtyp_id = H5Tcopy(H5T_C_S1)) < 0)
-        TEST_ERROR;
-    H5Tset_size(str_dtyp_id, 64);
+        FAIL_STACK_ERROR
+    if (H5Tset_size(str_dtyp_id, 64) < 0)
+        FAIL_STACK_ERROR
 
     /* Attribute type */
     if ((att_dtyp_id = H5Tcreate(H5T_COMPOUND, sizeof(att_t))) < 0)
-        TEST_ERROR;
-    H5Tinsert(att_dtyp_id, "NAME", HOFFSET(att_t, name), str_dtyp_id);
-    H5Tinsert(att_dtyp_id, "UNIT", HOFFSET(att_t, unit), str_dtyp_id);
+        FAIL_STACK_ERROR
+    if (H5Tinsert(att_dtyp_id, "NAME", HOFFSET(att_t, name), str_dtyp_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tinsert(att_dtyp_id, "UNIT", HOFFSET(att_t, unit), str_dtyp_id) < 0)
+        FAIL_STACK_ERROR
 
     /* Create file. */
     if ((file_id = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Create file dataspace. */
     if ((fspace_id = H5Screate_simple(1, dims, NULL)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Create dataset. */
     if ((dset_id = H5Dcreate2(file_id, "test_dset", H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Write the attribute (compound) to the dataset */
     if ((att_dspc_id = H5Screate_simple(1, dima, NULL)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
     if ((att_attr_id =
              H5Acreate2(dset_id, "ATTRIBUTES", att_dtyp_id, att_dspc_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
     if (H5Awrite(att_attr_id, att_dtyp_id, atts) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Create dataset transfer property list */
-    const char *expr = "2*x";
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
     if (H5Pset_data_transform(dxpl_id, expr) < 0) {
         HDprintf("**** ERROR: H5Pset_data_transform (expression: %s) ****\n", expr);
-        TEST_ERROR;
+        FAIL_STACK_ERROR
     }
 
-    int *data     = HDmalloc(LENGTH * sizeof(int));
-    int *data_res = HDmalloc(LENGTH * sizeof(int));
+    if (NULL == (data = HDmalloc(LENGTH * sizeof(int))))
+        TEST_ERROR;
+    if (NULL == (data_res = HDmalloc(LENGTH * sizeof(int))))
+        TEST_ERROR;
     for (unsigned i = 0; i < LENGTH; i++) {
         data[i]     = 10;
         data_res[i] = 2 * data[i];
@@ -91,12 +107,13 @@ main(void)
 
     /* Write the data */
     if (H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id, data) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Read attribute */
-    att_t *atts_res = HDmalloc(sizeof(att_t));
-    if (H5Aread(att_attr_id, att_dtyp_id, atts_res) < 0)
+    if (NULL == (atts_res = HDmalloc(sizeof(att_t))))
         TEST_ERROR;
+    if (H5Aread(att_attr_id, att_dtyp_id, atts_res) < 0)
+        FAIL_STACK_ERROR
 
     /* Verify attribute */
     if (HDstrcmp(atts_res[0].name, atts[0].name) != 0)
@@ -106,13 +123,12 @@ main(void)
 
     /* Read the data */
     if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
-        TEST_ERROR;
+        FAIL_STACK_ERROR
 
     /* Verify data */
-    for (unsigned idx = 0; idx < LENGTH; idx++) {
+    for (unsigned idx = 0; idx < LENGTH; idx++)
         if (data[idx] != data_res[idx])
             TEST_ERROR;
-    }
 
     HDfree(atts);
     HDfree(atts_res);
@@ -120,17 +136,47 @@ main(void)
     HDfree(data_res);
 
     /* Close all identifiers. */
-    H5Pclose(dxpl_id);
-    H5Aclose(att_attr_id);
-    H5Sclose(att_dspc_id);
-    H5Dclose(dset_id);
-    H5Sclose(fspace_id);
-    H5Fclose(file_id);
-    H5Tclose(att_dtyp_id);
-    H5Tclose(str_dtyp_id);
+    if (H5Pclose(dxpl_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Aclose(att_attr_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(att_dspc_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(dset_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(fspace_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(att_dtyp_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(str_dtyp_id) < 0)
+        FAIL_STACK_ERROR
 
     return 0;
 
 error:
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dxpl_id);
+        H5Aclose(att_attr_id);
+        H5Sclose(att_dspc_id);
+        H5Dclose(dset_id);
+        H5Sclose(fspace_id);
+        H5Fclose(file_id);
+        H5Tclose(att_dtyp_id);
+        H5Tclose(str_dtyp_id);
+    }
+    H5E_END_TRY
+
+    if (atts)
+        HDfree(atts);
+    if (atts_res)
+        HDfree(atts_res);
+    if (data)
+        HDfree(data);
+    if (data_res)
+        HDfree(data_res);
+
     return 1;
 }