Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

9 files changed, 22 insertions, 22 deletions

diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c
index 7dd5104..2589795 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c
@@ -37,7 +37,7 @@ struct hg_dlog *
 hg_dlog_alloc(char *name, unsigned int lesize, int leloop)
 {
     struct hg_dlog_entry *le;
-    struct hg_dlog *      d;
+    struct hg_dlog       *d;
 
     le = malloc(sizeof(*le) * lesize);
     if (!le)
@@ -249,7 +249,7 @@ hg_dlog_dump_file(struct hg_dlog *d, const char *base, int addpid, int trylock)
 {
     char                     buf[2048];
     int                      pid;
-    FILE *                   fp = NULL;
+    FILE                    *fp = NULL;
     unsigned int             left, idx;
     struct hg_dlog_dcount32 *dc32;
     struct hg_dlog_dcount64 *dc64;
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h
index 0027fde..81182f5 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h
@@ -49,11 +49,11 @@
  * hg_dlog_entry: an entry in the dlog
  */
 struct hg_dlog_entry {
-    const char * file; /* file name */
+    const char  *file; /* file name */
     unsigned int line; /* line number */
-    const char * func; /* function name */
-    const char * msg;  /* entry message (optional) */
-    const void * data; /* user data (optional) */
+    const char  *func; /* function name */
+    const char  *msg;  /* entry message (optional) */
+    const void  *data; /* user data (optional) */
     hg_time_t    time; /* time added to log */
 };
 
@@ -61,8 +61,8 @@ struct hg_dlog_entry {
  * hg_dlog_dcount32: 32-bit debug counter in the dlog
  */
 struct hg_dlog_dcount32 {
-    const char *      name;            /* counter name (short) */
-    const char *      descr;           /* description of counter */
+    const char       *name;            /* counter name (short) */
+    const char       *descr;           /* description of counter */
     hg_atomic_int32_t c;               /* the counter itself */
     HG_LIST_ENTRY(hg_dlog_dcount32) l; /* linkage */
 };
@@ -71,8 +71,8 @@ struct hg_dlog_dcount32 {
  * hg_dlog_dcount64: 64-bit debug counter in the dlog
  */
 struct hg_dlog_dcount64 {
-    const char *      name;            /* counter name (short) */
-    const char *      descr;           /* description of counter */
+    const char       *name;            /* counter name (short) */
+    const char       *descr;           /* description of counter */
     hg_atomic_int64_t c;               /* the counter itself */
     HG_LIST_ENTRY(hg_dlog_dcount64) l; /* linkage */
 };
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_list.h b/src/H5FDsubfiling/mercury/src/util/mercury_list.h
index 7b66c23..1de32c5 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_list.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_list.h
@@ -59,7 +59,7 @@
 
 #define HG_LIST_ENTRY(struct_entry_name)                                                                     \
     struct {                                                                                                 \
-        struct struct_entry_name * next;                                                                     \
+        struct struct_entry_name  *next;                                                                     \
         struct struct_entry_name **prev;                                                                     \
     }
 
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_log.c b/src/H5FDsubfiling/mercury/src/util/mercury_log.c
index def1abe..f77ba23 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_log.c
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_log.c
@@ -303,7 +303,7 @@ const char *
 hg_log_get_subsys(void)
 {
     static char log_subsys[HG_LOG_SUBSYS_MAX * (HG_LOG_SUBSYS_NAME_MAX + 2)] = "\0";
-    char *      p                                                            = log_subsys;
+    char       *p                                                            = log_subsys;
     int         i                                                            = 0;
 
     while (hg_log_subsys_g[i][0] != '\0' && i < HG_LOG_SUBSYS_MAX) {
@@ -324,7 +324,7 @@ void
 hg_log_set_subsys_level(const char *subsys, enum hg_log_level log_level)
 {
     const char *log_subsys = hg_log_get_subsys();
-    char *      new_subsys = NULL;
+    char       *new_subsys = NULL;
     const char *new_subsys_ptr;
 
     if (strcmp(log_subsys, "") != 0) {
@@ -451,7 +451,7 @@ hg_log_write(struct hg_log_outlet *hg_log_outlet, enum hg_log_level log_level, c
              unsigned int line, const char *func, const char *format, ...)
 {
     char        buf[HG_LOG_BUF_MAX];
-    FILE *      stream     = NULL;
+    FILE       *stream     = NULL;
     const char *level_name = NULL;
 #ifdef HG_UTIL_HAS_LOG_COLOR
     const char *color = hg_log_colors_g[log_level];
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_log.h b/src/H5FDsubfiling/mercury/src/util/mercury_log.h
index a550d97..8076272 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_log.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_log.h
@@ -179,11 +179,11 @@ enum hg_log_state { HG_LOG_PASS, HG_LOG_OFF, HG_LOG_ON };
 
 /* Log outlet */
 struct hg_log_outlet {
-    const char *          name;          /* Name of outlet */
+    const char           *name;          /* Name of outlet */
     enum hg_log_state     state;         /* Init state of outlet */
     enum hg_log_level     level;         /* Level of outlet */
     struct hg_log_outlet *parent;        /* Parent of outlet */
-    struct hg_dlog *      debug_log;     /* Debug log to use */
+    struct hg_dlog       *debug_log;     /* Debug log to use */
     HG_QUEUE_ENTRY(hg_log_outlet) entry; /* List entry */
 };
 
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_queue.h b/src/H5FDsubfiling/mercury/src/util/mercury_queue.h
index 07d977f..6cc65f7 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_queue.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_queue.h
@@ -49,13 +49,13 @@
 
 #define HG_QUEUE_HEAD_DECL(struct_head_name, struct_entry_name)                                              \
     struct struct_head_name {                                                                                \
-        struct struct_entry_name * head;                                                                     \
+        struct struct_entry_name  *head;                                                                     \
         struct struct_entry_name **tail;                                                                     \
     }
 
 #define HG_QUEUE_HEAD(struct_entry_name)                                                                     \
     struct {                                                                                                 \
-        struct struct_entry_name * head;                                                                     \
+        struct struct_entry_name  *head;                                                                     \
         struct struct_entry_name **tail;                                                                     \
     }
 
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread.h b/src/H5FDsubfiling/mercury/src/util/mercury_thread.h
index 185d997..d199bc7 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_thread.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread.h
@@ -25,7 +25,7 @@ typedef DWORD_PTR hg_cpu_set_t;
 #include <pthread.h>
 typedef pthread_t hg_thread_t;
 typedef void *(*hg_thread_func_t)(void *);
-typedef void *        hg_thread_ret_t;
+typedef void         *hg_thread_ret_t;
 #define HG_THREAD_RETURN_TYPE hg_thread_ret_t
 typedef pthread_key_t hg_thread_key_t;
 #ifdef __APPLE__
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c
index 76248d1..cbb7563 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c
@@ -21,7 +21,7 @@
 struct hg_thread_pool_private {
     struct hg_thread_pool pool;
     unsigned int          thread_count;
-    hg_thread_t *         threads;
+    hg_thread_t          *threads;
 };
 
 /********************/
@@ -42,7 +42,7 @@ static HG_THREAD_RETURN_TYPE
 hg_thread_pool_worker(void *args)
 {
     hg_thread_ret_t        ret  = 0;
-    hg_thread_pool_t *     pool = (hg_thread_pool_t *)args;
+    hg_thread_pool_t      *pool = (hg_thread_pool_t *)args;
     struct hg_thread_work *work;
 
     while (1) {
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h
index b399f66..e3b9f4d 100644
--- a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h
+++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h
@@ -27,7 +27,7 @@ struct hg_thread_pool {
 
 struct hg_thread_work {
     hg_thread_func_t func;
-    void *           args;
+    void            *args;
     HG_QUEUE_ENTRY(hg_thread_work) entry; /* Internal */
 };