Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

1 files changed, 48 insertions, 48 deletions

diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index 827daf3..ee94ec8 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -134,10 +134,10 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
 {
     hid_t             obj;
     herr_t            ret      = SUCCEED;
-    char *            obj_path = NULL; /* Full path of object */
+    char             *obj_path = NULL; /* Full path of object */
     h5tools_str_t     buffer;          /* string into which to render */
     h5tools_context_t ctx;             /* print context */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position */
 
@@ -585,7 +585,7 @@ int
 xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen)
 {
     H5O_token_t obj_token;
-    char *      obj_tok_str = NULL;
+    char       *obj_tok_str = NULL;
     int         lookup_ret;
 
     if (outlen < 22)
@@ -659,8 +659,8 @@ xml_escape_the_name(const char *str)
     size_t      len;
     size_t      i;
     const char *cp;
-    char *      ncp;
-    char *      rcp;
+    char       *ncp;
+    char       *rcp;
     size_t      ncp_len;
 
     if (!str)
@@ -749,8 +749,8 @@ xml_escape_the_string(const char *str, int slen)
     size_t      len;
     size_t      i;
     const char *cp  = NULL;
-    char *      ncp = NULL;
-    char *      rcp = NULL;
+    char       *ncp = NULL;
+    char       *rcp = NULL;
     size_t      ncp_len;
 
     if (!str)
@@ -851,7 +851,7 @@ xml_escape_the_string(const char *str, int slen)
 static void
 xml_print_datatype(hid_t type, unsigned in_group)
 {
-    char *            mname;
+    char             *mname;
     hid_t             mtype;
     unsigned          nmembers;
     unsigned          ndims;
@@ -873,7 +873,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
     htri_t            is_vlstr = FALSE;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -903,7 +903,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
     if (!in_group && H5Tcommitted(type) > 0) {
         H5O_info2_t oinfo;
-        obj_t *     found_obj; /* Found object */
+        obj_t      *found_obj; /* Found object */
 
         /* detect a shared datatype, output only once */
         H5Oget_info3(type, &oinfo, H5O_INFO_BASIC);
@@ -1571,7 +1571,7 @@ xml_dump_datatype(hid_t type)
 {
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -1604,7 +1604,7 @@ xml_dump_datatype(hid_t type)
 
     if (H5Tcommitted(type) > 0) {
         H5O_info2_t oinfo;
-        obj_t *     found_obj; /* Found object */
+        obj_t      *found_obj; /* Found object */
 
         /* Datatype is a shared or named datatype */
         H5Oget_info3(type, &oinfo, H5O_INFO_BASIC);
@@ -1703,7 +1703,7 @@ xml_dump_dataspace(hid_t space)
     int               i;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -1879,7 +1879,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
     hsize_t           curr_pos = 0; /* total data element position   */
     h5tools_str_t     buffer;       /* string into which to render   */
     h5tools_context_t ctx;          /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
@@ -2046,7 +2046,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     hsize_t           curr_pos = 0; /* total data element position   */
     h5tools_str_t     buffer;       /* string into which to render   */
     h5tools_context_t ctx;          /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
 
     char *t_aname = xml_escape_the_name(attr_name);
@@ -2362,14 +2362,14 @@ xml_dump_named_datatype(hid_t type, const char *name)
     hsize_t           curr_pos = 0; /* total data element position   */
     h5tools_str_t     buffer;       /* string into which to render   */
     h5tools_context_t ctx;          /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    char *            tmp       = NULL;
-    char *            dtxid     = NULL;
-    char *            parentxid = NULL;
-    char *            t_tmp     = NULL;
-    char *            t_prefix  = NULL;
-    char *            t_name    = NULL;
+    char             *tmp       = NULL;
+    char             *dtxid     = NULL;
+    char             *parentxid = NULL;
+    char             *t_tmp     = NULL;
+    char             *t_prefix  = NULL;
+    char             *t_name    = NULL;
 
     tmp = (char *)HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2);
     if (tmp == NULL) {
@@ -2570,14 +2570,14 @@ xml_dump_group(hid_t gid, const char *name)
     unsigned          attr_crt_order_flags;
     int               isRoot = 0;
     char              type_name[1024];
-    char *            t_objname = NULL;
-    char *            par_name  = NULL;
-    char *            cp        = NULL;
-    char *            tmp       = NULL;
-    char *            par       = NULL;
+    char             *t_objname = NULL;
+    char             *par_name  = NULL;
+    char             *cp        = NULL;
+    char             *tmp       = NULL;
+    char             *par       = NULL;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -2952,11 +2952,11 @@ xml_print_refs(hid_t did, int source)
     hid_t             space = H5I_INVALID_HID;
     hssize_t          ssiz  = -1;
     hsize_t           i;
-    H5R_ref_t *       refbuf = NULL;
-    char *            buf    = NULL;
+    H5R_ref_t        *refbuf = NULL;
+    char             *buf    = NULL;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -3105,12 +3105,12 @@ xml_print_strs(hid_t did, int source)
     size_t            tsiz     = 0;
     hsize_t           i;
     size_t            str_size  = 0;
-    char *            bp        = NULL;
-    char *            onestring = NULL;
-    void *            buf       = NULL;
+    char             *bp        = NULL;
+    char             *onestring = NULL;
+    void             *buf       = NULL;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -3277,7 +3277,7 @@ check_filters(hid_t dcpl)
     unsigned int      flags;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -3414,11 +3414,11 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     size_t            sz;
     size_t            i;
     hsize_t           space;
-    void *            buf;
-    char *            name;
+    void             *buf;
+    char             *name;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -3766,20 +3766,20 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     hid_t             dcpl;
     H5D_fill_value_t  fvstatus;
     int               maxdims;
-    hsize_t *         chsize;
+    hsize_t          *chsize;
     int               ndims;
     int               i;
     H5D_alloc_time_t  at;
     H5D_fill_time_t   ft;
     hsize_t           tempi;
-    char *            tmp;
-    char *            t_name;
-    char *            t_tmp;
-    char *            t_prefix;
+    char             *tmp;
+    char             *t_name;
+    char             *t_tmp;
+    char             *t_prefix;
     unsigned          attr_crt_order_flags;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -4377,8 +4377,8 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
 static void
 xml_print_enum(hid_t type)
 {
-    char **           name  = NULL;             /*member names                   */
-    unsigned char *   value = NULL;             /*value array                    */
+    char            **name  = NULL;             /*member names                   */
+    unsigned char    *value = NULL;             /*value array                    */
     unsigned          nmembs;                   /*number of members              */
     hid_t             super;                    /*enum base integer type         */
     hid_t             native = H5I_INVALID_HID; /*native integer datatype        */
@@ -4387,7 +4387,7 @@ xml_print_enum(hid_t type)
     size_t            j;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &xml_dataformat;
+    h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */