Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

1 files changed, 92 insertions, 92 deletions

diff --git a/test/cache.c b/test/cache.c
index 45e6263..3c6c818 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -259,7 +259,7 @@ smoke_check_1(int express_test, unsigned paged)
     int32_t lag              = 10;
     int32_t max_index        = (10 * 1024) - 1;
     int     mile_stone       = 1;
-    H5F_t * file_ptr         = NULL;
+    H5F_t  *file_ptr         = NULL;
 
     if (paged)
         TESTING("smoke check #1P -- all clean, ins, dest, ren, 4/2 MB cache");
@@ -457,7 +457,7 @@ smoke_check_2(int express_test, unsigned paged)
     int32_t max_index        = (10 * 1024) - 1;
     int32_t lag              = 10;
     int     mile_stone       = 1;
-    H5F_t * file_ptr         = NULL;
+    H5F_t  *file_ptr         = NULL;
 
     if (paged)
         TESTING("smoke check #2P -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache");
@@ -654,7 +654,7 @@ smoke_check_3(int express_test, unsigned paged)
     int32_t max_index        = (10 * 1024) - 1;
     int32_t lag              = 10;
     int     mile_stone       = 1;
-    H5F_t * file_ptr         = NULL;
+    H5F_t  *file_ptr         = NULL;
 
     if (paged)
         TESTING("smoke check #3P -- all clean, ins, dest, ren, 2/1 KB cache");
@@ -852,7 +852,7 @@ smoke_check_4(int express_test, unsigned paged)
     int32_t max_index        = (10 * 1024) - 1;
     int32_t lag              = 10;
     int     mile_stone       = 1;
-    H5F_t * file_ptr         = NULL;
+    H5F_t  *file_ptr         = NULL;
 
     if (paged)
         TESTING("smoke check #4P -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache");
@@ -1049,8 +1049,8 @@ smoke_check_5(int express_test, unsigned paged)
     hbool_t             display_stats    = FALSE;
     int32_t             max_index        = 1024;
     int                 mile_stone       = 1;
-    H5F_t *             file_ptr         = NULL;
-    H5C_t *             cache_ptr        = NULL;
+    H5F_t              *file_ptr         = NULL;
+    H5C_t              *cache_ptr        = NULL;
     H5C_auto_size_ctl_t auto_size_ctl    = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
 #if 1
@@ -1281,8 +1281,8 @@ smoke_check_6(int express_test, unsigned paged)
     hbool_t             display_stats    = FALSE;
     int                 mile_stone       = 1;
     int32_t             max_index        = 1024;
-    H5F_t *             file_ptr         = NULL;
-    H5C_t *             cache_ptr        = NULL;
+    H5F_t              *file_ptr         = NULL;
+    H5C_t              *cache_ptr        = NULL;
     H5C_auto_size_ctl_t auto_size_ctl    = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
 #if 1
@@ -1513,8 +1513,8 @@ smoke_check_7(int express_test, unsigned paged)
     hbool_t             display_stats    = FALSE;
     int                 mile_stone       = 1;
     int32_t             max_index        = 1024;
-    H5F_t *             file_ptr         = NULL;
-    H5C_t *             cache_ptr        = NULL;
+    H5F_t              *file_ptr         = NULL;
+    H5C_t              *cache_ptr        = NULL;
     H5C_auto_size_ctl_t auto_size_ctl    = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
 #if 1
@@ -1746,8 +1746,8 @@ smoke_check_8(int express_test, unsigned paged)
     hbool_t             display_stats    = FALSE;
     int                 mile_stone       = 1;
     int32_t             max_index        = 1024;
-    H5F_t *             file_ptr         = NULL;
-    H5C_t *             cache_ptr        = NULL;
+    H5F_t              *file_ptr         = NULL;
+    H5C_t              *cache_ptr        = NULL;
     H5C_auto_size_ctl_t auto_size_ctl    = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
 #if 1
@@ -1989,8 +1989,8 @@ smoke_check_9(int express_test, unsigned paged)
     int32_t max_index              = (10 * 1024) - 1;
     int32_t lag                    = 10;
     int     mile_stone             = 1;
-    H5F_t * file_ptr               = NULL;
-    H5C_t * cache_ptr              = NULL;
+    H5F_t  *file_ptr               = NULL;
+    H5C_t  *cache_ptr              = NULL;
 
     if (paged)
         TESTING("smoke check #9P -- all clean, ins, dest, ren, 4/2 MB, corked");
@@ -2307,8 +2307,8 @@ smoke_check_10(int express_test, unsigned paged)
     int32_t max_index              = (10 * 1024) - 1;
     int32_t lag                    = 10;
     int     mile_stone             = 1;
-    H5F_t * file_ptr               = NULL;
-    H5C_t * cache_ptr              = NULL;
+    H5F_t  *file_ptr               = NULL;
+    H5C_t  *cache_ptr              = NULL;
 
     if (paged)
         TESTING("smoke check #10P -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked");
@@ -2621,7 +2621,7 @@ write_permitted_check(int
     int32_t max_index     = (10 * 1024) - 1;
     int32_t lag           = 10;
     int     mile_stone    = 1;
-    H5F_t * file_ptr      = NULL;
+    H5F_t  *file_ptr      = NULL;
 
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
@@ -2833,10 +2833,10 @@ check_insert_entry(unsigned paged)
     hbool_t                   is_protected;
     hbool_t                   is_pinned;
     size_t                    entry_size;
-    H5F_t *                   file_ptr  = NULL;
-    H5C_t *                   cache_ptr = NULL;
-    test_entry_t *            base_addr;
-    test_entry_t *            entry_ptr;
+    H5F_t                    *file_ptr  = NULL;
+    H5C_t                    *cache_ptr = NULL;
+    test_entry_t             *base_addr;
+    test_entry_t             *entry_ptr;
     struct H5C_cache_entry_t *search_ptr;
 
     if (paged)
@@ -4468,7 +4468,7 @@ static void
 check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags,
                                     unsigned int spec_size, struct flush_cache_test_spec spec[])
 {
-    H5C_t *       cache_ptr = file_ptr->shared->cache;
+    H5C_t        *cache_ptr = file_ptr->shared->cache;
     static char   msg[128];
     unsigned      u;
     size_t        total_entry_size = 0;
@@ -4653,7 +4653,7 @@ static void
 check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags,
                                        unsigned int spec_size, struct pe_flush_cache_test_spec spec[])
 {
-    H5C_t *       cache_ptr = file_ptr->shared->cache;
+    H5C_t        *cache_ptr = file_ptr->shared->cache;
     static char   msg[128];
     unsigned      u;
     int           j;
@@ -4847,8 +4847,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr)
     const int                        max_num_spec  = 10;
     const int                        max_num_check = 4;
     struct fo_flush_cache_test_spec *spec          = NULL;
-    struct fo_flush_entry_check *    checks        = NULL;
-    H5C_t *                          cache_ptr     = file_ptr->shared->cache;
+    struct fo_flush_entry_check     *checks        = NULL;
+    H5C_t                           *cache_ptr     = file_ptr->shared->cache;
 
     if (cache_ptr == NULL) {
 
@@ -8221,7 +8221,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu
                                  unsigned expected_index_len, size_t expected_index_size, int check_size,
                                  struct fo_flush_entry_check check[])
 {
-    H5C_t *       cache_ptr = file_ptr->shared->cache;
+    H5C_t        *cache_ptr = file_ptr->shared->cache;
     static char   msg[128];
     int           i;
     int           j;
@@ -8613,7 +8613,7 @@ static void
 check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr)
 {
     struct expected_entry_status *expected  = NULL;
-    H5C_t *                       cache_ptr = file_ptr->shared->cache;
+    H5C_t                        *cache_ptr = file_ptr->shared->cache;
     int                           i;
     const int                     num_variable_entries = 10;
     const int                     num_monster_entries  = 31;
@@ -11065,7 +11065,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty
                                      hbool_t expected_deserialized, hbool_t expected_serialized,
                                      hbool_t expected_destroyed)
 {
-    H5C_t *       cache_ptr = file_ptr->shared->cache;
+    H5C_t        *cache_ptr = file_ptr->shared->cache;
     static char   msg[128];
     test_entry_t *base_addr;
     test_entry_t *entry_ptr = NULL;
@@ -11213,7 +11213,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e
                                             unsigned int flush_flags, hbool_t expected_serialized,
                                             hbool_t expected_destroyed)
 {
-    H5C_t *       cache_ptr = file_ptr->shared->cache;
+    H5C_t        *cache_ptr = file_ptr->shared->cache;
     static char   msg[128];
     hbool_t       expected_deserialized = TRUE;
     test_entry_t *base_addr;
@@ -11377,7 +11377,7 @@ check_get_entry_status(unsigned paged)
     hbool_t       is_protected;
     hbool_t       is_pinned;
     size_t        entry_size;
-    H5F_t *       file_ptr  = NULL;
+    H5F_t        *file_ptr  = NULL;
     test_entry_t *base_addr = NULL;
     test_entry_t *entry_ptr = NULL;
 
@@ -11598,7 +11598,7 @@ check_expunge_entry(unsigned paged)
     hbool_t       is_protected;
     hbool_t       is_pinned;
     size_t        entry_size;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *base_addr;
     test_entry_t *entry_ptr;
 
@@ -12263,7 +12263,7 @@ static unsigned
 check_move_entry(unsigned paged)
 {
     unsigned                    u;
-    H5F_t *                     file_ptr      = NULL;
+    H5F_t                      *file_ptr      = NULL;
     struct move_entry_test_spec test_specs[4] = {
         {/* int     entry_type      = */ PICO_ENTRY_TYPE,
          /* int     entry_index     = */ 10,
@@ -12364,11 +12364,11 @@ check_move_entry(unsigned paged)
 static void
 check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry_test_spec *spec_ptr)
 {
-    H5C_t *            cache_ptr = file_ptr->shared->cache;
+    H5C_t             *cache_ptr = file_ptr->shared->cache;
     static char        msg[128];
     unsigned int       flags = H5C__NO_FLAGS_SET;
-    test_entry_t *     base_addr;
-    test_entry_t *     entry_ptr = NULL;
+    test_entry_t      *base_addr;
+    test_entry_t      *entry_ptr = NULL;
     H5C_cache_entry_t *test_ptr  = NULL;
 
     if (cache_ptr == NULL) {
@@ -12520,7 +12520,7 @@ check_pin_protected_entry(unsigned paged)
 {
     static char   msg[128];
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *base_addr;
     test_entry_t *entry_ptr;
 
@@ -12633,8 +12633,8 @@ check_resize_entry(unsigned paged)
     hbool_t       is_pinned;
     size_t        entry_size;
     size_t        reported_entry_size;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     test_entry_t *base_addr;
     test_entry_t *entry_ptr = NULL;
 
@@ -13500,8 +13500,8 @@ check_evictions_enabled(unsigned paged)
     hbool_t       in_cache;
     int           i;
     int           mile_stone = 1;
-    H5F_t *       file_ptr   = NULL;
-    H5C_t *       cache_ptr  = NULL;
+    H5F_t        *file_ptr   = NULL;
+    H5C_t        *cache_ptr  = NULL;
     test_entry_t *base_addr  = NULL;
     test_entry_t *entry_ptr;
 
@@ -14422,7 +14422,7 @@ static unsigned
 check_duplicate_insert_err(unsigned paged)
 {
     herr_t        result   = -1;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *base_addr;
     test_entry_t *entry_ptr;
 
@@ -14506,7 +14506,7 @@ static unsigned
 check_double_pin_err(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -14595,7 +14595,7 @@ static unsigned
 check_double_unpin_err(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -14693,7 +14693,7 @@ static unsigned
 check_pin_entry_errs(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -14800,8 +14800,8 @@ check_pin_entry_errs(unsigned paged)
 static unsigned
 check_double_protect_err(unsigned paged)
 {
-    H5F_t *            file_ptr = NULL;
-    test_entry_t *     entry_ptr;
+    H5F_t             *file_ptr = NULL;
+    test_entry_t      *entry_ptr;
     H5C_cache_entry_t *cache_entry_ptr;
 
     if (paged)
@@ -14883,7 +14883,7 @@ static unsigned
 check_double_unprotect_err(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -14964,7 +14964,7 @@ static unsigned
 check_mark_entry_dirty_errs(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -15047,7 +15047,7 @@ static unsigned
 check_expunge_entry_errs(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -15159,8 +15159,8 @@ static unsigned
 check_move_entry_errs(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr  = NULL;
-    H5C_t *       cache_ptr = NULL;
+    H5F_t        *file_ptr  = NULL;
+    H5C_t        *cache_ptr = NULL;
     test_entry_t *entry_ptr = NULL;
     test_entry_t *entry_0_0_ptr;
     test_entry_t *entry_0_1_ptr;
@@ -15276,7 +15276,7 @@ static unsigned
 check_resize_entry_errs(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -15377,7 +15377,7 @@ static unsigned
 check_unprotect_ro_dirty_err(unsigned paged)
 {
     herr_t        result;
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
 
     if (paged)
@@ -15501,9 +15501,9 @@ check_unprotect_ro_dirty_err(unsigned paged)
 static unsigned
 check_protect_ro_rw_err(unsigned paged)
 {
-    H5F_t *       file_ptr = NULL;
+    H5F_t        *file_ptr = NULL;
     test_entry_t *entry_ptr;
-    void *        thing_ptr = NULL;
+    void         *thing_ptr = NULL;
 
     if (paged)
         TESTING("protect a read only entry rw error (paged aggregation)");
@@ -15582,10 +15582,10 @@ check_protect_ro_rw_err(unsigned paged)
 static unsigned
 check_protect_retries(unsigned paged)
 {
-    H5F_t *            file_ptr        = NULL;
-    H5C_t *            cache_ptr       = NULL;
-    test_entry_t *     base_addr       = NULL;
-    test_entry_t *     entry_ptr       = NULL;
+    H5F_t             *file_ptr        = NULL;
+    H5C_t             *cache_ptr       = NULL;
+    test_entry_t      *base_addr       = NULL;
+    test_entry_t      *entry_ptr       = NULL;
     H5C_cache_entry_t *cache_entry_ptr = NULL;
     int32_t            type;
     int32_t            idx;
@@ -15719,8 +15719,8 @@ check_check_evictions_enabled_err(unsigned paged)
 {
     herr_t  result;
     hbool_t evictions_enabled;
-    H5F_t * file_ptr  = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5F_t  *file_ptr  = NULL;
+    H5C_t  *cache_ptr = NULL;
 
     if (paged)
         TESTING("get/set evictions enabled errors (paged aggregation)");
@@ -15872,8 +15872,8 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     herr_t              result;
     int32_t             i;
     int32_t             checkpoint    = 0;
-    H5F_t *             file_ptr      = NULL;
-    H5C_t *             cache_ptr     = NULL;
+    H5F_t              *file_ptr      = NULL;
+    H5C_t              *cache_ptr     = NULL;
     H5C_auto_size_ctl_t auto_size_ctl = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
         /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn,
@@ -19727,8 +19727,8 @@ check_auto_cache_resize_disable(unsigned paged)
     herr_t              result;
     int32_t             i;
     int32_t             checkpoint    = 0;
-    H5F_t *             file_ptr      = NULL;
-    H5C_t *             cache_ptr     = NULL;
+    H5F_t              *file_ptr      = NULL;
+    H5C_t              *cache_ptr     = NULL;
     H5C_auto_size_ctl_t auto_size_ctl = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
         /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn,
@@ -22326,8 +22326,8 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     int32_t             i;
     int32_t             j;
     int32_t             checkpoint    = 0;
-    H5F_t *             file_ptr      = NULL;
-    H5C_t *             cache_ptr     = NULL;
+    H5F_t              *file_ptr      = NULL;
+    H5C_t              *cache_ptr     = NULL;
     H5C_auto_size_ctl_t auto_size_ctl = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
         /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn,
@@ -23014,8 +23014,8 @@ static unsigned
 check_auto_cache_resize_input_errs(unsigned paged)
 {
     herr_t              result;
-    H5F_t *             file_ptr          = NULL;
-    H5C_t *             cache_ptr         = NULL;
+    H5F_t              *file_ptr          = NULL;
+    H5C_t              *cache_ptr         = NULL;
     H5C_auto_size_ctl_t ref_auto_size_ctl = {
         /* int32_t     version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
         /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn,
@@ -25247,8 +25247,8 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
 {
     herr_t              result;
     int32_t             i;
-    H5F_t *             file_ptr  = NULL;
-    H5C_t *             cache_ptr = NULL;
+    H5F_t              *file_ptr  = NULL;
+    H5C_t              *cache_ptr = NULL;
     double              hit_rate;
     size_t              max_size;
     size_t              min_clean_size;
@@ -25750,8 +25750,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     struct expected_entry_status *expected      = NULL;
     int                           entry_type    = HUGE_ENTRY_TYPE;
     size_t                        entry_size    = HUGE_ENTRY_SIZE; /* 16 KB */
-    H5F_t *                       file_ptr      = NULL;
-    H5C_t *                       cache_ptr     = NULL;
+    H5F_t                        *file_ptr      = NULL;
+    H5C_t                        *cache_ptr     = NULL;
     hbool_t                       show_progress = FALSE;
     int32_t                       checkpoint    = 0;
     int32_t                       entry_idx     = 0;
@@ -26467,8 +26467,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
 static unsigned
 check_flush_deps(unsigned paged)
 {
-    H5F_t *       file_ptr  = NULL;        /* File for this test */
-    H5C_t *       cache_ptr = NULL;        /* Metadata cache for this test */
+    H5F_t        *file_ptr  = NULL;        /* File for this test */
+    H5C_t        *cache_ptr = NULL;        /* Metadata cache for this test */
     test_entry_t *base_addr;               /* Base address of entries for test */
     int      entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */
     unsigned u;                            /* Local index variable */
@@ -28390,7 +28390,7 @@ done:
 static unsigned
 check_flush_deps_err(unsigned paged)
 {
-    H5F_t *  file_ptr   = NULL;            /* File for this test */
+    H5F_t   *file_ptr   = NULL;            /* File for this test */
     int      entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */
     unsigned test_count;                   /* Test iteration variable */
 
@@ -28665,8 +28665,8 @@ done:
 static unsigned
 check_flush_deps_order(unsigned paged)
 {
-    H5F_t *  file_ptr   = NULL;            /* File for this test */
-    H5C_t *  cache_ptr  = NULL;            /* Metadata cache for this test */
+    H5F_t   *file_ptr   = NULL;            /* File for this test */
+    H5C_t   *cache_ptr  = NULL;            /* Metadata cache for this test */
     int      entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */
     unsigned u;                            /* Local index variable */
     unsigned flush_order;                  /* Index for tracking flush order */
@@ -31394,8 +31394,8 @@ done:
 static unsigned
 check_notify_cb(unsigned paged)
 {
-    H5F_t *       file_ptr  = NULL;     /* File for this test */
-    H5C_t *       cache_ptr = NULL;     /* Metadata cache for this test */
+    H5F_t        *file_ptr  = NULL;     /* File for this test */
+    H5C_t        *cache_ptr = NULL;     /* Metadata cache for this test */
     test_entry_t *base_addr;            /* Base address of entries for test */
     test_entry_t *entry_ptr;            /* Cache entry to examine/manipulate */
     int entry_type = NOTIFY_ENTRY_TYPE; /* Use entry w/notify callback (size of entries doesn't matter) */
@@ -31612,11 +31612,11 @@ static unsigned
 check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
 {
     struct expected_entry_status *expected      = NULL;
-    const char *                  fcn_name      = "check_metadata_cork";
+    const char                   *fcn_name      = "check_metadata_cork";
     int                           entry_type    = HUGE_ENTRY_TYPE;
     size_t                        entry_size    = HUGE_ENTRY_SIZE; /* 16 KB */
-    H5F_t *                       file_ptr      = NULL;
-    H5C_t *                       cache_ptr     = NULL;
+    H5F_t                        *file_ptr      = NULL;
+    H5C_t                        *cache_ptr     = NULL;
     hbool_t                       show_progress = FALSE;
     int32_t                       checkpoint    = 0;
     int32_t                       entry_idx     = 0;
@@ -32320,7 +32320,7 @@ static void
 cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr)
 {
     struct expected_entry_status *expected  = NULL;
-    H5C_t *                       cache_ptr = file_ptr->shared->cache;
+    H5C_t                        *cache_ptr = file_ptr->shared->cache;
     int                           i;
 
     expected = HDmalloc(36 * sizeof(struct expected_entry_status));
@@ -32560,7 +32560,7 @@ static void
 cedds__H5C_make_space_in_cache(H5F_t *file_ptr)
 {
     struct expected_entry_status *expected  = NULL;
-    H5C_t *                       cache_ptr = file_ptr->shared->cache;
+    H5C_t                        *cache_ptr = file_ptr->shared->cache;
     int                           i;
     const int                     num_huge_entries    = 4;
     const int                     num_monster_entries = 32;
@@ -32922,7 +32922,7 @@ static void
 cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr)
 {
     struct expected_entry_status *expected  = NULL;
-    H5C_t *                       cache_ptr = file_ptr->shared->cache;
+    H5C_t                        *cache_ptr = file_ptr->shared->cache;
     int                           i;
     herr_t                        result;
     H5C_auto_size_ctl_t           saved_auto_size_ctl;
@@ -33381,12 +33381,12 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr)
 static void
 cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr)
 {
-    H5C_t *                   cache_ptr = file_ptr->shared->cache;
+    H5C_t                    *cache_ptr = file_ptr->shared->cache;
     int                       i;
     int                       expected_hash_bucket = 0;
     haddr_t                   entry_addr;
-    test_entry_t *            entry_ptr;
-    test_entry_t *            base_addr = NULL;
+    test_entry_t             *entry_ptr;
+    test_entry_t             *base_addr = NULL;
     struct H5C_cache_entry_t *scan_ptr;
     /* clang-format off */
     struct expected_entry_status expected[5] =
@@ -34193,9 +34193,9 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     hbool_t verbose       = TRUE;
     int     mile_stone    = 1;
     hid_t   fid           = -1;
-    H5F_t * file_ptr      = NULL;
-    H5C_t * cache_ptr     = NULL;
-    H5F_t * ret_val       = NULL;
+    H5F_t  *file_ptr      = NULL;
+    H5C_t  *cache_ptr     = NULL;
+    H5F_t  *ret_val       = NULL;
     haddr_t actual_base_addr;
     hid_t   fapl_id = H5P_DEFAULT;
     hid_t   fcpl_id = H5P_DEFAULT;