clang 13 format #1933 (#1941)

12 files changed, 167 insertions, 159 deletions

diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 8d47915..d23f70d 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -359,7 +359,7 @@ static hbool_t serve_rw_count_reset_request(struct mssg_t *mssg_ptr);
 static herr_t clear_datum(H5F_t *f, void *thing, hbool_t dest);
 static herr_t destroy_datum(H5F_t H5_ATTR_UNUSED *f, void *thing);
 static herr_t flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t addr, void *thing);
-static void * load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+static void  *load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
                          void H5_ATTR_UNUSED *udata);
 static herr_t size_datum(H5F_t H5_ATTR_UNUSED *f, void *thing, size_t *size_ptr);
 
@@ -1065,7 +1065,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag)
 static hbool_t
 setup_derived_types(void)
 {
-    const char *  fcn_name = "setup_derived_types()";
+    const char   *fcn_name = "setup_derived_types()";
     hbool_t       success  = TRUE;
     int           i;
     int           result;
@@ -1262,7 +1262,7 @@ reset_server_counters(void)
 static hbool_t
 server_main(void)
 {
-    const char *  fcn_name   = "server_main()";
+    const char   *fcn_name   = "server_main()";
     hbool_t       done       = FALSE;
     hbool_t       success    = TRUE;
     int           done_count = 0;
@@ -1404,7 +1404,7 @@ server_main(void)
 static hbool_t
 serve_read_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_read_request()";
+    const char   *fcn_name    = "serve_read_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     int           target_index;
@@ -1523,7 +1523,7 @@ serve_read_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_sync_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_sync_request()";
+    const char   *fcn_name    = "serve_sync_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     struct mssg_t reply;
@@ -1724,7 +1724,7 @@ serve_write_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_total_writes_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_total_writes_request()";
+    const char   *fcn_name    = "serve_total_writes_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     struct mssg_t reply;
@@ -1795,7 +1795,7 @@ serve_total_writes_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_total_reads_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_total_reads_request()";
+    const char   *fcn_name    = "serve_total_reads_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     struct mssg_t reply;
@@ -1866,7 +1866,7 @@ serve_total_reads_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_entry_writes_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_entry_writes_request()";
+    const char   *fcn_name    = "serve_entry_writes_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     int           target_index;
@@ -1956,7 +1956,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_entry_reads_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_entry_reads_request()";
+    const char   *fcn_name    = "serve_entry_reads_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     int           target_index;
@@ -2045,7 +2045,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr)
 static hbool_t
 serve_rw_count_reset_request(struct mssg_t *mssg_ptr)
 {
-    const char *  fcn_name    = "serve_rw_count_reset_request()";
+    const char   *fcn_name    = "serve_rw_count_reset_request()";
     hbool_t       report_mssg = FALSE;
     hbool_t       success     = TRUE;
     struct mssg_t reply;
@@ -2225,13 +2225,13 @@ destroy_datum(H5F_t H5_ATTR_UNUSED *f, void *thing)
 static herr_t
 flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t H5_ATTR_UNUSED addr, void *thing)
 {
-    const char *       fcn_name  = "flush_datum()";
+    const char        *fcn_name  = "flush_datum()";
     hbool_t            was_dirty = FALSE;
     herr_t             ret_value = SUCCEED;
     int                idx;
-    struct datum *     entry_ptr;
+    struct datum      *entry_ptr;
     struct mssg_t      mssg;
-    H5C_t *            cache_ptr;
+    H5C_t             *cache_ptr;
     struct H5AC_aux_t *aux_ptr;
 
     HDassert(thing);
@@ -2368,7 +2368,7 @@ flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t H5_ATT
 static void *
 load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata)
 {
-    const char *  fcn_name = "load_datum()";
+    const char   *fcn_name = "load_datum()";
     hbool_t       success  = TRUE;
     int           idx;
     struct datum *entry_ptr = NULL;
@@ -2574,7 +2574,7 @@ size_datum(H5F_t H5_ATTR_UNUSED *f, void *thing, size_t *size_ptr)
 static void
 expunge_entry(H5F_t *file_ptr, int32_t idx)
 {
-    const char *  fcn_name = "expunge_entry()";
+    const char   *fcn_name = "expunge_entry()";
     hbool_t       in_cache;
     herr_t        result;
     struct datum *entry_ptr;
@@ -2651,7 +2651,7 @@ expunge_entry(H5F_t *file_ptr, int32_t idx)
 static void
 insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags)
 {
-    const char *  fcn_name = "insert_entry()";
+    const char   *fcn_name = "insert_entry()";
     hbool_t       insert_pinned;
     herr_t        result;
     struct datum *entry_ptr;
@@ -3026,8 +3026,8 @@ lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx)
 static void
 lock_entry(H5F_t *file_ptr, int32_t idx)
 {
-    const char *       fcn_name = "lock_entry()";
-    struct datum *     entry_ptr;
+    const char        *fcn_name = "lock_entry()";
+    struct datum      *entry_ptr;
     H5C_cache_entry_t *cache_entry_ptr;
 
     if (nerrors == 0) {
@@ -3080,7 +3080,7 @@ lock_entry(H5F_t *file_ptr, int32_t idx)
 static void
 mark_entry_dirty(int32_t idx)
 {
-    const char *  fcn_name = "mark_entry_dirty()";
+    const char   *fcn_name = "mark_entry_dirty()";
     herr_t        result;
     struct datum *entry_ptr;
 
@@ -3195,7 +3195,7 @@ pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty)
 static void
 pin_protected_entry(int32_t idx, hbool_t global)
 {
-    const char *  fcn_name = "pin_protected_entry()";
+    const char   *fcn_name = "pin_protected_entry()";
     herr_t        result;
     struct datum *entry_ptr;
 
@@ -3261,7 +3261,7 @@ pin_protected_entry(int32_t idx, hbool_t global)
 static void
 move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx)
 {
-    const char *  fcn_name = "move_entry()";
+    const char   *fcn_name = "move_entry()";
     herr_t        result;
     int           tmp;
     size_t        tmp_len;
@@ -3378,7 +3378,7 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx)
 static hbool_t
 reset_server_counts(void)
 {
-    const char *  fcn_name = "reset_server_counts()";
+    const char   *fcn_name = "reset_server_counts()";
     hbool_t       success  = TRUE; /* will set to FALSE if appropriate. */
     struct mssg_t mssg;
 
@@ -3450,7 +3450,7 @@ reset_server_counts(void)
 static void
 resize_entry(int32_t idx, size_t new_size)
 {
-    const char *  fcn_name = "resize_entry()";
+    const char   *fcn_name = "resize_entry()";
     herr_t        result;
     struct datum *entry_ptr;
 
@@ -3519,14 +3519,14 @@ resize_entry(int32_t idx, size_t new_size)
 static hbool_t
 setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, int metadata_write_strategy)
 {
-    const char *        fcn_name       = "setup_cache_for_test()";
+    const char         *fcn_name       = "setup_cache_for_test()";
     hbool_t             success        = FALSE; /* will set to TRUE if appropriate. */
     hbool_t             enable_rpt_fcn = FALSE;
     hid_t               fid            = -1;
     H5AC_cache_config_t config;
     H5AC_cache_config_t test_config;
-    H5F_t *             file_ptr  = NULL;
-    H5C_t *             cache_ptr = NULL;
+    H5F_t              *file_ptr  = NULL;
+    H5C_t              *cache_ptr = NULL;
 
     HDassert(fid_ptr != NULL);
     HDassert(file_ptr_ptr != NULL);
@@ -3723,7 +3723,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 static void
 verify_writes(int num_writes, haddr_t *written_entries_tbl)
 {
-    const char *  fcn_name = "verify_writes()";
+    const char   *fcn_name = "verify_writes()";
     const hbool_t report   = FALSE;
     hbool_t       proceed  = TRUE;
     int           i        = 0;
@@ -3832,7 +3832,7 @@ verify_writes(int num_writes, haddr_t *written_entries_tbl)
 static void
 setup_rand(void)
 {
-    const char *   fcn_name             = "setup_rand()";
+    const char    *fcn_name             = "setup_rand()";
     hbool_t        use_predefined_seeds = FALSE;
     int            num_predefined_seeds = 3;
     unsigned       predefined_seeds[3]  = {33402, 33505, 33422};
@@ -3948,7 +3948,7 @@ take_down_cache(hid_t fid)
 static hbool_t
 verify_entry_reads(haddr_t addr, int expected_entry_reads)
 {
-    const char *  fcn_name = "verify_entry_reads()";
+    const char   *fcn_name = "verify_entry_reads()";
     hbool_t       success  = TRUE;
     int           reported_entry_reads;
     struct mssg_t mssg;
@@ -4046,7 +4046,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads)
 static hbool_t
 verify_entry_writes(haddr_t addr, int expected_entry_writes)
 {
-    const char *  fcn_name = "verify_entry_writes()";
+    const char   *fcn_name = "verify_entry_writes()";
     hbool_t       success  = TRUE;
     int           reported_entry_writes;
     struct mssg_t mssg;
@@ -4143,7 +4143,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes)
 static hbool_t
 verify_total_reads(int expected_total_reads)
 {
-    const char *  fcn_name = "verify_total_reads()";
+    const char   *fcn_name = "verify_total_reads()";
     hbool_t       success  = TRUE; /* will set to FALSE if appropriate. */
     long          reported_total_reads;
     struct mssg_t mssg;
@@ -4236,7 +4236,7 @@ verify_total_reads(int expected_total_reads)
 static hbool_t
 verify_total_writes(int expected_total_writes)
 {
-    const char *  fcn_name = "verify_total_writes()";
+    const char   *fcn_name = "verify_total_writes()";
     hbool_t       success  = TRUE; /* will set to FALSE if appropriate. */
     long          reported_total_writes;
     struct mssg_t mssg;
@@ -4329,7 +4329,7 @@ verify_total_writes(int expected_total_writes)
 void
 unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags)
 {
-    const char *  fcn_name = "unlock_entry()";
+    const char   *fcn_name = "unlock_entry()";
     herr_t        dirtied;
     herr_t        result;
     struct datum *entry_ptr;
@@ -4405,7 +4405,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags)
 static void
 unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t via_unprotect)
 {
-    const char *  fcn_name = "unpin_entry()";
+    const char   *fcn_name = "unpin_entry()";
     herr_t        result;
     unsigned int  flags = H5AC__UNPIN_ENTRY_FLAG;
     struct datum *entry_ptr;
@@ -4488,7 +4488,7 @@ unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t
 static hbool_t
 server_smoke_check(void)
 {
-    const char *  fcn_name = "server_smoke_check()";
+    const char   *fcn_name = "server_smoke_check()";
     hbool_t       success  = TRUE;
     int           max_nerrors;
     struct mssg_t mssg;
@@ -4816,13 +4816,13 @@ server_smoke_check(void)
 static hbool_t
 smoke_check_1(int metadata_write_strategy)
 {
-    const char *  fcn_name = "smoke_check_1()";
+    const char   *fcn_name = "smoke_check_1()";
     hbool_t       success  = TRUE;
     int           i;
     int           max_nerrors;
     hid_t         fid       = -1;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     struct mssg_t mssg;
 
     switch (metadata_write_strategy) {
@@ -4981,13 +4981,13 @@ smoke_check_1(int metadata_write_strategy)
 static hbool_t
 smoke_check_2(int metadata_write_strategy)
 {
-    const char *  fcn_name = "smoke_check_2()";
+    const char   *fcn_name = "smoke_check_2()";
     hbool_t       success  = TRUE;
     int           i;
     int           max_nerrors;
     hid_t         fid       = -1;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     struct mssg_t mssg;
 
     switch (metadata_write_strategy) {
@@ -5183,7 +5183,7 @@ smoke_check_2(int metadata_write_strategy)
 static hbool_t
 smoke_check_3(int metadata_write_strategy)
 {
-    const char *  fcn_name = "smoke_check_3()";
+    const char   *fcn_name = "smoke_check_3()";
     hbool_t       success  = TRUE;
     int           cp       = 0;
     int           i;
@@ -5193,8 +5193,8 @@ smoke_check_3(int metadata_write_strategy)
     int           min_idx;
     int           max_idx;
     hid_t         fid       = -1;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     struct mssg_t mssg;
 
     switch (metadata_write_strategy) {
@@ -5545,7 +5545,7 @@ smoke_check_3(int metadata_write_strategy)
 static hbool_t
 smoke_check_4(int metadata_write_strategy)
 {
-    const char *  fcn_name = "smoke_check_4()";
+    const char   *fcn_name = "smoke_check_4()";
     hbool_t       success  = TRUE;
     int           i;
     int           max_nerrors;
@@ -5554,8 +5554,8 @@ smoke_check_4(int metadata_write_strategy)
     int           min_idx;
     int           max_idx;
     hid_t         fid       = -1;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     struct mssg_t mssg;
 
     switch (metadata_write_strategy) {
@@ -5825,14 +5825,14 @@ smoke_check_4(int metadata_write_strategy)
 static hbool_t
 smoke_check_5(int metadata_write_strategy)
 {
-    const char *  fcn_name = "smoke_check_5()";
+    const char   *fcn_name = "smoke_check_5()";
     hbool_t       success  = TRUE;
     int           cp       = 0;
     int           i;
     int           max_nerrors;
     hid_t         fid       = -1;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     struct mssg_t mssg;
 
     switch (metadata_write_strategy) {
@@ -6113,8 +6113,8 @@ trace_file_check(int metadata_write_strategy)
     const char *expected_output_0[]    = {
         "### HDF5 metadata cache trace file version 1 ###\n",
         "H5AC_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 2097152 0.300000 33554432 "
-        "1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 "
-        "0.100000 262144 0 0\n",
+           "1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 "
+           "0.100000 262144 0 0\n",
         "H5AC_insert_entry 0x200 25 0x0 2 0\n",
         "H5AC_insert_entry 0x202 25 0x0 2 0\n",
         "H5AC_insert_entry 0x204 25 0x0 4 0\n",
@@ -6174,9 +6174,9 @@ trace_file_check(int metadata_write_strategy)
     int                 expected_line_len;
     int                 actual_line_len;
     hid_t               fid            = -1;
-    H5F_t *             file_ptr       = NULL;
-    H5C_t *             cache_ptr      = NULL;
-    FILE *              trace_file_ptr = NULL;
+    H5F_t              *file_ptr       = NULL;
+    H5C_t              *cache_ptr      = NULL;
+    FILE               *trace_file_ptr = NULL;
     H5AC_cache_config_t config;
     struct mssg_t       mssg;
 
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index fc117e3..a324b6b 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -591,8 +591,8 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap
     hid_t acc_plist, xfer_plist, crp_plist;
 
     hsize_t dims[RANK], chunk_dims[RANK];
-    int *   data_array1  = NULL;
-    int *   data_origin1 = NULL;
+    int    *data_array1  = NULL;
+    int    *data_origin1 = NULL;
 
     hsize_t start[RANK], count[RANK], stride[RANK], block[RANK];
 
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 199b2b8..36a2351 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -281,7 +281,7 @@ dataset_writeInd(void)
     hid_t       mem_dataspace;      /* memory dataspace ID */
     hid_t       dataset1, dataset2; /* Dataset ID */
     hsize_t     dims[RANK];         /* dataset dim sizes */
-    DATATYPE *  data_array1 = NULL; /* data buffer */
+    DATATYPE   *data_array1 = NULL; /* data buffer */
     const char *filename;
 
     hsize_t start[RANK];               /* for hyperslab setting */
@@ -418,8 +418,8 @@ dataset_readInd(void)
     hid_t       file_dataspace;      /* File dataspace ID */
     hid_t       mem_dataspace;       /* memory dataspace ID */
     hid_t       dataset1, dataset2;  /* Dataset ID */
-    DATATYPE *  data_array1  = NULL; /* data buffer */
-    DATATYPE *  data_origin1 = NULL; /* expected data buffer */
+    DATATYPE   *data_array1  = NULL; /* data buffer */
+    DATATYPE   *data_origin1 = NULL; /* expected data buffer */
     const char *filename;
 
     hsize_t start[RANK];               /* for hyperslab setting */
@@ -545,7 +545,7 @@ dataset_writeAll(void)
     hid_t       dataset5, dataset6, dataset7;           /* Dataset ID */
     hid_t       datatype;                               /* Datatype ID */
     hsize_t     dims[RANK];                             /* dataset dim sizes */
-    DATATYPE *  data_array1 = NULL;                     /* data buffer */
+    DATATYPE   *data_array1 = NULL;                     /* data buffer */
     const char *filename;
 
     hsize_t start[RANK];               /* for hyperslab setting */
@@ -1061,8 +1061,8 @@ dataset_readAll(void)
     hid_t       file_dataspace;                                   /* File dataspace ID */
     hid_t       mem_dataspace;                                    /* memory dataspace ID */
     hid_t       dataset1, dataset2, dataset5, dataset6, dataset7; /* Dataset ID */
-    DATATYPE *  data_array1  = NULL;                              /* data buffer */
-    DATATYPE *  data_origin1 = NULL;                              /* expected data buffer */
+    DATATYPE   *data_array1  = NULL;                              /* data buffer */
+    DATATYPE   *data_origin1 = NULL;                              /* expected data buffer */
     const char *filename;
 
     hsize_t start[RANK];               /* for hyperslab setting */
@@ -1420,7 +1420,7 @@ dataset_readAll(void)
     start[0] = dim0 / mpi_size * mpi_rank;
     start[1] = 0;
     ret      = dataset_vrfy(start, count, stride, block, data_array1 + (dim0 / mpi_size * dim1 * mpi_rank),
-                       data_origin1);
+                            data_origin1);
     if (ret)
         nerrors++;
 
@@ -1479,7 +1479,7 @@ extend_writeInd(void)
     const char *filename;
     hsize_t     dims[RANK];                                      /* dataset dim sizes */
     hsize_t     max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */
-    DATATYPE *  data_array1    = NULL;                           /* data buffer */
+    DATATYPE   *data_array1    = NULL;                           /* data buffer */
     hsize_t     chunk_dims[RANK];                                /* chunk sizes */
     hid_t       dataset_pl;                                      /* dataset create prop. list */
 
@@ -1857,9 +1857,9 @@ extend_readInd(void)
     hid_t       mem_dataspace;       /* memory dataspace ID */
     hid_t       dataset1, dataset2;  /* Dataset ID */
     hsize_t     dims[RANK];          /* dataset dim sizes */
-    DATATYPE *  data_array1  = NULL; /* data buffer */
-    DATATYPE *  data_array2  = NULL; /* data buffer */
-    DATATYPE *  data_origin1 = NULL; /* expected data buffer */
+    DATATYPE   *data_array1  = NULL; /* data buffer */
+    DATATYPE   *data_array2  = NULL; /* data buffer */
+    DATATYPE   *data_origin1 = NULL; /* expected data buffer */
     const char *filename;
 
     hsize_t start[RANK];               /* for hyperslab setting */
@@ -2039,7 +2039,7 @@ extend_writeAll(void)
     const char *filename;
     hsize_t     dims[RANK];                                      /* dataset dim sizes */
     hsize_t     max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */
-    DATATYPE *  data_array1    = NULL;                           /* data buffer */
+    DATATYPE   *data_array1    = NULL;                           /* data buffer */
     hsize_t     chunk_dims[RANK];                                /* chunk sizes */
     hid_t       dataset_pl;                                      /* dataset create prop. list */
 
@@ -2278,9 +2278,9 @@ extend_readAll(void)
     hid_t       dataset1, dataset2; /* Dataset ID */
     const char *filename;
     hsize_t     dims[RANK];          /* dataset dim sizes */
-    DATATYPE *  data_array1  = NULL; /* data buffer */
-    DATATYPE *  data_array2  = NULL; /* data buffer */
-    DATATYPE *  data_origin1 = NULL; /* expected data buffer */
+    DATATYPE   *data_array1  = NULL; /* data buffer */
+    DATATYPE   *data_array2  = NULL; /* data buffer */
+    DATATYPE   *data_origin1 = NULL; /* expected data buffer */
 
     hsize_t start[RANK];               /* for hyperslab setting */
     hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */
@@ -2473,8 +2473,8 @@ compress_readAll(void)
     int         rank = 1;         /* Dataspace rank */
     hsize_t     dim  = dim0;      /* Dataspace dimensions */
     unsigned    u;                /* Local index variable */
-    DATATYPE *  data_read = NULL; /* data buffer */
-    DATATYPE *  data_orig = NULL; /* expected data buffer */
+    DATATYPE   *data_read = NULL; /* data buffer */
+    DATATYPE   *data_orig = NULL; /* expected data buffer */
     const char *filename;
     MPI_Comm    comm = MPI_COMM_WORLD;
     MPI_Info    info = MPI_INFO_NULL;
@@ -2644,8 +2644,8 @@ none_selection_chunk(void)
     hid_t       dataset1, dataset2; /* Dataset ID */
     const char *filename;
     hsize_t     dims[RANK];         /* dataset dim sizes */
-    DATATYPE *  data_origin = NULL; /* data buffer */
-    DATATYPE *  data_array  = NULL; /* data buffer */
+    DATATYPE   *data_origin = NULL; /* data buffer */
+    DATATYPE   *data_array  = NULL; /* data buffer */
     hsize_t     chunk_dims[RANK];   /* chunk sizes */
     hid_t       dataset_pl;         /* dataset create prop. list */
 
@@ -2902,8 +2902,8 @@ test_actual_io_mode(int selection_mode)
     H5D_mpio_actual_io_mode_t        actual_io_mode_write           = -1;
     H5D_mpio_actual_io_mode_t        actual_io_mode_read            = -1;
     H5D_mpio_actual_io_mode_t        actual_io_mode_expected        = -1;
-    const char *                     filename;
-    const char *                     test_name;
+    const char                      *filename;
+    const char                      *test_name;
     hbool_t                          direct_multi_chunk_io;
     hbool_t                          multi_chunk_io;
     hbool_t                          is_chunked;
@@ -2911,7 +2911,7 @@ test_actual_io_mode(int selection_mode)
     int                              mpi_size = -1;
     int                              mpi_rank = -1;
     int                              length;
-    int *                            buffer;
+    int                             *buffer;
     int                              i;
     MPI_Comm                         mpi_comm   = MPI_COMM_NULL;
     MPI_Info                         mpi_info   = MPI_INFO_NULL;
@@ -3431,7 +3431,7 @@ test_no_collective_cause_mode(int selection_mode)
     int         mpi_size       = -1;
     int         mpi_rank       = -1;
     int         length;
-    int *       buffer;
+    int        *buffer;
     int         i;
     MPI_Comm    mpi_comm;
     MPI_Info    mpi_info;
@@ -3750,7 +3750,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     int         mpi_size   = -1;
     int         mpi_rank   = -1;
     int         length;
-    int *       buffer;
+    int        *buffer;
     int         i;
     MPI_Comm    mpi_comm   = MPI_COMM_NULL;
     MPI_Info    mpi_info   = MPI_INFO_NULL;
@@ -4006,8 +4006,8 @@ dataset_atomicity(void)
     hid_t       sid;              /* Dataspace ID */
     hid_t       dataset1;         /* Dataset IDs */
     hsize_t     dims[RANK];       /* dataset dim sizes */
-    int *       write_buf = NULL; /* data buffer */
-    int *       read_buf  = NULL; /* data buffer */
+    int        *write_buf = NULL; /* data buffer */
+    int        *read_buf  = NULL; /* data buffer */
     int         buf_size;
     hid_t       dataset2;
     hid_t       file_dataspace; /* File dataspace ID */
diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c
index a8251de..039576f 100644
--- a/testpar/t_file_image.c
+++ b/testpar/t_file_image.c
@@ -67,7 +67,7 @@ file_image_daisy_chain_test(void)
     int        i;
     int        space_ndims;
     MPI_Status rcvstat;
-    int *      vector_ptr = NULL;
+    int       *vector_ptr = NULL;
     hid_t      fapl_id    = -1;
     hid_t      file_id; /* file IDs */
     hid_t      dset_id      = -1;
@@ -75,7 +75,7 @@ file_image_daisy_chain_test(void)
     hid_t      space_id     = -1;
     herr_t     err;
     hsize_t    dims[1];
-    void *     image_ptr = NULL;
+    void      *image_ptr = NULL;
     ssize_t    bytes_read;
     ssize_t    image_len;
     hbool_t    vector_ok = TRUE;
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index ad25f1b..b179cce 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -60,8 +60,8 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size)
     size_t  i, j;          /* Local index variables */
     char    name[32] = "dataset";
     herr_t  hrc;           /* Error status */
-    int *   points = NULL; /* Writing buffer for entire dataset */
-    int *   check  = NULL; /* Reading buffer for selected hyperslab */
+    int    *points = NULL; /* Writing buffer for entire dataset */
+    int    *check  = NULL; /* Reading buffer for selected hyperslab */
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -205,7 +205,7 @@ test_filter_read(void)
     const hsize_t chunk_size[2] = {CHUNK_DIM1, CHUNK_DIM2}; /* Chunk dimensions */
     hsize_t       null_size;                                /* Size of dataset without filters */
     herr_t        hrc;
-    const char *  filename;
+    const char   *filename;
     hsize_t       fletcher32_size; /* Size of dataset with Fletcher32 checksum */
 
 #ifdef H5_HAVE_FILTER_DEFLATE
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 6e0e64e..ac6df1b 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -144,12 +144,12 @@ multiple_dset_write(void)
     hsize_t                chunk_origin[DIM];
     hsize_t                chunk_dims[DIM], file_dims[DIM];
     hsize_t                count[DIM] = {1, 1};
-    double *               outme      = NULL;
+    double                *outme      = NULL;
     double                 fill       = 1.0; /* Fill value */
     char                   dname[100];
     herr_t                 ret;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
     int                    ndatasets;
 
     pt        = GetTestParameters();
@@ -229,8 +229,8 @@ compact_dataset(void)
     int         i, j, mpi_size, mpi_rank, size, err_num = 0;
     hid_t       iof, plist, dcpl, dxpl, dataset, filespace;
     hsize_t     file_dims[DIM];
-    double *    outme;
-    double *    inme;
+    double     *outme;
+    double     *inme;
     char        dname[] = "dataset";
     herr_t      ret;
     const char *filename;
@@ -601,8 +601,8 @@ dataset_fillvalue(void)
     hsize_t     req_start[4] = {0, 0, 0, 0};
     hsize_t     req_count[4] = {1, 6, 7, 8};
     hsize_t     dset_size;       /* Dataset size */
-    int *       rdata, *wdata;   /* Buffers for data to read and write */
-    int *       twdata, *trdata; /* Temporary pointer into buffer */
+    int        *rdata, *wdata;   /* Buffers for data to read and write */
+    int        *twdata, *trdata; /* Temporary pointer into buffer */
     int         acc, i, j, k, l; /* Local index variables */
     herr_t      ret;             /* Generic return value */
     const char *filename;
@@ -795,13 +795,13 @@ collective_group_write(void)
     int                    i, j, m;
     char                   gname[64], dname[32];
     hid_t                  fid, gid, did, plist, dcpl, memspace, filespace;
-    DATATYPE *             outme = NULL;
+    DATATYPE              *outme = NULL;
     hsize_t                chunk_origin[DIM];
     hsize_t                chunk_dims[DIM], file_dims[DIM], count[DIM];
     hsize_t                chunk_size[2]; /* Chunk dimensions - computed shortly */
     herr_t                 ret1, ret2;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
     int                    ngroups;
 
     pt       = GetTestParameters();
@@ -887,7 +887,7 @@ independent_group_read(void)
     int                    mpi_rank, m;
     hid_t                  plist, fid;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
     int                    ngroups;
 
     pt       = GetTestParameters();
@@ -1016,7 +1016,7 @@ multiple_group_write(void)
     hsize_t                chunk_dims[DIM], file_dims[DIM], count[DIM];
     herr_t                 ret;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
     int                    ngroups;
 
     pt       = GetTestParameters();
@@ -1183,7 +1183,7 @@ multiple_group_read(void)
     hsize_t                chunk_origin[DIM];
     hsize_t                chunk_dims[DIM], file_dims[DIM], count[DIM];
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
     int                    ngroups;
 
     pt       = GetTestParameters();
@@ -1522,10 +1522,10 @@ io_mode_confusion(void)
      * test bed related variables
      */
 
-    const char *           fcn_name = "io_mode_confusion";
+    const char            *fcn_name = "io_mode_confusion";
     const hbool_t          verbose  = FALSE;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
 
     pt       = GetTestParameters();
     filename = pt->name;
@@ -1776,7 +1776,7 @@ rr_obj_hdr_flush_confusion(void)
     MPI_Comm comm;
 
     /* test bed related variables */
-    const char *  fcn_name = "rr_obj_hdr_flush_confusion";
+    const char   *fcn_name = "rr_obj_hdr_flush_confusion";
     const hbool_t verbose  = FALSE;
 
     /* Create two new private communicators from MPI_COMM_WORLD.
@@ -1853,10 +1853,10 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
     int steps_done = 0;
 
     /* test bed related variables */
-    const char *           fcn_name = "rr_obj_hdr_flush_confusion_writer";
+    const char            *fcn_name = "rr_obj_hdr_flush_confusion_writer";
     const hbool_t          verbose  = FALSE;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
 
     /*
      * setup test bed related variables:
@@ -2226,10 +2226,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
     int steps_done = -1; /* How far (steps) have been verified */
 
     /* test bed related variables */
-    const char *           fcn_name = "rr_obj_hdr_flush_confusion_reader";
+    const char            *fcn_name = "rr_obj_hdr_flush_confusion_reader";
     const hbool_t          verbose  = FALSE;
     const H5Ptest_param_t *pt;
-    char *                 filename;
+    char                  *filename;
 
     /*
      * setup test bed related variables:
@@ -2558,7 +2558,7 @@ chunk_align_bug_1(void)
     h5_stat_size_t file_size;
     hsize_t        align;
     herr_t         ret;
-    const char *   filename;
+    const char    *filename;
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index a883f55..7e8ac3a 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -189,7 +189,7 @@ test_mpio_gb_file(char *filename)
     int        writerrs; /* write errors */
     int        nerrs;
     int        ntimes; /* how many times */
-    char *     buf = NULL;
+    char      *buf = NULL;
     char       expected;
     MPI_Offset size;
     MPI_Offset mpi_off;
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index 2a80f4a..4b0a912 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -117,7 +117,7 @@ main(int argc, char *argv[])
     hid_t       fid1    = H5I_INVALID_HID;
     hid_t       fid2    = H5I_INVALID_HID;
     hid_t       fapl_id = H5I_INVALID_HID;
-    MPI_File *  mpifh_p = NULL;
+    MPI_File   *mpifh_p = NULL;
     char        name[1024];
     const char *envval = NULL;
     int         mpi_size;
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 54c3a7f..9aa09a4 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -85,10 +85,10 @@ struct hs_dr_pio_test_vars_t {
     hsize_t   stride[PAR_SS_DR_MAX_RANK];
     hsize_t   count[PAR_SS_DR_MAX_RANK];
     hsize_t   block[PAR_SS_DR_MAX_RANK];
-    hsize_t * start_ptr;
-    hsize_t * stride_ptr;
-    hsize_t * count_ptr;
-    hsize_t * block_ptr;
+    hsize_t  *start_ptr;
+    hsize_t  *stride_ptr;
+    hsize_t  *count_ptr;
+    hsize_t  *block_ptr;
     int       skips;
     int       max_skips;
     int64_t   total_tests;
@@ -126,8 +126,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
     int         mrc;
     int         mpi_rank; /* needed by the VRFY macro */
     uint32_t    expected_value;
-    uint32_t *  ptr_0;
-    uint32_t *  ptr_1;
+    uint32_t   *ptr_0;
+    uint32_t   *ptr_1;
     hid_t       acc_tpl; /* File access templates */
     hid_t       small_ds_dcpl_id = H5P_DEFAULT;
     hid_t       large_ds_dcpl_id = H5P_DEFAULT;
@@ -846,12 +846,13 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* verify that expected data is retrieved */
 
-                    mis_match      = FALSE;
-                    ptr_1          = tv_ptr->small_ds_slice_buf;
-                    expected_value = (uint32_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    mis_match = FALSE;
+                    ptr_1     = tv_ptr->small_ds_slice_buf;
+                    expected_value =
+                        (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                    tv_ptr->edge_size) +
+                                   (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                   (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
 
                     for (n = 0; n < tv_ptr->small_ds_slice_size; n++) {
 
@@ -1078,10 +1079,11 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      */
                     ptr_1          = tv_ptr->large_ds_buf_1;
                     expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size);
-                    start_index    = (size_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    start_index =
+                        (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                  tv_ptr->edge_size) +
+                                 (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                 (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
                     stop_index = start_index + tv_ptr->small_ds_slice_size - 1;
 
                     HDassert(start_index < stop_index);
@@ -1351,10 +1353,11 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                     mis_match = FALSE;
                     ptr_1     = tv_ptr->small_ds_buf_1;
 
-                    expected_value = (uint32_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    expected_value =
+                        (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                    tv_ptr->edge_size) +
+                                   (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                   (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
 
                     start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size;
                     stop_index  = start_index + tv_ptr->small_ds_slice_size - 1;
@@ -1641,10 +1644,11 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     ptr_1          = tv_ptr->large_ds_buf_1;
                     expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size);
 
-                    start_index = (size_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    start_index =
+                        (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                  tv_ptr->edge_size) +
+                                 (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                 (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
                     stop_index = start_index + tv_ptr->small_ds_slice_size - 1;
 
                     HDassert(start_index < stop_index);
@@ -2551,7 +2555,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 {
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
     const char *fcnName = "ckrbrd_hs_dr_pio_test__d2m_l2s()";
-    uint32_t *  ptr_0;
+    uint32_t   *ptr_0;
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
     hbool_t  data_ok = FALSE;
     int      i, j, k, l;
@@ -2729,10 +2733,11 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* verify that expected data is retrieved */
 
-                    expected_value = (uint32_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    expected_value =
+                        (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                    tv_ptr->edge_size) +
+                                   (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                   (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
 
                     data_ok = ckrbrd_hs_dr_pio_test__verify_data(
                         tv_ptr->small_ds_slice_buf, tv_ptr->small_rank - 1, tv_ptr->edge_size,
@@ -2950,10 +2955,11 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     data_ok        = TRUE;
                     ptr_1          = tv_ptr->large_ds_buf_1;
                     expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size);
-                    start_index    = (size_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    start_index =
+                        (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                  tv_ptr->edge_size) +
+                                 (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                 (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
                     stop_index = start_index + tv_ptr->small_ds_slice_size - 1;
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG
@@ -3280,10 +3286,11 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     mis_match = FALSE;
 
-                    expected_value = (uint32_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    expected_value =
+                        (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                    tv_ptr->edge_size) +
+                                   (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                   (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
 
                     start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size;
                     stop_index  = start_index + tv_ptr->small_ds_slice_size - 1;
@@ -3578,10 +3585,11 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      */
                     expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size);
 
-                    start_index = (size_t)(
-                        (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
-                        (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
+                    start_index =
+                        (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size *
+                                  tv_ptr->edge_size) +
+                                 (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) +
+                                 (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size));
                     stop_index = start_index + tv_ptr->small_ds_slice_size - 1;
 
                     HDassert(start_index < stop_index);
@@ -3975,7 +3983,7 @@ int facc_type       = FACC_MPIO; /*Test file access type */
 int dxfer_coll_type = DXFER_COLLECTIVE_IO;
 
 H5E_auto2_t old_func;        /* previous error handler */
-void *      old_client_data; /* previous error handler arg.*/
+void       *old_client_data; /* previous error handler arg.*/
 
 /* other option flags */
 
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 5530584..c417d93 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -1461,12 +1461,12 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     size_t      large_ds_size;
     size_t      large_ds_slice_size;
     uint32_t    expected_value;
-    uint32_t *  small_ds_buf_0 = NULL;
-    uint32_t *  small_ds_buf_1 = NULL;
-    uint32_t *  large_ds_buf_0 = NULL;
-    uint32_t *  large_ds_buf_1 = NULL;
-    uint32_t *  ptr_0;
-    uint32_t *  ptr_1;
+    uint32_t   *small_ds_buf_0 = NULL;
+    uint32_t   *small_ds_buf_1 = NULL;
+    uint32_t   *large_ds_buf_0 = NULL;
+    uint32_t   *large_ds_buf_1 = NULL;
+    uint32_t   *ptr_0;
+    uint32_t   *ptr_1;
     hsize_t     small_chunk_dims[LDSCT_DS_RANK];
     hsize_t     large_chunk_dims[LDSCT_DS_RANK];
     hsize_t     small_dims[LDSCT_DS_RANK];
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 653e112..2b840be 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -34,7 +34,7 @@ int facc_type       = FACC_MPIO; /*Test file access type */
 int dxfer_coll_type = DXFER_COLLECTIVE_IO;
 
 H5E_auto2_t old_func;        /* previous error handler */
-void *      old_client_data; /* previous error handler arg.*/
+void       *old_client_data; /* previous error handler arg.*/
 
 /* other option flags */
 
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 53234a5..790bdb1 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -229,7 +229,7 @@ extern int         dim0, dim1;           /*Dataset dimensions */
 extern int         chunkdim0, chunkdim1; /*Chunk dimensions */
 extern int         nerrors;              /*errors count */
 extern H5E_auto2_t old_func;             /* previous error handler */
-extern void *      old_client_data;      /*previous error handler arg.*/
+extern void       *old_client_data;      /*previous error handler arg.*/
 extern int         facc_type;            /*Test file access type */
 extern int         dxfer_coll_type;