clang 13 format #1933 (#1939)

16 files changed, 62 insertions, 62 deletions

diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index f9ec176..6ab7c62 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.cpp
@@ -70,7 +70,7 @@ main(void)
         dims[1]                     = 20;
         cdims[0]                    = 20;
         cdims[1]                    = 20;
-        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++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index d26bc25..9f51a42 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -515,7 +515,7 @@ Attribute::p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const
 
     // If there is data, allocate buffer and read it.
     if (attr_size > 0) {
-        char * strg_C    = new char[attr_size + 1];
+        char  *strg_C    = new char[attr_size + 1];
         herr_t ret_value = H5Aread(id, mem_type.getId(), strg_C);
         if (ret_value < 0) {
             delete[] strg_C; // de-allocate for fixed-len string
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index d50b2c5..cc0d925 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -78,20 +78,20 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
     // The memory and file dataspaces and the transferring property list
     // can be defaults.
     void read(void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
-              const DataSpace &          file_space = DataSpace::ALL,
+              const DataSpace           &file_space = DataSpace::ALL,
               const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
     void read(H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
-              const DataSpace &          file_space = DataSpace::ALL,
+              const DataSpace           &file_space = DataSpace::ALL,
               const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
 
     // Writes the buffered data to this dataset.
     // The memory and file dataspaces and the transferring property list
     // can be defaults.
     void write(const void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
-               const DataSpace &          file_space = DataSpace::ALL,
+               const DataSpace           &file_space = DataSpace::ALL,
                const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
     void write(const H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
-               const DataSpace &          file_space = DataSpace::ALL,
+               const DataSpace           &file_space = DataSpace::ALL,
                const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
 
     // Iterates the selected elements in the specified dataspace - not implemented in C++ style yet
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index 9970d22..ee50aed 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -41,9 +41,9 @@ class H5_DLLCPP Exception {
 
     // Returns the detailed message set at the time the exception is thrown
     H5std_string getDetailMsg() const;
-    const char * getCDetailMsg() const; // C string of detailed message
+    const char  *getCDetailMsg() const; // C string of detailed message
     H5std_string getFuncName() const;   // function name as a string object
-    const char * getCFuncName() const;  // function name as a char string
+    const char  *getCFuncName() const;  // function name as a char string
 
     // Turns on the automatic error printing.
     static void setAutoPrint(H5E_auto2_t &func, void *client_data);
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index bdd7b84..c6921f4 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -27,10 +27,10 @@ class H5_DLLCPP H5File : public Group {
     // Creates or opens an HDF5 file.
     H5File(const char *name, unsigned int flags,
            const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
-           const FileAccPropList &  access_plist = FileAccPropList::DEFAULT);
+           const FileAccPropList   &access_plist = FileAccPropList::DEFAULT);
     H5File(const H5std_string &name, unsigned int flags,
            const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
-           const FileAccPropList &  access_plist = FileAccPropList::DEFAULT);
+           const FileAccPropList   &access_plist = FileAccPropList::DEFAULT);
 
     // Open the file
     void openFile(const H5std_string &name, unsigned int flags,
@@ -77,9 +77,9 @@ class H5_DLLCPP H5File : public Group {
     static bool isHdf5(const H5std_string &name);
 
     // Determines if a file, specified by its name, can be accessed as HDF5
-    static bool isAccessible(const char *           name,
+    static bool isAccessible(const char            *name,
                              const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
-    static bool isAccessible(const H5std_string &   name,
+    static bool isAccessible(const H5std_string    &name,
                              const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
 
     // Reopens this file.
diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 31bfc26..84f3478 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -1819,7 +1819,7 @@ H5std_string
 H5Location::getLinkval(const char *name, size_t size) const
 {
     H5L_info2_t  linkinfo;
-    char *       value_C; // value in C string
+    char        *value_C; // value in C string
     size_t       val_size = size;
     H5std_string value;
     herr_t       ret_value;
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index eb9fc74..11c62ea 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -108,11 +108,11 @@ class H5_DLLCPP H5Location : public IdComponent {
     // Creates a new dataset in this location.
     DataSet createDataSet(const char *name, const DataType &data_type, const DataSpace &data_space,
                           const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
-                          const DSetAccPropList &  dapl         = DSetAccPropList::DEFAULT,
+                          const DSetAccPropList   &dapl         = DSetAccPropList::DEFAULT,
                           const LinkCreatPropList &lcpl         = LinkCreatPropList::DEFAULT) const;
     DataSet createDataSet(const H5std_string &name, const DataType &data_type, const DataSpace &data_space,
                           const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
-                          const DSetAccPropList &  dapl         = DSetAccPropList::DEFAULT,
+                          const DSetAccPropList   &dapl         = DSetAccPropList::DEFAULT,
                           const LinkCreatPropList &lcpl         = LinkCreatPropList::DEFAULT) const;
 
     // Deprecated to add LinkCreatPropList and DSetAccPropList - 1.10.3
@@ -124,12 +124,12 @@ class H5_DLLCPP H5Location : public IdComponent {
     // Opens an existing dataset at this location.
     // DSetAccPropList is added - 1.10.3
     DataSet openDataSet(const char *name, const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
-    DataSet openDataSet(const H5std_string &   name,
+    DataSet openDataSet(const H5std_string    &name,
                         const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
 
-    H5L_info2_t getLinkInfo(const char *           link_name,
+    H5L_info2_t getLinkInfo(const char            *link_name,
                             const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
-    H5L_info2_t getLinkInfo(const H5std_string &   link_name,
+    H5L_info2_t getLinkInfo(const H5std_string    &link_name,
                             const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
 
     // Returns the value of a symbolic link.
@@ -216,26 +216,26 @@ class H5_DLLCPP H5Location : public IdComponent {
     // Creates a soft link from link_name to target_name.
     void link(const char *target_name, const char *link_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void link(const H5std_string &target_name, const H5std_string &link_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Creates a hard link from new_name to curr_name.
     void link(const char *curr_name, const Group &new_loc, const char *new_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void link(const H5std_string &curr_name, const Group &new_loc, const H5std_string &new_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Creates a hard link from new_name to curr_name in same location.
     void link(const char *curr_name, const hid_t same_loc, const char *new_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void link(const H5std_string &curr_name, const hid_t same_loc, const H5std_string &new_name,
               const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-              const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Creates a link of the specified type from new_name to current_name;
     // both names are interpreted relative to the specified location id.
@@ -258,34 +258,34 @@ class H5_DLLCPP H5Location : public IdComponent {
     // Copies a link from a group to another.
     void copyLink(const char *src_name, const Group &dst, const char *dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void copyLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Makes a copy of a link in the same group.
     void copyLink(const char *src_name, const char *dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void copyLink(const H5std_string &src_name, const H5std_string &dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Renames a link in this group and moves to a new location.
     void moveLink(const char *src_name, const Group &dst, const char *dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void moveLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Renames a link in this group.
     void moveLink(const char *src_name, const char *dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
     void moveLink(const H5std_string &src_name, const H5std_string &dst_name,
                   const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
-                  const LinkAccPropList &  lapl = LinkAccPropList::DEFAULT) const;
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
 
     // Renames an object at this location.
     // Deprecated due to inadequate functionality.
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index bc2f14a..3f74a88 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -50,16 +50,16 @@ typedef int (*visit_operator_t)(H5Object &obj, const H5std_string attr_name, con
 class UserData4Aiterate {
   public:
     attr_operator_t op;
-    void *          opData;
-    H5Object *      location; // Consider changing to H5Location
+    void           *opData;
+    H5Object       *location; // Consider changing to H5Location
 };
 
 // User data for visit iteration
 class UserData4Visit {
   public:
     visit_operator_t op;
-    void *           opData;
-    H5Object *       obj;
+    void            *opData;
+    H5Object        *obj;
 };
 
 class H5_DLLCPP H5Object : public H5Location {
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index e2189a3..bc07182 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -450,7 +450,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 dc968f9..1f1c0c4 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);
@@ -1586,7 +1586,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 5a78133..9022c68 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
         ssize_t tran_len    = 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 8afb4bb..5cb8adb 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -657,7 +657,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 {
@@ -987,7 +987,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 405ca07..fc1b504 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);