Add support for GCC9, update warnhist script, and clean up warnings.

1 files changed, 22 insertions, 19 deletions

diff --git a/test/fheap.c b/test/fheap.c
index 91a1df5..1ad5c11 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -6650,7 +6650,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
         FAIL_STACK_ERROR
 
     /* Close the fractal heap */
-    if((H5HF_close(fh)) < 0)
+    if(H5HF_close(fh) < 0)
         TEST_ERROR
     fh = NULL;
 
@@ -6842,7 +6842,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
         FAIL_STACK_ERROR
 
     /* Close the fractal heap */
-    if((H5HF_close(fh)) < 0)
+    if(H5HF_close(fh) < 0)
         TEST_ERROR
     fh = NULL;
 
@@ -7012,6 +7012,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     /* Close the fractal heap */
     if(H5HF_close(fh) < 0)
         FAIL_STACK_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -13694,28 +13695,30 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
     H5F_t	*f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
-        H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
-        fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-        size_t      id_len;                 /* Size of fractal heap IDs */
-        h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
-        h5_stat_size_t       file_size;              /* Size of file currently */
-        unsigned char *heap_id = NULL;      /* Heap ID for object */
-        size_t      obj_size;               /* Size of object */
-        size_t      robj_size;              /* Size of object read */
-        unsigned char obj_type;             /* Type of storage for object */
-        fheap_heap_state_t state;           /* State of fractal heap */
-        unsigned    deflate_level;          /* Deflation level */
-        size_t      old_actual_id_len =0 ;  /* Old actual ID length */
-        hbool_t     huge_ids_direct;        /* Are 'huge' objects directly acccessed? */
-        const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove %s";       /* Test description */
+    H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
+    fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
+    size_t      id_len;                 /* Size of fractal heap IDs */
+    h5_stat_size_t empty_size;          /* Size of a file with an empty heap */
+    h5_stat_size_t file_size;           /* Size of file currently */
+    unsigned char *heap_id = NULL;      /* Heap ID for object */
+    size_t      obj_size;               /* Size of object */
+    size_t      robj_size;              /* Size of object read */
+    unsigned char obj_type;             /* Type of storage for object */
+    fheap_heap_state_t state;           /* State of fractal heap */
+    unsigned    deflate_level;          /* Deflation level */
+    size_t      old_actual_id_len = 0;  /* Old actual ID length */
+    hbool_t     huge_ids_direct;        /* Are 'huge' objects directly acccessed? */
+    hbool_t     pline_init = FALSE;     /* Whether the I/O pipeline has been initialized */
+    const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove %s";       /* Test description */
 
-        /* Copy heap creation properties */
-        HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t));
+    /* Copy heap creation properties */
+    HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t));
 
     /* Set an I/O filter for heap data */
     deflate_level = 6;
     if(H5Z_append(&tmp_cparam.pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &deflate_level) < 0)
         FAIL_STACK_ERROR
+    pline_init = TRUE;
 
     /* Adjust actual ID length, if asking for IDs that can directly access 'huge' objects */
     if(cparam->id_len == 1) {
@@ -13878,7 +13881,7 @@ error:
         H5MM_xfree(heap_id);
         if(fh)
             H5HF_close(fh);
-        if(&tmp_cparam.pline)
+        if(pline_init)
             H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
         H5Fclose(file);
     } H5E_END_TRY;