Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

23 files changed, 101 insertions, 101 deletions

diff --git a/tools/test/h5copy/dynlib_copy.c b/tools/test/h5copy/dynlib_copy.c
index b954a22..f474a55 100644
--- a/tools/test/h5copy/dynlib_copy.c
+++ b/tools/test/h5copy/dynlib_copy.c
@@ -62,7 +62,7 @@ static size_t
 H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                     size_t *buf_size, void **buf)
 {
-    char * int_ptr  = (char *)*buf; /* Pointer to the data values */
+    char  *int_ptr  = (char *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;    /* Amount of data buffer left to process */
 
     /* Check for the correct number of parameters */
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index e415c97..03d42ed 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -281,7 +281,7 @@ gent_nested_vl(hid_t loc_id)
     hid_t   sid, did, tid1, tid2;
     hsize_t dims[1] = {2};
     hvl_t   buf[2];
-    hvl_t * tvl;
+    hvl_t  *tvl;
 
     /* allocate and initialize VL dataset to write */
     buf[0].len         = 1;
diff --git a/tools/test/h5diff/dynlib_diff.c b/tools/test/h5diff/dynlib_diff.c
index 433522d..9d277e0 100644
--- a/tools/test/h5diff/dynlib_diff.c
+++ b/tools/test/h5diff/dynlib_diff.c
@@ -62,7 +62,7 @@ static size_t
 H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                     size_t *buf_size, void **buf)
 {
-    char * int_ptr  = (char *)*buf; /* Pointer to the data values */
+    char  *int_ptr  = (char *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;    /* Amount of data buffer left to process */
 
     /* Check for the correct number of parameters */
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 66d9f42..f388568 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -3429,8 +3429,8 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
 
     /* compound1 datatype */
     typedef struct comp1_t {
-        char *      str_vlen;                                                    /* vlen string */
-        char *      str_vlen_repeat;                                             /* vlen string */
+        char       *str_vlen;                                                    /* vlen string */
+        char       *str_vlen_repeat;                                             /* vlen string */
         char        str_fixlen[FIXLEN_STR_SIZE];                                 /* fixed len string */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE];                          /* fixed len string */
         const char *str_array_vlen[VLEN_STR_ARRY_DIM];                           /* vlen string array */
@@ -3441,9 +3441,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
 
     /* compound2 datatype */
     typedef struct comp2_t {
-        char *      str_vlen;                                                    /* vlen string */
+        char       *str_vlen;                                                    /* vlen string */
         char        str_fixlen[FIXLEN_STR_SIZE];                                 /* fixed len string */
-        char *      str_vlen_repeat;                                             /* vlen string */
+        char       *str_vlen_repeat;                                             /* vlen string */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE];                          /* fixed len string */
         const char *str_array_vlen[VLEN_STR_ARRY_DIM];                           /* vlen string array */
         char        str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
@@ -3466,9 +3466,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     /* compound4 datatype */
     typedef struct comp4_t {
         char        str_fixlen[FIXLEN_STR_SIZE];                                 /* fixed len string */
-        char *      str_vlen;                                                    /* vlen string */
+        char       *str_vlen;                                                    /* vlen string */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE];                          /* fixed len string */
-        char *      str_vlen_repeat;                                             /* vlen string */
+        char       *str_vlen_repeat;                                             /* vlen string */
         char        str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
         const char *str_array_vlen[VLEN_STR_ARRY_DIM];                           /* vlen string array */
         char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
@@ -3507,8 +3507,8 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
         const char *str_vlen_array_again[VLEN_STR_ARRY_DIM];                    /* vlen string array */
         char        str_fixlen[FIXLEN_STR_SIZE];                                /* fixed len string */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE];                         /* fixed len string */
-        char *      str_vlen;                                                   /* vlen string */
-        char *      str_vlen_repeat;                                            /* vlen string */
+        char       *str_vlen;                                                   /* vlen string */
+        char       *str_vlen_repeat;                                            /* vlen string */
     } comp7_t;
 
     /* compound8 datatype */
@@ -3518,9 +3518,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
         char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
         const char *str_vlen_array_again[VLEN_STR_ARRY_DIM];                     /* vlen string array */
         char        str_fixlen[FIXLEN_STR_SIZE];                                 /* fixed len string */
-        char *      str_vlen;                                                    /* vlen string */
+        char       *str_vlen;                                                    /* vlen string */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE];                          /* fixed len string */
-        char *      str_vlen_repeat;                                             /* vlen string */
+        char       *str_vlen_repeat;                                             /* vlen string */
     } comp8_t;
 
     /* compound9 datatype */
@@ -3534,9 +3534,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
         hobj_ref_t  objref1;                            /* reference */
         char        str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
         hobj_ref_t  objref2;                            /* reference */
-        char *      str_vlen;                           /* vlen string */
+        char       *str_vlen;                           /* vlen string */
         int         int_data2;
-        char *      str_vlen_repeat; /* vlen string */
+        char       *str_vlen_repeat; /* vlen string */
         hobj_ref_t  objref3;         /* reference */
         int         int_data3;
     } comp9_t;
@@ -4732,15 +4732,15 @@ test_data_nocomparables(const char *fname, int make_diffs)
     int     rank_attr;
     char    data1_str[DIM_ARRY][STR_SIZE] = {"ab", "cd", "ef"};
     herr_t  status                        = SUCCEED;
-    void *  dset_data_ptr1                = NULL;
-    void *  dset_data_ptr2                = NULL;
-    void *  dset_data_ptr3                = NULL;
-    void *  attr_data_ptr1                = NULL;
-    void *  attr_data_ptr2                = NULL;
-    void *  attr_data_ptr3                = NULL;
-    void *  attr_data_ptr4                = NULL;
-    void *  attr2_dim_ptr                 = NULL;
-    void *  attr3_dim_ptr                 = NULL;
+    void   *dset_data_ptr1                = NULL;
+    void   *dset_data_ptr2                = NULL;
+    void   *dset_data_ptr3                = NULL;
+    void   *attr_data_ptr1                = NULL;
+    void   *attr_data_ptr2                = NULL;
+    void   *attr_data_ptr3                = NULL;
+    void   *attr_data_ptr4                = NULL;
+    void   *attr2_dim_ptr                 = NULL;
+    void   *attr3_dim_ptr                 = NULL;
 
     /* init */
     tid_dset1      = H5Tcopy(H5T_NATIVE_INT);
@@ -5210,7 +5210,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 1D attributes with dimension [2], 2 elements */
     hsize_t    dims[1]           = {2};
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
-    char *     buf1a[2];                             /* VL string */
+    char      *buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
     s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
@@ -5224,7 +5224,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 2D attributes with dimension [3][2], 6 elements */
     hsize_t    dims2[2]              = {3, 2};
     char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *     buf12a[3][2];                                                       /* VL string */
+    char      *buf12a[3][2];                                                       /* VL string */
     char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
     s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
@@ -5240,7 +5240,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
                                      {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}},
                                      {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}},
                                      {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */
-    char *     buf13a[4][3][2];                                                         /* VL string */
+    char      *buf13a[4][3][2];                                                         /* VL string */
     char       buf23[4][3][2];                                                          /* bitfield, opaque */
     s_t        buf33[4][3][2];                                                          /* compound */
     hobj_ref_t buf43[4][3][2];                                                          /* reference */
@@ -6199,7 +6199,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 1D attributes with dimension [2], 2 elements */
     hsize_t    dims[1]           = {2};
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
-    char *     buf1a[2];                             /* VL string */
+    char      *buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
     s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
@@ -6213,7 +6213,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 2D attributes with dimension [3][2], 6 elements */
     hsize_t    dims2[2]              = {3, 2};
     char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *     buf12a[3][2];                                                       /* VL string */
+    char      *buf12a[3][2];                                                       /* VL string */
     char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
     s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
@@ -6229,7 +6229,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
                                      {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}},
                                      {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}},
                                      {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */
-    char *     buf13a[4][3][2];                                                         /* VL string */
+    char      *buf13a[4][3][2];                                                         /* VL string */
     char       buf23[4][3][2];                                                          /* bitfield, opaque */
     s_t        buf33[4][3][2];                                                          /* compound */
     hobj_ref_t buf43[4][3][2];                                                          /* reference */
@@ -7191,7 +7191,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 1D attributes with dimension [2], 2 elements */
     hsize_t    dims[1]           = {2};
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
-    char *     buf1a[2];                             /* VL string */
+    char      *buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
     s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
@@ -7205,7 +7205,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
     /* create 2D attributes with dimension [3][2], 6 elements */
     hsize_t    dims2[2]              = {3, 2};
     char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *     buf12a[3][2];                                                       /* VL string */
+    char      *buf12a[3][2];                                                       /* VL string */
     char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
     s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
@@ -7220,7 +7220,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
                                      {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}},
                                      {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}},
                                      {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */
-    char *     buf13a[4][3][2];                                                         /* VL string */
+    char      *buf13a[4][3][2];                                                         /* VL string */
     char       buf23[4][3][2];                                                          /* bitfield, opaque */
     s_t        buf33[4][3][2];                                                          /* compound */
     hobj_ref_t buf43[4][3][2];                                                          /* reference */
@@ -7807,12 +7807,12 @@ gen_datareg(hid_t fid, int make_diffs /* flag to modify data buffers */)
     hid_t   did1     = H5I_INVALID_HID; /* dataset ID   */
     hid_t   sid1     = H5I_INVALID_HID; /* dataspace ID  */
     hsize_t dims1[2] = {10, 10};        /* dimensions */
-    int *   buf;                        /* dataset buffer */
+    int    *buf;                        /* dataset buffer */
     /* reference dataset */
     hid_t                        did2    = H5I_INVALID_HID; /* dataset ID   */
     hid_t                        sid2    = H5I_INVALID_HID; /* dataspace ID  */
     hsize_t                      dims2[] = {2};             /* 2 references */
-    hdset_reg_ref_t *            rbuf;                      /* buffer for write the references  */
+    hdset_reg_ref_t             *rbuf;                      /* buffer for write the references  */
     hsize_t                      start[10];                 /* starting location of hyperslab */
     hsize_t                      count[10];                 /* element count of hyperslab */
     hsize_t                      coord[5][2];               /* coordinates for point selection */
@@ -7927,7 +7927,7 @@ test_hyperslab(const char *fname, int make_diffs /* flag to modify data buffers
     size_t  size;
     size_t  nelmts    = (size_t)GBLL / (1024 * 1024); /* elements in each hyperslab */
     char    fillvalue = -1;
-    char *  buf       = NULL;
+    char   *buf       = NULL;
     int     i, j, s;
     char    c;
 
diff --git a/tools/test/h5dump/binread.c b/tools/test/h5dump/binread.c
index 341a085..4e46c57 100644
--- a/tools/test/h5dump/binread.c
+++ b/tools/test/h5dump/binread.c
@@ -61,11 +61,11 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    FILE * stream;
+    FILE  *stream;
     size_t numread;
     TYPE   buf[NELMTS];
     size_t i, nelmts = NELMTS;
-    char * fname = NULL;
+    char  *fname = NULL;
 
     if (argc != 2) {
         usage();
diff --git a/tools/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c
index 433522d..9d277e0 100644
--- a/tools/test/h5dump/dynlib_dump.c
+++ b/tools/test/h5dump/dynlib_dump.c
@@ -62,7 +62,7 @@ static size_t
 H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                     size_t *buf_size, void **buf)
 {
-    char * int_ptr  = (char *)*buf; /* Pointer to the data values */
+    char  *int_ptr  = (char *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;    /* Amount of data buffer left to process */
 
     /* Check for the correct number of parameters */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 1c495a1..30e0c46 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -457,10 +457,10 @@ gent_dataset(void)
 {
     hid_t    fid, dataset, space;
     hsize_t  dims[2];
-    int **   dset1      = NULL;
-    int *    dset1_data = NULL;
+    int    **dset1      = NULL;
+    int     *dset1_data = NULL;
     double **dset2      = NULL;
-    double * dset2_data = NULL;
+    double  *dset2_data = NULL;
     int      i, j;
 
     /* Set up data arrays */
@@ -1798,7 +1798,7 @@ gent_str(void)
     } compound_t;
 
     compound_t **comp1      = NULL;
-    compound_t * comp1_data = NULL;
+    compound_t  *comp1_data = NULL;
     hsize_t      mdims[2];
 
     /* Set up data array */
@@ -2114,7 +2114,7 @@ gent_objref(void)
     hobj_ref_t *wbuf,                       /* buffer to write to disk */
         *rbuf,                              /* buffer read from disk */
         *tbuf;                              /* temp. buffer read from disk */
-    uint32_t *  tu32;                       /* Temporary pointer to uint32 data */
+    uint32_t   *tu32;                       /* Temporary pointer to uint32 data */
     int         i;                          /* counting variables */
     const char *write_comment     = "Foo!"; /* Comments for group */
     uint64_t    supports_comments = 0;
@@ -2352,9 +2352,9 @@ gent_attrreg(void)
     hsize_t          coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
     hdset_reg_ref_t *wbuf;                                /* buffer to write to disk */
     hdset_reg_ref_t *rbuf;                                /* buffer read from disk */
-    uint8_t *        dwbuf;                               /* Buffer for writing numeric data to disk */
-    uint8_t *        drbuf;                               /* Buffer for reading numeric data from disk */
-    uint8_t *        tu8;                                 /* Temporary pointer to uint8 data */
+    uint8_t         *dwbuf;                               /* Buffer for writing numeric data to disk */
+    uint8_t         *drbuf;                               /* Buffer for reading numeric data from disk */
+    uint8_t         *tu8;                                 /* Temporary pointer to uint8 data */
     int              i;                                   /* counting variables */
 
     /* Allocate write & read buffers */
@@ -2769,7 +2769,7 @@ static void
 gent_vldatatypes2(void)
 {
     hvl_t                        wdata[SPACE1_DIM1]; /* Information to write */
-    hvl_t *                      t1;                 /* Temporary pointer to VL information */
+    hvl_t                       *t1;                 /* Temporary pointer to VL information */
     hid_t                        fid1;               /* HDF5 File IDs  */
     hid_t                        dataset;            /* Dataset ID   */
     hid_t                        sid1;               /* Dataspace ID   */
@@ -3047,7 +3047,7 @@ gent_vldatatypes5(void)
 static void
 gent_array1_big(void)
 {
-    int *                        wdata;   /* Information to write */
+    int                         *wdata;   /* Information to write */
     hid_t                        fid1;    /* HDF5 File IDs  */
     hid_t                        dataset; /* Dataset ID   */
     hid_t                        sid1;    /* Dataspace ID   */
@@ -3567,7 +3567,7 @@ gent_array8(void)
     herr_t H5_ATTR_NDEBUG_UNUSED status   = -1;
     hsize_t                      sdims[]  = {F64_DIM0};
     hsize_t                      tdims[]  = {F64_DIM1};
-    int *                        wdata; /* Write buffer */
+    int                         *wdata; /* Write buffer */
     unsigned int                 i;
 
     /* Allocate data buffer */
@@ -3859,8 +3859,8 @@ gent_multi(void)
     H5FD_mem_t  mt, memb_map[H5FD_MEM_NTYPES];
     hid_t       memb_fapl[H5FD_MEM_NTYPES];
     const char *memb_name[H5FD_MEM_NTYPES];
-    char **     sv      = NULL;
-    char *      sv_data = NULL;
+    char      **sv      = NULL;
+    char       *sv_data = NULL;
     haddr_t     memb_addr[H5FD_MEM_NTYPES];
 
     sv_data = (char *)HDcalloc(H5FD_MEM_NTYPES * 1024, sizeof(char));
@@ -3990,10 +3990,10 @@ gent_char(void)
                         "men are created equal. Now we are engaged in a great "
                         "civil war, testing whether that nation or any nation "
                         "so conceived and so dedicated can long endure.";
-    hid_t   fid1;    /* HDF5 File IDs    */
-    hid_t   dataset; /* Dataset ID       */
-    hid_t   sid1;    /* Dataspace ID     */
-    hsize_t dims1[1];
+    hid_t       fid1;    /* HDF5 File IDs    */
+    hid_t       dataset; /* Dataset ID       */
+    hid_t       sid1;    /* Dataspace ID     */
+    hsize_t     dims1[1];
 
     dims1[0] = HDstrlen(wdata);
 
@@ -6258,7 +6258,7 @@ gent_longlinks(void)
     hid_t                       fid     = (-1); /* File ID */
     hid_t                       gid     = (-1); /* Group ID */
     hid_t H5_ATTR_NDEBUG_UNUSED gid2    = (-1); /* Datatype ID */
-    char *                      objname = NULL; /* Name of object [Long] */
+    char                       *objname = NULL; /* Name of object [Long] */
     size_t                      u;              /* Local index variable */
 
     /* Create files */
@@ -6480,7 +6480,7 @@ gent_bigdims(void)
     hsize_t                   hs_size[1]; /* hyperslab dimensions */
     size_t                    size;
     char                      fillvalue = 0;
-    char *                    buf       = NULL;
+    char                     *buf       = NULL;
     hsize_t                   i;
     char                      c;
     size_t                    nelmts;
@@ -10015,15 +10015,15 @@ gent_intsattrs(void)
         double arr[F66_XDIM][F66_YDIM8];
     } * dsetdbl;
 
-    uint8_t * asetu8  = NULL;
+    uint8_t  *asetu8  = NULL;
     uint16_t *asetu16 = NULL;
     uint32_t *asetu32 = NULL;
     uint64_t *asetu64 = NULL;
-    int8_t *  aset8   = NULL;
-    int16_t * aset16  = NULL;
-    int32_t * aset32  = NULL;
-    int64_t * aset64  = NULL;
-    double *  asetdbl = NULL;
+    int8_t   *aset8   = NULL;
+    int16_t  *aset16  = NULL;
+    int32_t  *aset32  = NULL;
+    int64_t  *aset64  = NULL;
+    double   *asetdbl = NULL;
 
     uint8_t  valu8bits;
     uint16_t valu16bits;
@@ -10357,8 +10357,8 @@ gent_floatsattrs(void)
         long double arr[F89_XDIM][F89_YDIM128];
     } * dset128;
 
-    float *      aset32  = NULL;
-    double *     aset64  = NULL;
+    float       *aset32  = NULL;
+    double      *aset64  = NULL;
     long double *aset128 = NULL;
 
     float       val32bits;
@@ -11189,7 +11189,7 @@ static size_t
 H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                     size_t *buf_size, void **buf)
 {
-    char * int_ptr  = (char *)*buf; /* Pointer to the data values */
+    char  *int_ptr  = (char *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;    /* Amount of data buffer left to process */
 
     /* Check for the correct number of parameters */
diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index 26a0fb9..f353dd4 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -43,8 +43,8 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    char *            fname = NULL;
-    char *            dname = NULL;
+    char             *fname = NULL;
+    char             *dname = NULL;
     hid_t             fid   = H5I_INVALID_HID;
     hid_t             did   = H5I_INVALID_HID;
     H5D_chunk_index_t idx_type;
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c
index 4e67e98..86befb7 100644
--- a/tools/test/h5jam/getub.c
+++ b/tools/test/h5jam/getub.c
@@ -21,7 +21,7 @@ void parse_command_line(int argc, const char *const *argv);
 #define PROGRAM_NAME "getub"
 char *nbytes = NULL;
 
-static const char *           s_opts   = "c:";                     /* add more later ? */
+static const char            *s_opts   = "c:";                     /* add more later ? */
 static struct h5_long_options l_opts[] = {{"c", require_arg, 'c'}, /* input file */
                                           {NULL, 0, '\0'}};
 
@@ -81,9 +81,9 @@ main(int argc, char *argv[])
 {
     int      fd = H5I_INVALID_HID;
     unsigned size;
-    char *   filename = NULL;
+    char    *filename = NULL;
     long     res;
-    char *   buf = NULL;
+    char    *buf = NULL;
 
     h5tools_setprogname(PROGRAM_NAME);
     h5tools_setstatus(EXIT_SUCCESS);
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 16604b3..3f99048 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -363,10 +363,10 @@ error:
 static herr_t
 create_textfile(const char *name, size_t size)
 {
-    char * buf = NULL;
+    char  *buf = NULL;
     int    fd  = -1;
     size_t i;
-    char * bp = NULL;
+    char  *bp = NULL;
 
     if ((fd = HDcreat(name, 0777)) < 0)
         goto error;
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index f264d9b..a625b59 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -24,7 +24,7 @@
  * parameters. The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *           s_opts   = "h";
+static const char            *s_opts   = "h";
 static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
@@ -100,7 +100,7 @@ leave(int ret)
 int
 main(int argc, char *argv[])
 {
-    char *  ifname;
+    char   *ifname;
     hid_t   ifile = H5I_INVALID_HID;
     hsize_t usize;
     htri_t  testval;
diff --git a/tools/test/h5ls/dynlib_ls.c b/tools/test/h5ls/dynlib_ls.c
index 433522d..9d277e0 100644
--- a/tools/test/h5ls/dynlib_ls.c
+++ b/tools/test/h5ls/dynlib_ls.c
@@ -62,7 +62,7 @@ static size_t
 H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                     size_t *buf_size, void **buf)
 {
-    char * int_ptr  = (char *)*buf; /* Pointer to the data values */
+    char  *int_ptr  = (char *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;    /* Amount of data buffer left to process */
 
     /* Check for the correct number of parameters */
diff --git a/tools/test/h5repack/dynlib_rpk.c b/tools/test/h5repack/dynlib_rpk.c
index bef032a..b9e863b 100644
--- a/tools/test/h5repack/dynlib_rpk.c
+++ b/tools/test/h5repack/dynlib_rpk.c
@@ -68,7 +68,7 @@ static size_t
 H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                    size_t *buf_size, void **buf)
 {
-    int *  int_ptr  = (int *)*buf; /* Pointer to the data values */
+    int   *int_ptr  = (int *)*buf; /* Pointer to the data values */
     size_t buf_left = *buf_size;   /* Amount of data buffer left to process */
     int    add_on   = 0;
 
diff --git a/tools/test/h5repack/dynlib_vrpk.c b/tools/test/h5repack/dynlib_vrpk.c
index a45de65..981b848 100644
--- a/tools/test/h5repack/dynlib_vrpk.c
+++ b/tools/test/h5repack/dynlib_vrpk.c
@@ -65,7 +65,7 @@ static size_t
 H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
                    size_t *buf_size, void **buf)
 {
-    int *    int_ptr  = (int *)*buf; /* Pointer to the data values */
+    int     *int_ptr  = (int *)*buf; /* Pointer to the data values */
     size_t   buf_left = *buf_size;   /* Amount of data buffer left to process */
     int      add_on   = 0;
     unsigned ver_info[3];
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index da4ea54..0e3f64f 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -2502,7 +2502,7 @@ make_szip(hid_t loc_id)
         /* WARNING? SZIP is decoder only, can't generate test files */
 
         if (H5Sclose(sid) < 0)
-        goto error;
+            goto error;
     if (H5Pclose(dcpl) < 0)
         goto error;
 
@@ -4168,7 +4168,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     {
 
         hsize_t  TEST_BUFSIZE = (128 * 1024 * 1024); /* 128MB */
-        double * dbuf;                               /* information to write */
+        double  *dbuf;                               /* information to write */
         size_t   size;
         hsize_t  sdims[] = {1};
         hsize_t  tdims[] = {TEST_BUFSIZE / sizeof(double) + 1};
@@ -4672,7 +4672,7 @@ make_dset_reg_ref(hid_t loc_id)
     hsize_t          count[SPACE2_RANK];  /* Element count of hyperslab */
     hsize_t          block[SPACE2_RANK];  /* Block size of hyperslab */
     hdset_reg_ref_t *wbuf  = NULL;        /* buffer to write to disk */
-    int *            dwbuf = NULL;        /* Buffer for writing numeric data to disk */
+    int             *dwbuf = NULL;        /* Buffer for writing numeric data to disk */
     int              i;                   /* counting variables */
     int              retval = -1;         /* return value */
 
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index 7589144..5b898db 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -42,7 +42,7 @@ typedef struct {
     phase_t            e;
     float              f_array[FIXED_LEN];
     hvl_t              i_vlen;
-    char *             s_vlen;
+    char              *s_vlen;
 } test_comp_t;
 
 typedef struct {
@@ -140,19 +140,19 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         tid_vlen_i, tid_vlen_s;
     char    name[32], tmp_name1[32], tmp_name2[32], tmp_name3[32];
     hsize_t dims[1] = {dim0}, dims2d[2] = {dim0, (dim0 / 4 + 1)}, dims_array[1] = {FIXED_LEN}, dim1[1] = {2};
-    char *  enum_names[4] = {"SOLID", "LIQUID", "GAS", "PLASMA"};
+    char   *enum_names[4] = {"SOLID", "LIQUID", "GAS", "PLASMA"};
     test_comp_t *buf_comp = NULL, *buf_comp_large = NULL;
-    int *        buf_int           = NULL;
+    int         *buf_int           = NULL;
     float(*buf_float_a)[FIXED_LEN] = NULL;
     double **buf_double2d          = NULL;
-    hvl_t *  buf_vlen_i            = NULL;
+    hvl_t   *buf_vlen_i            = NULL;
     char(*buf_str)[FIXED_LEN];
-    char **         buf_vlen_s = NULL;
+    char          **buf_vlen_s = NULL;
     hobj_ref_t      buf_ref[2];
     hdset_reg_ref_t buf_reg_ref[2];
     size_t          offset, len;
     herr_t          status;
-    char *          names[NTYPES] = {"int",
+    char           *names[NTYPES] = {"int",
                            "ulong",
                            "float",
                            "double",
@@ -543,9 +543,9 @@ add_attrs(hid_t oid, int idx)
     long long    l          = -2147483647;
     float        f          = 123456789.987654321;
     double       d          = 987654321.123456789;
-    char *       s[7]       = {"Parting", "is such", "sweeter", "sorrow."};
+    char        *s[7]       = {"Parting", "is such", "sweeter", "sorrow."};
     float        f_array[4] = {1.0, 2.22, 3.333, 4.444};
-    char *       s_vlen[4]  = {"Parting", "is such", "sweet", "sorrow."};
+    char        *s_vlen[4]  = {"Parting", "is such", "sweet", "sorrow."};
     hsize_t      dims1[1] = {1}, dims2[1] = {4}, dims3[2] = {3, 5};
     int          int3d[4][3][5];
     size_t       offset = 0;
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index b068985..5fd454e 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -26,7 +26,7 @@
 #define FILENAME      "family_file%05d.h5"
 
 int **buf      = NULL;
-int * buf_data = NULL;
+int  *buf_data = NULL;
 
 int
 main(void)
diff --git a/tools/test/misc/vds/UC_1_one_dim_gen.c b/tools/test/misc/vds/UC_1_one_dim_gen.c
index a816fb8..5ccc7d0 100644
--- a/tools/test/misc/vds/UC_1_one_dim_gen.c
+++ b/tools/test/misc/vds/UC_1_one_dim_gen.c
@@ -62,7 +62,7 @@ main(void)
     hsize_t start[RANK];   /* starting point for hyperslab             */
     hsize_t map_start = 0; /* starting point in the VDS map            */
 
-    int *   buffer   = NULL; /* data buffer                              */
+    int    *buffer   = NULL; /* data buffer                              */
     hsize_t count    = 0;    /* number of elements in a plane            */
     int     n_planes = -1;   /* number of planes to write                */
     int     value    = -1;   /* value written to datasets                */
diff --git a/tools/test/misc/vds/UC_2_two_dims_gen.c b/tools/test/misc/vds/UC_2_two_dims_gen.c
index 85bd63d..bf8bd3a 100644
--- a/tools/test/misc/vds/UC_2_two_dims_gen.c
+++ b/tools/test/misc/vds/UC_2_two_dims_gen.c
@@ -70,7 +70,7 @@ main(void)
     hsize_t start[RANK];  /* starting point for hyperslab             */
     hsize_t extent[RANK]; /* dataset extents                          */
 
-    int *   buffer   = NULL; /* data buffer                              */
+    int    *buffer   = NULL; /* data buffer                              */
     int     value    = -1;   /* value written to datasets                */
     hsize_t count    = 0;    /* number of elements in a plane            */
     int     n_planes = -1;   /* number of planes to write                */
diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c
index 5e2dde2..9e4d3f0 100644
--- a/tools/test/perform/chunk.c
+++ b/tools/test/perform/chunk.c
@@ -328,7 +328,7 @@ main(void)
 {
     size_t io_size;
     double effic, io_percent;
-    FILE * f, *d;
+    FILE  *f, *d;
     size_t cache_size;
     double w0;
 
diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c
index 1d7756b..c99f2f1 100644
--- a/tools/test/perform/direct_write_perf.c
+++ b/tools/test/perform/direct_write_perf.c
@@ -145,7 +145,7 @@ create_file(hid_t fapl_id)
     size_t        buf_size = CHUNK_NY * CHUNK_NZ * sizeof(unsigned int);
 
     const Bytef *z_src;
-    Bytef *      z_dst; /*destination buffer		*/
+    Bytef       *z_dst; /*destination buffer		*/
     uLongf       z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size);
     uLong        z_src_nbytes = (uLong)buf_size;
 
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index c974928..38c7f0a 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -175,7 +175,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc
     hsize_t     hs_start[1];                   /*hyperslab start offset*/
     hsize_t     hs_count[1] = {1};             /*hyperslab nelmts  */
     int         fd          = (-1);            /*h5 file direct  */
-    int *       had         = NULL;            /*for random filling  */
+    int        *had         = NULL;            /*for random filling  */
     const char *sname       = NULL;            /*fill style nam  */
     int         mdc_nelmts;                    /*num meta objs to cache*/
     hsize_t     i, k;
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 24b3754..6223d96 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -52,7 +52,7 @@
 /* internal variables */
 static const char *prog             = NULL;
 static const char *option_prefix    = NULL;
-static char *      filename         = NULL;
+static char       *filename         = NULL;
 static int         compress_percent = 0;
 static int         compress_level   = Z_DEFAULT_COMPRESSION;
 static int         output, random_test = FALSE;
@@ -64,7 +64,7 @@ static void error(const char *fmt, ...);
 static void compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
 /* commandline options : long and short form */
-static const char *           s_opts   = "hB:b:c:p:rs:0123456789";
+static const char            *s_opts   = "hB:b:c:p:rs:0123456789";
 static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
                                           {"compressability", require_arg, 'c'},
                                           {"file-size", require_arg, 's'},
@@ -113,7 +113,7 @@ cleanup(void)
 static void
 write_file(Bytef *source, uLongf sourceLen)
 {
-    Bytef *        d_ptr, *dest;
+    Bytef         *d_ptr, *dest;
     uLongf         d_len, destLen;
     struct timeval timer_start, timer_stop;
 
@@ -305,7 +305,7 @@ static unsigned long
 parse_size_directive(const char *size)
 {
     unsigned long s;
-    char *        endptr;
+    char         *endptr;
 
     s = HDstrtoul(size, &endptr, 10);
 
@@ -385,7 +385,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
     uLongf         src_len, total_len;
     struct timeval timer_start, timer_stop;
     double         total_time;
-    Bytef *        src;
+    Bytef         *src;
 
     for (src_len = min_buf_size; src_len <= max_buf_size; src_len <<= 1) {
         unsigned long i, iters;