Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

8 files changed, 26 insertions, 26 deletions

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 432abb8..6d2753e 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -455,7 +455,7 @@ test_compression(H5File &file)
         }
     }
 
-    char *   tconv_buf = new char[1000];
+    char    *tconv_buf = new char[1000];
     DataSet *dataset   = NULL;
     try {
         const hsize_t size[2] = {100, 200};
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 0a1402c..42ef910 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -297,7 +297,7 @@ test_attr_getname()
 
         // 1. With arbitrary buf_size that is larger than the name size
         size_t buf_size    = FATTR1_NAME.length() + 10;
-        char * fattr1_name = new char[buf_size + 1];
+        char  *fattr1_name = new char[buf_size + 1];
         HDmemset(fattr1_name, 0, buf_size + 1);
         ssize_t name_size = 0; // actual length of attribute name
         name_size         = fattr1.getName(fattr1_name, buf_size + 1);
@@ -1585,7 +1585,7 @@ test_string_attr()
         // Read and verify the attribute string as a string of chars; buffer
         // is dynamically allocated.
         size_t attr_size = gr_flattr1.getInMemDataSize();
-        char * fl_dyn_string_att_check;
+        char  *fl_dyn_string_att_check;
         fl_dyn_string_att_check = new char[attr_size + 1];
         gr_flattr1.read(fls_type, fl_dyn_string_att_check);
         if (HDstrcmp(fl_dyn_string_att_check, ATTRSTR_DATA.c_str()) != 0)
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index c27171b..b7355d2 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -89,13 +89,13 @@ test_compound_2()
         int e, d, c[4], b, a;
     } dst_typ_t;
 
-    src_typ_t *    s_ptr;
-    dst_typ_t *    d_ptr;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
     const int      nelmts = NTESTELEM;
     const hsize_t  four   = 4;
     int            i;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType *    array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Reordering");
@@ -202,13 +202,13 @@ test_compound_3()
         int a, c[4], e;
     } dst_typ_t;
 
-    src_typ_t *    s_ptr;
-    dst_typ_t *    d_ptr;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
     int            i;
     const int      nelmts = NTESTELEM;
     const hsize_t  four   = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType *    array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Datatype Subset Conversions");
@@ -317,13 +317,13 @@ test_compound_4()
         int   e;
     } dst_typ_t;
 
-    src_typ_t *    s_ptr;
-    dst_typ_t *    d_ptr;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
     int            i;
     const int      nelmts = NTESTELEM;
     const hsize_t  four   = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType *    array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Shrinking & Reordering");
@@ -440,8 +440,8 @@ test_compound_5()
     hsize_t    dims[1] = {4};
     src_typ_t  src[2]  = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}};
     dst_typ_t *dst;
-    void *     buf      = HDcalloc(2, sizeof(dst_typ_t));
-    void *     bkg      = HDcalloc(2, sizeof(dst_typ_t));
+    void      *buf      = HDcalloc(2, sizeof(dst_typ_t));
+    void      *bkg      = HDcalloc(2, sizeof(dst_typ_t));
     ArrayType *array_dt = NULL;
 
     // Output message about test being performed
@@ -530,8 +530,8 @@ test_compound_6()
         long d;
     } dst_typ_t;
 
-    src_typ_t *    s_ptr;
-    dst_typ_t *    d_ptr;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
     int            i;
     const int      nelmts = NTESTELEM;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index d692a5b..aec911b 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -61,7 +61,7 @@ test_transfplist()
         // Find out the length of the transform expression, allocate the buffer
         // for it, then read and verify the expression from the copied plist
         size_t tran_len    = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL));
-        char * c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
+        char  *c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
         HDmemset(c_to_f_read, 0, tran_len + 1);
         dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1);
         verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index 57761ea..0ed5633 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -136,7 +136,7 @@ test_iter_group(FileAccPropList &fapl)
 {
     hsize_t   idx;                   /* Index in the group */
     char      name[NAMELEN];         /* temporary name buffer */
-    char *    lnames[NDATASETS + 2]; /* Names of the links created */
+    char     *lnames[NDATASETS + 2]; /* Names of the links created */
     iter_info info;                  /* Custom iteration information */
     herr_t    ret;                   /* Generic return value */
 
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index 8c7f0cd..ebb457a 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -642,7 +642,7 @@ test_visit(hid_t fapl_id, hbool_t new_format)
         dims[1]                     = 2;
         cdims[0]                    = 2;
         cdims[1]                    = 2;
-        DataSpace *       dataspace = new DataSpace(RANK, dims); // create new dspace
+        DataSpace        *dataspace = new DataSpace(RANK, dims); // create new dspace
         DSetCreatPropList ds_creatplist;                         // create dataset creation prop list
         ds_creatplist.setChunk(2, cdims);                        // then modify it for compression
         ds_creatplist.setDeflate(6);
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index db32cc0..c488f0e 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -644,7 +644,7 @@ test_named()
 {
     static hsize_t ds_size[2] = {10, 20};
     unsigned       attr_data[10][20];
-    DataType *     ds_type = NULL;
+    DataType      *ds_type = NULL;
 
     SUBTEST("Named datatypes");
     try {
@@ -974,7 +974,7 @@ test_encode_decode()
         verify_val(inttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
 
         // Create an IntType instance from the decoded pointer and verify it
-        IntType *  decoded_int_ptr(static_cast<IntType *>(inttyp.decode()));
+        IntType   *decoded_int_ptr(static_cast<IntType *>(inttyp.decode()));
         H5T_sign_t int_sign = decoded_int_ptr->getSign();
         verify_val(static_cast<long>(int_sign), static_cast<long>(H5T_SGN_NONE), "DataType::decode", __LINE__,
                    __FILE__);
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 6ace763..2da487a 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -285,7 +285,7 @@ test_vlstring_array_dataset()
 
         // Create and write another dataset.
         DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space));
-        char *  wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char)));
+        char   *wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char)));
         HDmemset(wdata2, 'A', 65533);
         dataset2.write(&wdata2, vlst);
 
@@ -334,7 +334,7 @@ test_vlstrings_special()
 {
     const char *wdata[SPACE1_DIM1]  = {"one", "two", "", "four"};
     const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
-    char *      rdata[SPACE1_DIM1]; // Information read in
+    char       *rdata[SPACE1_DIM1]; // Information read in
 
     // Output message about test being performed.
     SUBTEST("Special VL Strings");
@@ -396,7 +396,7 @@ test_vlstrings_special()
         // Create the property list and set the fill value for the second
         // dataset.
         DSetCreatPropList dcpl;
-        char *            fill = NULL; // Fill value
+        char             *fill = NULL; // Fill value
         dcpl.setFillValue(vlst, &fill);
         dataset = file1.createDataSet("Dataset4", vlst, sid1, dcpl);
 
@@ -627,7 +627,7 @@ test_compact_vlstring()
  *
  *-------------------------------------------------------------------------
  */
-static char *      string_att_write = NULL;
+static char       *string_att_write = NULL;
 const H5std_string ATTRSTR_NAME("String_attr");
 const H5std_string ATTRSTR_DATA("String Attribute");
 
@@ -860,7 +860,7 @@ write_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, ch
 static void
 read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, char *data)
 {
-    char *  data_read;
+    char   *data_read;
     DataSet dset;
     try {
         dset = file.openDataSet(name);