Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

7 files changed, 35 insertions, 35 deletions

diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index c9490ee..8fd2543 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -517,7 +517,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 8430f7a..104638e 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 e22f74b..0607803 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 daed073..67c033c 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 e128303..a203863 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -1817,7 +1817,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 0aec4d2..b08a252 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 9e5a541..25ab4e8 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 {