Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

1 files changed, 107 insertions, 107 deletions

diff --git a/test/btree2.c b/test/btree2.c
index d72bd3d..20e08bd 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -342,7 +342,7 @@ static int
 iter_cb(const void *_record, void *_op_data)
 {
     const hsize_t *record = (const hsize_t *)_record;
-    hsize_t *      idx    = (hsize_t *)_op_data;
+    hsize_t       *idx    = (hsize_t *)_op_data;
 
     if (*record != *idx)
         return (H5_ITER_ERROR);
@@ -368,7 +368,7 @@ static int
 iter_rec_cb(const void *_record, void *_op_data)
 {
     const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
-    H5B2_test_rec_t *      idx    = (H5B2_test_rec_t *)_op_data;
+    H5B2_test_rec_t       *idx    = (H5B2_test_rec_t *)_op_data;
 
     if (record->key != idx->key)
         return (H5_ITER_ERROR);
@@ -397,7 +397,7 @@ static int
 find_cb(const void *_record, void *_op_data)
 {
     const hsize_t *record = (const hsize_t *)_record;
-    hsize_t *      search = (hsize_t *)_op_data;
+    hsize_t       *search = (hsize_t *)_op_data;
 
     if (*record != *search)
         return (FALSE);
@@ -422,7 +422,7 @@ static int
 find_rec_cb(const void *_record, void *_op_data)
 {
     const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
-    H5B2_test_rec_t *      search = (H5B2_test_rec_t *)_op_data;
+    H5B2_test_rec_t       *search = (H5B2_test_rec_t *)_op_data;
 
     if (record->key != search->key)
         return (FALSE);
@@ -450,7 +450,7 @@ static int
 find_dec_cb(const void *_record, void *_op_data)
 {
     const hsize_t *record = (const hsize_t *)_record;
-    hsize_t *      search = (hsize_t *)_op_data;
+    hsize_t       *search = (hsize_t *)_op_data;
 
     if (*record != (INSERT_MANY - (*search + 1)))
         return (-1);
@@ -475,7 +475,7 @@ static int
 index_rec_cb(const void *_record, void *_op_data)
 {
     const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
-    H5B2_test_rec_t *      search = (H5B2_test_rec_t *)_op_data;
+    H5B2_test_rec_t       *search = (H5B2_test_rec_t *)_op_data;
 
     HDassert(record);
     HDassert(search);
@@ -503,7 +503,7 @@ static int
 neighbor_cb(const void *_record, void *_op_data)
 {
     const hsize_t *record = (const hsize_t *)_record;
-    hsize_t *      search = (hsize_t *)_op_data;
+    hsize_t       *search = (hsize_t *)_op_data;
 
     *search = *record;
 
@@ -602,7 +602,7 @@ static int
 remove_cb(const void *_record, void *_op_data)
 {
     const hsize_t *record  = (const hsize_t *)_record;
-    hsize_t *      rrecord = (hsize_t *)_op_data;
+    hsize_t       *rrecord = (hsize_t *)_op_data;
 
     *rrecord = *record;
 
@@ -626,7 +626,7 @@ static unsigned
 test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t   file = -1;   /* File ID */
-    H5F_t * f    = NULL; /* Internal file object pointer */
+    H5F_t  *f    = NULL; /* Internal file object pointer */
     H5B2_t *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t bt2_addr;    /* Address of B-tree created */
     hsize_t record;      /* Record to insert into tree */
@@ -867,8 +867,8 @@ static unsigned
 test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     hsize_t     idx;         /* Index within B-tree, for iterator */
@@ -1053,8 +1053,8 @@ static unsigned
 test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -1206,8 +1206,8 @@ static unsigned
 test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -1367,8 +1367,8 @@ static unsigned
 test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -1509,8 +1509,8 @@ static unsigned
 test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -1627,8 +1627,8 @@ static unsigned
 test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -1822,8 +1822,8 @@ static unsigned
 test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2050,8 +2050,8 @@ static unsigned
 test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2284,8 +2284,8 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
                                        const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2455,8 +2455,8 @@ static unsigned
 test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2634,8 +2634,8 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
                                        const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2811,8 +2811,8 @@ static unsigned
 test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t     bt2_addr;    /* Address of B-tree created */
     hsize_t     record;      /* Record to insert into tree */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -2990,13 +2990,13 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
 {
     hid_t       file = -1;      /* File ID */
     char        filename[1024]; /* Filename to use */
-    H5F_t *     f   = NULL;     /* Internal file object pointer */
-    H5B2_t *    bt2 = NULL;     /* v2 B-tree wrapper */
+    H5F_t      *f   = NULL;     /* Internal file object pointer */
+    H5B2_t     *bt2 = NULL;     /* v2 B-tree wrapper */
     haddr_t     bt2_addr;       /* Address of B-tree created */
     hsize_t     record;         /* Record to insert into tree */
     hsize_t     idx;            /* Index within B-tree, for iterator */
     time_t      curr_time;      /* Current time, for seeding random number generator */
-    hsize_t *   records;        /* Record #'s for random insertion */
+    hsize_t    *records;        /* Record #'s for random insertion */
     unsigned    u;              /* Local index variable */
     unsigned    swap_idx;       /* Location to swap with when shuffling */
     hsize_t     temp_rec;       /* Temporary record */
@@ -3232,8 +3232,8 @@ static unsigned
 test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_test_rec_t modify;      /* Modified value */
@@ -3642,8 +3642,8 @@ static unsigned
 test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_test_rec_t modify;      /* Modified value */
@@ -3904,8 +3904,8 @@ static unsigned
 test_update_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_stat_t     bt2_stat;    /* Statistics about B-tree created */
@@ -4061,8 +4061,8 @@ static unsigned
 test_update_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_stat_t     bt2_stat;    /* Statistics about B-tree created */
@@ -4226,8 +4226,8 @@ static unsigned
 test_update_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_test_rec_t idx;         /* Index within B-tree, for iterator */
@@ -4372,8 +4372,8 @@ static unsigned
 test_update_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_stat_t     bt2_stat;    /* Statistics about B-tree created */
@@ -4493,8 +4493,8 @@ static unsigned
 test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t           file = -1;   /* File ID */
-    H5F_t *         f    = NULL; /* Internal file object pointer */
-    H5B2_t *        bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t          *f    = NULL; /* Internal file object pointer */
+    H5B2_t         *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t         bt2_addr;    /* Address of B-tree created */
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_test_rec_t find;        /* Record to find */
@@ -5084,8 +5084,8 @@ static unsigned
 test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t            file = -1;   /* File ID */
-    H5F_t *          f    = NULL; /* Internal file object pointer */
-    H5B2_t *         bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t           *f    = NULL; /* Internal file object pointer */
+    H5B2_t          *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t          bt2_addr;    /* Address of B-tree created */
     time_t           curr_time;   /* Current time, for seeding random number generator */
     H5B2_test_rec_t *records;     /* Record #'s for random insertion */
@@ -5336,7 +5336,7 @@ static unsigned
 test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t   file = -1;   /* File ID */
-    H5F_t * f    = NULL; /* Internal file object pointer */
+    H5F_t  *f    = NULL; /* Internal file object pointer */
     H5B2_t *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t bt2_addr;    /* Address of B-tree created */
     hsize_t record;      /* Record to insert into tree */
@@ -5649,8 +5649,8 @@ static unsigned
 test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t    file = -1;   /* File ID */
-    H5F_t *  f    = NULL; /* Internal file object pointer */
-    H5B2_t * bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t   *f    = NULL; /* Internal file object pointer */
+    H5B2_t  *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t  bt2_addr;    /* Address of B-tree created */
     hsize_t  record;      /* Record to insert into tree */
     hsize_t  rrecord;     /* Record to remove from tree */
@@ -5873,8 +5873,8 @@ static unsigned
 test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t    file = -1;   /* File ID */
-    H5F_t *  f    = NULL; /* Internal file object pointer */
-    H5B2_t * bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t   *f    = NULL; /* Internal file object pointer */
+    H5B2_t  *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t  bt2_addr;    /* Address of B-tree created */
     hsize_t  record;      /* Record to insert into tree */
     hsize_t  rrecord;     /* Record to remove from tree */
@@ -6069,8 +6069,8 @@ static unsigned
 test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -6247,8 +6247,8 @@ static unsigned
 test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -6372,8 +6372,8 @@ static unsigned
 test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -6599,8 +6599,8 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
                                            const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -6747,8 +6747,8 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
                                            const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -6895,8 +6895,8 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
                                        const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7040,8 +7040,8 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
                                        const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7184,8 +7184,8 @@ static unsigned
 test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7322,8 +7322,8 @@ static unsigned
 test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7608,8 +7608,8 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t *
                                                const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7759,8 +7759,8 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t *
                                                const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -7910,8 +7910,8 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar
                                            const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8062,8 +8062,8 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar
                                            const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8214,8 +8214,8 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam,
                                         const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8340,8 +8340,8 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam
                                          const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8465,8 +8465,8 @@ static unsigned
 test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8591,8 +8591,8 @@ static unsigned
 test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               rrecord;     /* Record to remove from tree */
@@ -8717,8 +8717,8 @@ gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam, had
               const hsize_t *records)
 {
     hid_t       file = -1;   /* File ID */
-    H5F_t *     f    = NULL; /* Internal file object pointer */
-    H5B2_t *    bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t      *f    = NULL; /* Internal file object pointer */
+    H5B2_t     *bt2  = NULL; /* v2 B-tree wrapper */
     hsize_t     record;      /* Record to insert into tree */
     unsigned    u;           /* Local index variable */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
@@ -8795,17 +8795,17 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara
 {
     hid_t     file = -1;        /* File ID */
     char      filename[1024];   /* Filename to use */
-    H5F_t *   f  = NULL;        /* Internal file object pointer */
+    H5F_t    *f  = NULL;        /* Internal file object pointer */
     int       fd = -1;          /* File descriptor */
     h5_stat_t sb;               /* Stat buffer for file */
-    void *    file_data = NULL; /* Copy of file data */
-    H5B2_t *  bt2       = NULL; /* v2 B-tree wrapper */
+    void     *file_data = NULL; /* Copy of file data */
+    H5B2_t   *bt2       = NULL; /* v2 B-tree wrapper */
     haddr_t   bt2_addr;         /* Address of B-tree created */
     hsize_t   record;           /* Record to insert into tree */
     hsize_t   rrecord;          /* Record to remove from tree */
     haddr_t   root_addr;        /* Address of root of B-tree created */
     time_t    curr_time;        /* Current time, for seeding random number generator */
-    hsize_t * records;          /* Record #'s for random insertion */
+    hsize_t  *records;          /* Record #'s for random insertion */
     unsigned  u;                /* Local index variable */
     unsigned  rem_idx;          /* Location to remove */
     hsize_t   nrec;             /* Number of records in B-tree */
@@ -9236,12 +9236,12 @@ static unsigned
 test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               search;      /* Search value */
-    hsize_t *             records;     /* Record #'s for random insertion */
+    hsize_t              *records;     /* Record #'s for random insertion */
     unsigned              u;           /* Local index variable */
     H5B2_node_info_test_t ninfo;       /* B-tree node info */
     herr_t                ret;         /* Generic error return value */
@@ -9462,10 +9462,10 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
 {
     hid_t          file = -1;      /* File ID */
     char           filename[1024]; /* Filename to use */
-    H5F_t *        f = NULL;       /* Internal file object pointer */
+    H5F_t         *f = NULL;       /* Internal file object pointer */
     h5_stat_size_t empty_size;     /* Size of an empty file */
     h5_stat_size_t file_size;      /* Size of each file created */
-    H5B2_t *       bt2 = NULL;     /* v2 B-tree wrapper */
+    H5B2_t        *bt2 = NULL;     /* v2 B-tree wrapper */
     haddr_t        bt2_addr;       /* Address of B-tree created */
     hsize_t        record;         /* Record to insert into tree */
     H5B2_stat_t    bt2_stat;       /* Statistics about B-tree created */
@@ -9733,8 +9733,8 @@ static unsigned
 test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam)
 {
     hid_t                 file = -1;   /* File ID */
-    H5F_t *               f    = NULL; /* Internal file object pointer */
-    H5B2_t *              bt2  = NULL; /* v2 B-tree wrapper */
+    H5F_t                *f    = NULL; /* Internal file object pointer */
+    H5B2_t               *bt2  = NULL; /* v2 B-tree wrapper */
     haddr_t               bt2_addr;    /* Address of B-tree created */
     hsize_t               record;      /* Record to insert into tree */
     hsize_t               modify;      /* Modified value */
@@ -9984,8 +9984,8 @@ test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam)
     hid_t   file2  = -1;        /* File ID */
     hid_t   file0  = -1;        /* File ID */
     hid_t   file00 = -1;        /* File ID */
-    H5F_t * f      = NULL;      /* Internal file object pointer */
-    H5F_t * f2     = NULL;      /* Internal file object pointer */
+    H5F_t  *f      = NULL;      /* Internal file object pointer */
+    H5F_t  *f2     = NULL;      /* Internal file object pointer */
     H5B2_t *bt2    = NULL;      /* v2 B-tree wrapper */
     H5B2_t *bt2_2  = NULL;      /* Second v2 B-tree wrapper */
     haddr_t bt2_addr;           /* Address of B-tree created */
@@ -10123,7 +10123,7 @@ main(void)
     unsigned         nerrors = 0;     /* Cumulative error count */
     unsigned         reopen;          /* Whether to reopen B-tree during tests */
     int              ExpressMode;
-    const char *     envval         = NULL;
+    const char      *envval         = NULL;
     hbool_t          api_ctx_pushed = FALSE; /* Whether API context pushed */
 
     envval = HDgetenv(HDF5_DRIVER);