Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

1 files changed, 29 insertions, 29 deletions

diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index d5bbb52..5f161aa 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -104,7 +104,7 @@ static hid_t H5FD_MULTI_g = 0;
 typedef struct H5FD_multi_fapl_t {
     H5FD_mem_t memb_map[H5FD_MEM_NTYPES];  /*memory usage map              */
     hid_t      memb_fapl[H5FD_MEM_NTYPES]; /*member access properties      */
-    char *     memb_name[H5FD_MEM_NTYPES]; /*name generators               */
+    char      *memb_name[H5FD_MEM_NTYPES]; /*name generators               */
     haddr_t    memb_addr[H5FD_MEM_NTYPES]; /*starting addr per member      */
     hbool_t    relax;                      /*less stringent error checking */
 } H5FD_multi_fapl_t;
@@ -119,14 +119,14 @@ typedef struct H5FD_multi_t {
     H5FD_t            pub;                        /*public stuff, must be first               */
     H5FD_multi_fapl_t fa;                         /*driver-specific file access properties    */
     haddr_t           memb_next[H5FD_MEM_NTYPES]; /*addr of next member                       */
-    H5FD_t *          memb[H5FD_MEM_NTYPES];      /*member pointers                           */
+    H5FD_t           *memb[H5FD_MEM_NTYPES];      /*member pointers                           */
     haddr_t           memb_eoa[H5FD_MEM_NTYPES];  /*EOA for individual files,
                                                    *end of allocated addresses.  v1.6 library
                                                    *have the EOA for the entire file. But it's
                                                    *meaningless for MULTI file.  We replaced it
                                                    *with the EOAs for individual files        */
     unsigned flags;                               /*file open flags saved for debugging       */
-    char *   name;                                /*name passed to H5Fopen or H5Fcreate       */
+    char    *name;                                /*name passed to H5Fopen or H5Fcreate       */
 } H5FD_multi_t;
 
 /* Driver specific data transfer properties */
@@ -148,8 +148,8 @@ static herr_t  H5FD_multi_term(void);
 static hsize_t H5FD_multi_sb_size(H5FD_t *file);
 static herr_t  H5FD_multi_sb_encode(H5FD_t *file, char *name /*out*/, unsigned char *buf /*out*/);
 static herr_t  H5FD_multi_sb_decode(H5FD_t *file, const char *name, const unsigned char *buf);
-static void *  H5FD_multi_fapl_get(H5FD_t *file);
-static void *  H5FD_multi_fapl_copy(const void *_old_fa);
+static void   *H5FD_multi_fapl_get(H5FD_t *file);
+static void   *H5FD_multi_fapl_copy(const void *_old_fa);
 static herr_t  H5FD_multi_fapl_free(void *_fa);
 static H5FD_t *H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
 static herr_t  H5FD_multi_close(H5FD_t *_file);
@@ -420,7 +420,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
     const H5FD_multi_fapl_t *fa;
     H5FD_multi_fapl_t        default_fa;
     H5FD_mem_t               mt;
-    static const char *      func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
+    static const char       *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
 
     /*NO TRACE*/
 
@@ -488,7 +488,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
     static char
         meta_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store metadata member name */
     static char
-                raw_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store raw data member name */
+        raw_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store raw data member name */
     const char *_memb_name[H5FD_MEM_NTYPES];
     H5FD_mem_t  _memb_map[H5FD_MEM_NTYPES];
     hid_t       _memb_fapl[H5FD_MEM_NTYPES];
@@ -616,7 +616,7 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c
     H5FD_mem_t         mt, mmt;
     H5FD_mem_t         _memb_map[H5FD_MEM_NTYPES];
     hid_t              _memb_fapl[H5FD_MEM_NTYPES];
-    const char *       _memb_name_ptrs[H5FD_MEM_NTYPES];
+    const char        *_memb_name_ptrs[H5FD_MEM_NTYPES];
     haddr_t            _memb_addr[H5FD_MEM_NTYPES];
     herr_t             ret_value = 0;
 
@@ -764,9 +764,9 @@ H5FD_multi_sb_size(H5FD_t *_file)
 static herr_t
 H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     haddr_t            memb_eoa;
-    unsigned char *    p;
+    unsigned char     *p;
     size_t             nseen;
     size_t             i;
     H5FD_mem_t         m;
@@ -845,17 +845,17 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
 static herr_t
 H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     char               x[2 * H5FD_MEM_NTYPES * 8];
     H5FD_mem_t         map[H5FD_MEM_NTYPES];
     int                i;
     size_t             nseen       = 0;
     hbool_t            map_changed = FALSE;
     hbool_t            in_use[H5FD_MEM_NTYPES];
-    const char *       memb_name[H5FD_MEM_NTYPES];
+    const char        *memb_name[H5FD_MEM_NTYPES];
     haddr_t            memb_addr[H5FD_MEM_NTYPES];
     haddr_t            memb_eoa[H5FD_MEM_NTYPES];
-    haddr_t *          ap;
+    haddr_t           *ap;
     static const char *func = "H5FD_multi_sb_decode"; /* Function Name for error reporting */
 
     /* Clear the error stack */
@@ -1019,9 +1019,9 @@ static void *
 H5FD_multi_fapl_copy(const void *_old_fa)
 {
     const H5FD_multi_fapl_t *old_fa  = (const H5FD_multi_fapl_t *)_old_fa;
-    H5FD_multi_fapl_t *      new_fa  = (H5FD_multi_fapl_t *)calloc(1, sizeof(H5FD_multi_fapl_t));
+    H5FD_multi_fapl_t       *new_fa  = (H5FD_multi_fapl_t *)calloc(1, sizeof(H5FD_multi_fapl_t));
     int                      nerrors = 0;
-    static const char *      func    = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */
+    static const char       *func    = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */
 
     assert(new_fa);
 
@@ -1116,11 +1116,11 @@ H5FD_multi_fapl_free(void *_fa)
 static H5FD_t *
 H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_multi_t *           file       = NULL;
+    H5FD_multi_t            *file       = NULL;
     hid_t                    close_fapl = -1;
     const H5FD_multi_fapl_t *fa;
     H5FD_mem_t               m;
-    static const char *      func = "H5FD_multi_open"; /* Function Name for error reporting */
+    static const char       *func = "H5FD_multi_open"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -1231,7 +1231,7 @@ error:
 static herr_t
 H5FD_multi_close(H5FD_t *_file)
 {
-    H5FD_multi_t *     file    = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file    = (H5FD_multi_t *)_file;
     int                nerrors = 0;
     static const char *func    = "H5FD_multi_close"; /* Function Name for error reporting */
 
@@ -1393,7 +1393,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
 {
     const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
     haddr_t             eoa  = 0;
-    static const char * func = "H5FD_multi_get_eoa"; /* Function Name for error reporting */
+    static const char  *func = "H5FD_multi_get_eoa"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -1494,7 +1494,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
 static herr_t
 H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     H5FD_mem_t         mmt;
     herr_t             status;
     static const char *func = "H5FD_multi_set_eoa"; /* Function Name for error reporting */
@@ -1560,7 +1560,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
 {
     const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
     haddr_t             eof  = 0;
-    static const char * func = "H5FD_multi_get_eof"; /* Function Name for error reporting */
+    static const char  *func = "H5FD_multi_get_eof"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -1649,7 +1649,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
 static herr_t
 H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     H5FD_mem_t         type, mmt;
     static const char *func = "H5FD_multi_get_handle"; /* Function Name for error reporting */
 
@@ -1683,7 +1683,7 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 static haddr_t
 H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     H5FD_mem_t         mmt;
     haddr_t            addr;
     static const char *func = "H5FD_multi_alloc"; /* Function Name for error reporting */
@@ -1864,7 +1864,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
 static herr_t
 H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     H5FD_mem_t         mt;
     int                nerrors = 0;
     static const char *func    = "H5FD_multi_flush"; /* Function Name for error reporting */
@@ -1937,7 +1937,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 static herr_t
 H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 {
-    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file = (H5FD_multi_t *)_file;
     H5FD_mem_t         mt;
     int                nerrors = 0;
     static const char *func    = "H5FD_multi_truncate"; /* Function Name for error reporting */
@@ -1980,7 +1980,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 static herr_t
 H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
 {
-    H5FD_multi_t *     file    = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file    = (H5FD_multi_t *)_file;
     int                nerrors = 0;
     H5FD_mem_t         out_mt  = H5FD_MEM_DEFAULT;
     static const char *func    = "H5FD_multi_unlock"; /* Function Name for error reporting */
@@ -2041,7 +2041,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
 static herr_t
 H5FD_multi_unlock(H5FD_t *_file)
 {
-    H5FD_multi_t *     file    = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file    = (H5FD_multi_t *)_file;
     int                nerrors = 0;
     static const char *func    = "H5FD_multi_unlock"; /* Function Name for error reporting */
 
@@ -2182,7 +2182,7 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
     int                      nchars;
     const H5FD_multi_fapl_t *fa;
     H5FD_multi_fapl_t        default_fa;
-    static const char *      func = "H5FD_multi_delete"; /* Function Name for error reporting    */
+    static const char       *func = "H5FD_multi_delete"; /* Function Name for error reporting    */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -2253,7 +2253,7 @@ H5_MULTI_GCC_DIAG_ON("format-nonliteral")
 static herr_t
 H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *input, void **output)
 {
-    H5FD_multi_t *     file      = (H5FD_multi_t *)_file;
+    H5FD_multi_t      *file      = (H5FD_multi_t *)_file;
     static const char *func      = "H5FD_multi_ctl"; /* Function Name for error reporting */
     herr_t             ret_value = 0;