Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

5 files changed, 89 insertions, 89 deletions

diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 22b869c..be68a47 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -18,7 +18,7 @@
 /* Name of tool */
 #define PROGRAMNAME "h5dump"
 
-const char *       outfname_g    = NULL;
+const char        *outfname_g    = NULL;
 static hbool_t     doxml_g       = FALSE;
 static hbool_t     useschema_g   = TRUE;
 static const char *xml_dtd_uri_g = NULL;
@@ -70,7 +70,7 @@ static void init_prefix(char **prfx, size_t prfx_len);
 /* a structure for handling the order command-line parameters come in */
 struct handler_t {
     void (*func)(hid_t, const char *, void *, int, const char *);
-    char *           obj;
+    char            *obj;
     struct subset_t *subset_info;
 };
 
@@ -81,7 +81,7 @@ struct handler_t {
  */
 /* The following initialization makes use of C language concatenating */
 /* "xxx" "yyy" into "xxxyyy". */
-static const char *           s_opts   = "a:b*c:d:ef:g:hik:l:m:n*o*pq:rs:t:uvw:xyz:A*BCD:E*F:G:HM:N:O*RS:VX:";
+static const char            *s_opts   = "a:b*c:d:ef:g:hik:l:m:n*o*pq:rs:t:uvw:xyz:A*BCD:E*F:G:HM:N:O*RS:VX:";
 static struct h5_long_options l_opts[] = {{"attribute", require_arg, 'a'},
                                           {"binary", optional_arg, 'b'},
                                           {"count", require_arg, 'c'},
@@ -569,8 +569,8 @@ set_sort_order(const char *form)
 static void
 parse_hsize_list(const char *h_list, subset_d *d)
 {
-    hsize_t *    p_list;
-    const char * ptr;
+    hsize_t     *p_list;
+    const char  *ptr;
     unsigned int size_count = 0;
     unsigned int i          = 0;
     unsigned int last_digit = 0;
@@ -623,7 +623,7 @@ static struct subset_t *
 parse_subset_params(const char *dset)
 {
     struct subset_t *s = NULL;
-    char *           brace;
+    char            *brace;
 
     if (!dump_opts.disable_compact_subset && ((brace = HDstrrchr(dset, '[')) != NULL)) {
         *brace++ = '\0';
@@ -678,7 +678,7 @@ parse_mask_list(const char *h_list)
     int                slength_value;
     unsigned           length_value;
     unsigned long long temp_mask;
-    const char *       ptr = NULL;
+    const char        *ptr = NULL;
 
     /* sanity check */
     if (h_list) {
@@ -1344,7 +1344,7 @@ main(int argc, char *argv[])
     struct handler_t *hand = NULL;
     int               i;
     unsigned          u;
-    char *            fname = NULL;
+    char             *fname = NULL;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
diff --git a/tools/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h
index a53d1ba..6ad1cb6 100644
--- a/tools/src/h5dump/h5dump.h
+++ b/tools/src/h5dump/h5dump.h
@@ -39,9 +39,9 @@ typedef struct dump_functions_t {
 typedef struct h5dump_table_items_t {
     unsigned long fileno;      /* File number that these tables refer to */
     hid_t         oid;         /* ID of an object in this file, held open so fileno is consistent */
-    table_t *     group_table; /* Table of groups */
-    table_t *     dset_table;  /* Table of datasets */
-    table_t *     type_table;  /* Table of datatypes */
+    table_t      *group_table; /* Table of groups */
+    table_t      *dset_table;  /* Table of datasets */
+    table_t      *type_table;  /* Table of datatypes */
 } h5dump_table_items_t;
 
 typedef struct h5dump_table_list_t {
@@ -51,13 +51,13 @@ typedef struct h5dump_table_list_t {
 } h5dump_table_list_t;
 
 h5dump_table_list_t table_list  = {0, 0, NULL};
-table_t *           group_table = NULL, *dset_table = NULL, *type_table = NULL;
+table_t            *group_table = NULL, *dset_table = NULL, *type_table = NULL;
 
 unsigned    dump_indent = 0;     /* how far in to indent the line */
 int         unamedtype  = 0;     /* shared datatype with no name */
 hbool_t     hit_elink   = FALSE; /* whether we have traversed an external link */
 size_t      prefix_len  = 1024;
-char *      prefix      = NULL;
+char       *prefix      = NULL;
 const char *fp_format   = NULL;
 
 /* things to display or which are set via command line parameters */
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 939e5fe..7ca103e 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -47,7 +47,7 @@ void
 dump_datatype(hid_t type)
 {
     h5tools_context_t ctx; /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
@@ -71,7 +71,7 @@ void
 dump_dataspace(hid_t space)
 {
     h5tools_context_t ctx; /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
@@ -94,7 +94,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
              void H5_ATTR_UNUSED *_op_data)
 {
     h5tools_context_t ctx; /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
 
     hid_t  attr_id;
@@ -156,10 +156,10 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
     hid_t             obj;
     hid_t             dapl_id  = H5P_DEFAULT; /* dataset access property list ID */
     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 = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -631,7 +631,7 @@ dump_named_datatype(hid_t tid, 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 = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
 
     /* setup */
@@ -764,7 +764,7 @@ dump_group(hid_t gid, const char *name)
     char              type_name[1024];
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -918,7 +918,7 @@ void
 dump_dataset(hid_t did, const char *name, struct subset_t *sset)
 {
     h5tools_context_t ctx; /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
     hid_t             type, space;
     unsigned          attr_crt_order_flags;
@@ -1092,7 +1092,7 @@ void
 dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
 {
     h5tools_context_t ctx; /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
     int               print_dataset = FALSE;
 
@@ -1309,11 +1309,11 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
 {
     herr_t             ret = SUCCEED;
     int                j;
-    char *             obj_op_name;
-    char *             obj_name;
+    char              *obj_op_name;
+    char              *obj_name;
     trav_attr_udata_t *attr_data = (trav_attr_udata_t *)_op_data;
-    const char *       buf       = attr_data->path;
-    const char *       op_name   = attr_data->op_name;
+    const char        *buf       = attr_data->path;
+    const char        *op_name   = attr_data->op_name;
 
     j = (int)HDstrlen(op_name) - 1;
     /* find the last / */
@@ -1373,7 +1373,7 @@ obj_search(const char *path, const H5O_info2_t *oi, const char H5_ATTR_UNUSED *a
            void *_op_data)
 {
     trav_handle_udata_t *handle_data = (trav_handle_udata_t *)_op_data;
-    const char *         op_name     = handle_data->op_name;
+    const char          *op_name     = handle_data->op_name;
     trav_attr_udata_t    attr_data;
 
     attr_data.path    = path;
@@ -1412,9 +1412,9 @@ lnk_search(const char *path, const H5L_info2_t *li, void *_op_data)
 {
     size_t               search_len;
     size_t               k;
-    char *               search_name;
+    char                *search_name;
     trav_handle_udata_t *handle_data = (trav_handle_udata_t *)_op_data;
-    const char *         op_name     = handle_data->op_name;
+    const char          *op_name     = handle_data->op_name;
 
     search_len = HDstrlen(op_name);
     if (search_len > 0 && op_name[0] != '/')
@@ -1525,12 +1525,12 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
 {
     hid_t             oid       = H5I_INVALID_HID;
     hid_t             attr_id   = H5I_INVALID_HID;
-    char *            obj_name  = NULL;
-    char *            attr_name = NULL;
+    char             *obj_name  = NULL;
+    char             *attr_name = NULL;
     int               j;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
-    h5tool_format_t * outputformat = &h5tools_dataformat;
+    h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
@@ -1669,7 +1669,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
     hid_t            dsetid;
     hid_t            dapl_id   = H5P_DEFAULT; /* dataset access property list ID */
     struct subset_t *sset      = (struct subset_t *)data;
-    const char *     real_name = display_name ? display_name : dset;
+    const char      *real_name = display_name ? display_name : dset;
 
     if (dump_opts.display_data) {
         if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
@@ -2043,9 +2043,9 @@ dump_extlink(hid_t group, const char *linkname, const char *objname)
 {
     hid_t       oid;
     H5O_info2_t oi;
-    table_t *   old_group_table = group_table;
-    table_t *   old_dset_table  = dset_table;
-    table_t *   old_type_table  = type_table;
+    table_t    *old_group_table = group_table;
+    table_t    *old_dset_table  = dset_table;
+    table_t    *old_type_table  = type_table;
     hbool_t     old_hit_elink;
     ssize_t     idx;
 
diff --git a/tools/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h
index 308f602..1139390 100644
--- a/tools/src/h5dump/h5dump_extern.h
+++ b/tools/src/h5dump/h5dump_extern.h
@@ -42,20 +42,20 @@ typedef struct h5dump_table_list_t {
     struct {
         unsigned long fileno;      /* File number that these tables refer to */
         hid_t         oid;         /* ID of an object in this file, held open so fileno is consistent */
-        table_t *     group_table; /* Table of groups */
-        table_t *     dset_table;  /* Table of datasets */
-        table_t *     type_table;  /* Table of datatypes */
+        table_t      *group_table; /* Table of groups */
+        table_t      *dset_table;  /* Table of datasets */
+        table_t      *type_table;  /* Table of datatypes */
     } * tables;
 } h5dump_table_list_t;
 
 extern h5dump_table_list_t table_list;
-extern table_t *           group_table, *dset_table, *type_table;
+extern table_t            *group_table, *dset_table, *type_table;
 
 extern unsigned    dump_indent; /* how far in to indent the line */
 extern int         unamedtype;  /* shared datatype with no name */
 extern hbool_t     hit_elink;   /* whether we have traversed an external link */
 extern size_t      prefix_len;
-extern char *      prefix;
+extern char       *prefix;
 extern const char *fp_format;
 
 /* things to display or which are set via command line parameters */
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   */