Merge pull request #2724 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10

* commit 'bfe04875838d8c3baea58c3fbfb16d9ee88d3beb':
  Normalization and warning fixes from develop

1 files changed, 33 insertions, 6 deletions

diff --git a/test/fillval.c b/test/fillval.c
index 0454bde..106bb20 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -758,10 +758,15 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
     int        fillval=(-1), val_rd, should_be;
     int        i, j, *buf=NULL, odd;
     unsigned    u;
-    comp_datatype       rd_c, fill_c, should_be_c;
+    comp_datatype    rd_c, fill_c, should_be_c;
     comp_datatype    *buf_c=NULL;
     H5D_space_status_t  allocation;
 
+    fill_c.a = 0;
+    fill_c.x = 0;
+    fill_c.y = 0;
+    fill_c.z = 0;
+
     if(datatype == H5T_INTEGER) {
         fillval = *(int*)_fillval;
     }
@@ -822,7 +827,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                        hs_offset[0], hs_offset[1],
                        hs_offset[2], hs_offset[3],
                        hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z,
-            (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z);
+                       (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z);
                 goto error;
             }
         }
@@ -1448,12 +1453,16 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     void        *val_rd, *odd_val;
     const void  *init_val, *should_be, *even_val;
     int        val_rd_i, init_val_i = 9999;
-    comp_vl_datatype init_val_c = {87, "baz", "mumble", 129};
+    comp_vl_datatype init_val_c = {87, NULL, NULL, 129};
     comp_vl_datatype val_rd_c;
     void    *buf = NULL;
     unsigned    odd;                    /* Whether an odd or even coord. was read */
     unsigned    i, j;                   /* Local index variables */
 
+    /* Set vl datatype init value strings */
+    init_val_c.a = HDstrdup("baz");
+    init_val_c.b = HDstrdup("mumble");
+
     /* Make copy of dataset creation property list */
     if((dcpl = H5Pcopy(_dcpl)) < 0) TEST_ERROR
 
@@ -1797,6 +1806,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     /* Release elements & memory buffer */
     for(i = 0; i < nelmts; i++)
         release_rtn((void *)((char *)buf + (val_size * i)));
+
+    HDfree(init_val_c.a);
+    HDfree(init_val_c.b);
     HDfree(buf);
     buf = NULL;
 
@@ -1808,8 +1820,10 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     return 0;
 
 error:
-    if(buf)
-        HDfree(buf);
+    HDfree(init_val_c.a);
+    HDfree(init_val_c.b);
+    HDfree(buf);
+
     H5E_BEGIN_TRY {
     H5Pclose(dcpl);
     H5Dclose(dset);
@@ -1851,7 +1865,7 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 #else
     int        fillval_i = 0x4c70f1cd;
 #endif
-    comp_vl_datatype fillval_c = {32, "foo", "bar", 64};         /* Fill value for compound+vl datatype tests */
+    comp_vl_datatype fillval_c = {32, NULL, NULL, 64};         /* Fill value for compound+vl datatype tests */
     char    filename[1024];
 
     /* Print testing message */
@@ -1860,6 +1874,10 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
     else
     TESTING("contiguous dataset extend")
 
+    /* Set vl datatype fill value strings */
+    fillval_c.a = HDstrdup("foo");
+    fillval_c.b = HDstrdup("bar");
+
     /* Create dataset creation property list */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
     if(H5D_CHUNKED == layout)
@@ -1940,11 +1958,17 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(H5Pclose(dcpl) < 0) TEST_ERROR
     if(H5Fclose(file) < 0) TEST_ERROR
 
+    HDfree(fillval_c.a);
+    HDfree(fillval_c.b);
+
     PASSED();
 
     return 0;
 
 error:
+    HDfree(fillval_c.a);
+    HDfree(fillval_c.b);
+
     H5E_BEGIN_TRY {
         H5Tclose(cmpd_vl_tid);
     H5Pclose(dcpl);
@@ -1953,6 +1977,9 @@ error:
     return 1;
 
 skip:
+    HDfree(fillval_c.a);
+    HDfree(fillval_c.b);
+
     H5E_BEGIN_TRY {
     H5Pclose(dcpl);
     H5Fclose(file);