Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

1 files changed, 44 insertions, 44 deletions

diff --git a/test/mf.c b/test/mf.c
index 04ef59a..e0e6c0c 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -217,7 +217,7 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl)
     hid_t          file     = -1;            /* File ID */
     hid_t          fapl_new = -1;            /* copy of fapl */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FD_mem_t     type;
     haddr_t        addr1, addr2;
@@ -366,7 +366,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
     hid_t          file     = -1;                /* File ID */
     hid_t          fapl_new = -1;                /* copy of fapl */
     char           filename[FILENAME_LEN];       /* Filename to use */
-    H5F_t *        f         = NULL;             /* Internal file object pointer */
+    H5F_t         *f         = NULL;             /* Internal file object pointer */
     h5_stat_size_t file_size = 0, new_file_size; /* file size */
     H5FD_mem_t     type;
     haddr_t        addr    = 0;
@@ -653,7 +653,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
     hid_t          file     = -1;            /* File ID */
     hid_t          fapl_new = -1;            /* copy of fapl */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* File size */
     H5FD_mem_t     type;
     haddr_t        addr;
@@ -877,7 +877,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
     /* Can't run this test with multi-file VFDs */
     if (!h5_driver_uses_multiple_files(env_h5_drvr, 0)) {
         char           filename[FILENAME_LEN];   /* Filename to use */
-        H5F_t *        f = NULL;                 /* Internal file object pointer */
+        H5F_t         *f = NULL;                 /* Internal file object pointer */
         h5_stat_size_t file_size, new_file_size; /* file size */
         haddr_t        maxaddr;                  /* File's max. address */
         haddr_t        tmp_addr;                 /* Temporary space file address */
@@ -1061,7 +1061,7 @@ test_mf_fs_start(hid_t fapl)
     hid_t          file     = -1;            /* File ID */
     hid_t          fapl_new = -1;            /* copy of fapl */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FS_stat_t    state;
 
@@ -1172,7 +1172,7 @@ test_mf_fs_alloc_free(hid_t fapl)
     hid_t                file     = -1;            /* File ID */
     hid_t                fapl_new = -1;            /* copy of fapl */
     char                 filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *              f = NULL;                 /* Internal file object pointer */
+    H5F_t               *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t       file_size, new_file_size; /* file size */
     H5MF_free_section_t *sect_node = NULL;
     haddr_t              addr;
@@ -1501,7 +1501,7 @@ test_mf_fs_extend(hid_t fapl)
     hid_t                file     = -1;            /* File ID */
     hid_t                fapl_new = -1;            /* copy of fapl */
     char                 filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *              f = NULL;                 /* Internal file object pointer */
+    H5F_t               *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t       file_size, new_file_size; /* file size */
     H5MF_free_section_t *sect_node1 = NULL, *sect_node2 = NULL;
     haddr_t              addr;
@@ -2008,7 +2008,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t                file = -1;              /* File ID */
     char                 filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *              f = NULL;               /* Internal file object pointer */
+    H5F_t               *f = NULL;               /* Internal file object pointer */
     haddr_t              addr, saddr;
     haddr_t              tmp;
     haddr_t              ma_addr   = HADDR_UNDEF;
@@ -2183,7 +2183,7 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     hid_t          fcpl;                     /* File creation property list */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FD_mem_t     type;
@@ -2336,7 +2336,7 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FD_mem_t     type;
     haddr_t        addr1, addr2, addr3;
@@ -2493,7 +2493,7 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3, addr4, saddr1;
@@ -2663,7 +2663,7 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* File size */
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, saddr1, saddr2, saddr3;
@@ -2812,7 +2812,7 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* File size */
     H5FD_mem_t     type;
     haddr_t        addr1, addr2, addr3;
@@ -2949,7 +2949,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;                /* File ID */
     char           filename[FILENAME_LEN];   /* Filename to use */
-    H5F_t *        f = NULL;                 /* Internal file object pointer */
+    H5F_t         *f = NULL;                 /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size; /* file size */
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3, saddr1;
@@ -3123,7 +3123,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* 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, file_size;
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3, saddr1, saddr2, saddr3;
@@ -3294,7 +3294,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* 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 = 0, file_size;
     H5FD_mem_t     type, stype;
     haddr_t        new_addr, addr, saddr;
@@ -3591,7 +3591,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* 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 = 0, file_size;
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3, saddr1;
@@ -3842,7 +3842,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
     hid_t          file  = -1; /* File ID */
     hid_t          fapl1 = -1;
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size, new_file_size;
     H5FD_mem_t     type;
     haddr_t        addr1, addr2;
@@ -4139,7 +4139,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
     hid_t                file = -1;              /* File ID */
     char                 filename[FILENAME_LEN]; /* Filename to use */
     h5_stat_size_t       file_size;
-    H5F_t *              f         = NULL; /* Internal file object pointer */
+    H5F_t               *f         = NULL; /* Internal file object pointer */
     H5MF_free_section_t *sect_node = NULL;
     haddr_t              addr;
     H5FS_stat_t          state;
@@ -4499,7 +4499,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;              /* File size */
 
     H5FD_mem_t  type;
@@ -4763,7 +4763,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;              /* File size */
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3, saddr1;
@@ -5108,7 +5108,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, addr3;
@@ -5423,7 +5423,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;
     H5FD_mem_t     type;
     haddr_t        addr1, addr2, addr3;
@@ -5641,7 +5641,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2, saddr1;
@@ -5912,7 +5912,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
     hid_t          file = -1;              /* File ID */
     char           filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *        f = NULL;               /* Internal file object pointer */
+    H5F_t         *f = NULL;               /* Internal file object pointer */
     h5_stat_size_t file_size;
     H5FD_mem_t     type, stype;
     haddr_t        addr1, addr2;
@@ -6123,7 +6123,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl)
     hid_t      file        = -1;       /* File ID */
     hid_t      copied_fapl = -1;       /* FAPL to use for this test */
     char       filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *    f = NULL;               /* Internal file object pointer */
+    H5F_t     *f = NULL;               /* Internal file object pointer */
     H5FD_mem_t type;
     haddr_t    addr1, addr2;
     hsize_t    block_size;
@@ -6178,7 +6178,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl)
         else {
             H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
             hid_t      memb_fapl_arr[H5FD_MEM_NTYPES];
-            char *     memb_name[H5FD_MEM_NTYPES];
+            char      *memb_name[H5FD_MEM_NTYPES];
             haddr_t    memb_addr[H5FD_MEM_NTYPES];
             hbool_t    relax;
             H5FD_mem_t mt;
@@ -6302,7 +6302,7 @@ test_mf_fs_persist_split(void)
     hid_t       fcpl = -1;                      /* File creation property list ID */
     hid_t       fapl = -1;                      /* File access property list ID */
     char        filename[FILENAME_LEN];         /* Filename to use */
-    H5F_t *     f = NULL;                       /* Internal file object pointer */
+    H5F_t      *f = NULL;                       /* Internal file object pointer */
     H5FD_mem_t  type, stype, btype;             /* File allocation type */
     H5FS_stat_t fs_stat;                        /* Information for free-space manager */
     haddr_t     addr1, addr2, addr3, addr4;     /* File address for H5FD_MEM_SUPER */
@@ -6617,7 +6617,7 @@ test_mf_fs_persist_multi(void)
     hid_t                fcpl = -1;                      /* File creation property list ID */
     hid_t                fapl = -1;                      /* File access property list ID */
     char                 filename[FILENAME_LEN];         /* Filename to use */
-    H5F_t *              f = NULL;                       /* Internal file object pointer */
+    H5F_t               *f = NULL;                       /* Internal file object pointer */
     H5FD_mem_t           type, stype, btype, gtype;      /* File allocation type */
     H5FS_stat_t          fs_stat;                        /* Information for free-space manager */
     haddr_t              addr1, addr2, addr3, addr4;     /* File allocation type */
@@ -6630,7 +6630,7 @@ test_mf_fs_persist_multi(void)
     H5FD_mem_t           memb_map[H5FD_MEM_NTYPES];      /* Memory usage map */
     hid_t                memb_fapl[H5FD_MEM_NTYPES];     /* Member access properties */
     char                 sv[H5FD_MEM_NTYPES][64];        /* Name generators */
-    const char *         memb_name[H5FD_MEM_NTYPES];     /* Name generators */
+    const char          *memb_name[H5FD_MEM_NTYPES];     /* Name generators */
     haddr_t              memb_addr[H5FD_MEM_NTYPES];     /* Member starting address */
 
     TESTING("File's free-space managers are persistent for multi-file");
@@ -6939,7 +6939,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
     hid_t       fcpl  = -1;                               /* File creation property list ID */
     hid_t       fapl2 = -1;                               /* File access property list ID */
     char        filename[FILENAME_LEN];                   /* Filename to use */
-    H5F_t *     f = NULL;                                 /* Internal file object pointer */
+    H5F_t      *f = NULL;                                 /* Internal file object pointer */
     H5FD_mem_t  type;                                     /* File allocation type */
     H5FD_mem_t  tt;                                       /* File allocation type */
     H5FS_stat_t fs_stat;                                  /* Information for free-space manager */
@@ -7114,7 +7114,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
     hid_t       fcpl  = -1;                 /* File creation property list */
     hid_t       fapl2 = -1;                 /* File access property list */
     char        filename[FILENAME_LEN];     /* Filename to use */
-    H5F_t *     f = NULL;                   /* Internal file object pointer */
+    H5F_t      *f = NULL;                   /* Internal file object pointer */
     H5FD_mem_t  type;                       /* File allocation type */
     H5FS_stat_t fs_stat;                    /* Information for free-space manager */
     haddr_t     addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */
@@ -7304,7 +7304,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for
     hid_t                 fcpl  = -1;                               /* File creation property list template */
     hid_t                 fapl2 = -1;                               /* File access property list template */
     char                  filename[FILENAME_LEN];                   /* Filename to use */
-    H5F_t *               f = NULL;                                 /* Internal file object pointer */
+    H5F_t                *f = NULL;                                 /* Internal file object pointer */
     H5FD_mem_t            type;                                     /* File allocation type */
     H5FD_mem_t            tt;                                       /* File allocation type */
     haddr_t               addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */
@@ -7473,7 +7473,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format
     hid_t                 fcpl  = -1;                               /* File creation property list template */
     hid_t                 fapl2 = -1;                               /* File access property list template */
     char                  filename[FILENAME_LEN];                   /* Filename to use */
-    H5F_t *               f = NULL;                                 /* Internal file object pointer */
+    H5F_t                *f = NULL;                                 /* Internal file object pointer */
     H5FD_mem_t            type;                                     /* File allocation type */
     H5FD_mem_t            tt;                                       /* File allocation type */
     haddr_t               addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */
@@ -7676,7 +7676,7 @@ test_dichotomy(hid_t fapl)
 {
     hid_t      file = -1;              /* File ID */
     char       filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t *    f = NULL;               /* Internal file object pointer */
+    H5F_t     *f = NULL;               /* Internal file object pointer */
     H5FD_mem_t type, stype;
     haddr_t    addr1, addr3, saddr1, saddr2;
 
@@ -7752,7 +7752,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split)
 {
     H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
     hid_t      memb_fapl_arr[H5FD_MEM_NTYPES];
-    char *     memb_name[H5FD_MEM_NTYPES];
+    char      *memb_name[H5FD_MEM_NTYPES];
     haddr_t    memb_addr[H5FD_MEM_NTYPES];
     hbool_t    relax;
     H5FD_mem_t mt;
@@ -7811,7 +7811,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl)
     hid_t    fid      = -1;   /* File ID */
     hid_t    fcpl     = -1;   /* File creation property list */
     hid_t    fapl_new = -1;   /* File access property list ID */
-    H5F_t *  f        = NULL; /* Internal file object pointer */
+    H5F_t   *f        = NULL; /* Internal file object pointer */
     haddr_t  addr2, addr3;    /* Addresses for small metadata blocks */
     haddr_t  saddr1;          /* Addresses for small raw data blocks */
     haddr_t  gaddr1;          /* Addresses for large data blocks */
@@ -8042,7 +8042,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl)
 
     hid_t          fid  = -1;              /* File ID */
     hid_t          fcpl = -1;              /* File creation property list */
-    H5F_t *        f    = NULL;            /* Internal file object pointer */
+    H5F_t         *f    = NULL;            /* Internal file object pointer */
     haddr_t        addr1;                  /* Address for small metadata block */
     haddr_t        saddr1;                 /* Address for small raw data block */
     haddr_t        gaddr1;                 /* Address for large data block */
@@ -8173,7 +8173,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl)
 
     hid_t   fid  = -1;              /* File ID */
     hid_t   fcpl = -1;              /* File creation property list */
-    H5F_t * f    = NULL;            /* Internal file object pointer */
+    H5F_t  *f    = NULL;            /* Internal file object pointer */
     haddr_t addr1, addr2, addr3;    /* Addresses for small metadata blocks */
     haddr_t saddr1;                 /* Address for small raw data block */
     hbool_t contig_addr_vfd;        /* Whether VFD used has a contiguous address space */
@@ -8353,7 +8353,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl)
 
     hid_t   fid  = -1;                      /* File ID */
     hid_t   fcpl = -1;                      /* File creation property list */
-    H5F_t * f    = NULL;                    /* Internal file object pointer */
+    H5F_t  *f    = NULL;                    /* Internal file object pointer */
     haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for large data blocks */
     hbool_t contig_addr_vfd;                /* Whether VFD used has a contiguous address space */
     htri_t  was_extended;                   /* Whether the block can be extended or not */
@@ -8516,7 +8516,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl)
 
     hid_t          fid  = -1;                      /* File ID */
     hid_t          fcpl = -1;                      /* File creation property list ID */
-    H5F_t *        f    = NULL;                    /* Internal file object pointer */
+    H5F_t         *f    = NULL;                    /* Internal file object pointer */
     haddr_t        gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for blocks */
     hbool_t        contig_addr_vfd;                /* Whether VFD used has a contiguous address space */
     H5FS_stat_t    fs_stat;                        /* Information for free-space manager */
@@ -8670,7 +8670,7 @@ test_page_small(const char *env_h5_drvr, hid_t fapl)
 {
     hid_t       fid  = -1;                  /* File ID */
     hid_t       fcpl = -1;                  /* File creation property list */
-    H5F_t *     f    = NULL;                /* Internal file object pointer */
+    H5F_t      *f    = NULL;                /* Internal file object pointer */
     haddr_t     addr2, addr3, addr4, addr5; /* Addresses for blocks */
     haddr_t     addr9, addr10, addr11;      /* Address for small metadata blocks */
     haddr_t     saddr1, saddr2;             /* Addresses for small raw data blocks */
@@ -8845,7 +8845,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl)
     hid_t   fcpl     = -1;          /* File creation property list ID */
     hid_t   fcpl2    = -1;          /* File creation property list ID */
     hid_t   fapl_new = -1;          /* File access property list ID */
-    H5F_t * f        = NULL;        /* Internal file object pointer */
+    H5F_t  *f        = NULL;        /* Internal file object pointer */
     haddr_t addr1, addr2;           /* Addresses for small metadata blocks */
     haddr_t saddr1, saddr2;         /* Addresses for small raw data blocks */
     haddr_t gaddr1, gaddr2;         /* Addresses for blocks */
@@ -8885,7 +8885,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl)
             hid_t      memb_fapl;
             H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
             hid_t      memb_fapl_arr[H5FD_MEM_NTYPES];
-            char *     memb_name[H5FD_MEM_NTYPES];
+            char      *memb_name[H5FD_MEM_NTYPES];
             haddr_t    memb_addr[H5FD_MEM_NTYPES];
             hbool_t    relax;
             H5FD_mem_t mt;