Add .clang-format and bin/format_source from hdf5_1_12_1. (#822)

Reformat source with clang 10.0.1.

80 files changed, 18528 insertions, 20305 deletions

diff --git a/hl/c++/examples/ptExampleFL.cpp b/hl/c++/examples/ptExampleFL.cpp
index 26cbf09..d0b62da 100644
--- a/hl/c++/examples/ptExampleFL.cpp
+++ b/hl/c++/examples/ptExampleFL.cpp
@@ -22,56 +22,55 @@
  *-------------------------------------------------------------------------
  */
 
-const char* FILE_NAME("PTcppexampleFL.h5");
-const char* PT_NAME("/examplePacketTable");
+const char *FILE_NAME("PTcppexampleFL.h5");
+const char *PT_NAME("/examplePacketTable");
 
-int main(void)
+int
+main(void)
 {
-    herr_t err;     /* Return value from function calls */
-    hid_t fileID;   /* HDF5 identifier for file */
-    hid_t plistID;  /* HDF5 identifier for property list to use compression */
-    hsize_t count;  /* Number of records in table */
-    int x;          /* Temporary counter variable */
+    herr_t  err;     /* Return value from function calls */
+    hid_t   fileID;  /* HDF5 identifier for file */
+    hid_t   plistID; /* HDF5 identifier for property list to use compression */
+    hsize_t count;   /* Number of records in table */
+    int     x;       /* Temporary counter variable */
 
     /* Buffers to hold data */
     int readBuffer[5];
     int writeBuffer[5];
 
     /* Initialize buffers */
-    for(x=0; x<5; x++)
-    {
-        writeBuffer[x]=x;
-        readBuffer[x] = -1;
+    for (x = 0; x < 5; x++) {
+        writeBuffer[x] = x;
+        readBuffer[x]  = -1;
     }
 
     /* Create a new HDF5 file */
     fileID = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if(fileID <0)
+    if (fileID < 0)
         fprintf(stderr, "Couldn't create file.\n");
 
     /* Prepare property list to set compression, randomly use deflate
        with compression level 5. */
     plistID = H5Pcreate(H5P_DATASET_CREATE);
-    err = H5Pset_deflate(plistID, 5);
-    if(err < 0)
+    err     = H5Pset_deflate(plistID, 5);
+    if (err < 0)
         fprintf(stderr, "Error setting compression level.");
 
     /* Create a fixed-length packet table. */
     FL_PacketTable ptable(fileID, plistID, PT_NAME, H5T_NATIVE_INT, 100);
-    if(! ptable.IsValid())
+    if (!ptable.IsValid())
         fprintf(stderr, "Unable to create packet table.");
 
     /* Append five packets to the packet table, one at a time */
-    for(x=0; x<5; x++)
-    {
-        err = ptable.AppendPacket( &(writeBuffer[x]) );
-        if(err<0)
+    for (x = 0; x < 5; x++) {
+        err = ptable.AppendPacket(&(writeBuffer[x]));
+        if (err < 0)
             fprintf(stderr, "Error adding record.");
     }
 
     /* Get the number of packets in the packet table.  This should be five. */
     count = ptable.GetPacketCount(err);
-    if(err < 0)
+    if (err < 0)
         fprintf(stderr, "Error getting packet count.");
 
     printf("Number of packets in packet table after five appends: %d\n", count);
@@ -80,10 +79,9 @@ int main(void)
     ptable.ResetIndex();
 
     /* Iterate through packets, read each one back */
-    for(x=0; x<5; x++)
-    {
-        err = ptable.GetNextPacket( &(readBuffer[x]) );
-        if(err < 0)
+    for (x = 0; x < 5; x++) {
+        err = ptable.GetNextPacket(&(readBuffer[x]));
+        if (err < 0)
             fprintf(stderr, "Error reading record.");
 
         printf("Packet %d's value is %d.\n", x, readBuffer[x]);
@@ -93,9 +91,8 @@ int main(void)
     /* out of scope.  */
 
     err = H5Fclose(fileID);
-    if( err < 0 )
+    if (err < 0)
         fprintf(stderr, "Failed to close file.\n");
 
     return 0;
 }
-
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 544df0b..55924c2 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -24,257 +24,278 @@
 
 #include "H5PacketTable.h"
 
-    /********************************/
-    /* PacketTable superclass       */
-    /********************************/
-
-    /* "Open" Constructor
-     * Opens an existing packet table, which can contain either fixed-length or
-     * variable-length packets.
-     */
-    PacketTable::PacketTable(hid_t fileID, const char* name)
-    {
-        table_id = H5PTopen( fileID, name);
-    }
-
-    /* "Open" Constructor - will be deprecated because of char* name */
-    PacketTable::PacketTable(hid_t fileID, char* name)
-    {
-        table_id = H5PTopen( fileID, name);
-    }
-
-    /* Destructor
-     * Cleans up the packet table
-     */
-    PacketTable::~PacketTable()
-    {
-        H5PTclose( table_id);
-    }
-
-    /* IsValid
-     * Returns true if this packet table is valid, false otherwise.
-     * Use this after the constructor to ensure HDF did not have
-     * any trouble making or opening the packet table.
-     */
-    bool PacketTable::IsValid()
-    {
-        if (H5PTis_valid(table_id) == 0)
-            return true;
-        else
-            return false;
-    }
-
-    /* IsVariableLength
-     * Return 1 if this packet table uses variable-length datatype,
-     * and 0, otherwise.  Returns -1 if the table is invalid (not open).
-     */
-    int PacketTable::IsVariableLength()
-    {
-        return H5PTis_varlen(table_id);
-    }
-
-    /* ResetIndex
-     * Sets the index to point to the first packet in the packet table
-     */
-    void PacketTable::ResetIndex()
-    {
-        H5PTcreate_index(table_id);
-    }
-
-    /* SetIndex
-     * Sets the index to point to the packet specified by index.
-     * Returns 0 on success, negative on failure (if index is out of bounds)
-     */
-    int PacketTable::SetIndex(hsize_t index)
-    {
-        return H5PTset_index(table_id, index);
-    }
-
-    /* SetIndex
-     * Sets the index to point to the packet specified by index.
-     * Returns 0 on success, negative on failure (if index is out of bounds)
-     */
-    hsize_t PacketTable::GetIndex(int &error)
-    {
-        hsize_t index;
-
-        error = H5PTget_index(table_id, &index);
-        if(error < 0)
-           return 0;
-        else
-           return index;
-    }
-
-    /* GetPacketCount
-     * Returns the number of packets in the packet table.  Error
-     * is set to 0 on success.  On failure, returns 0 and
-     * error is set to negative.
-     */
-    hsize_t PacketTable::GetPacketCount(int& error)
-    {
-        hsize_t npackets;
-
-        error = H5PTget_num_packets(table_id, &npackets);
-        return npackets;
-    }
-
-    /* GetTableId
-     * Returns the identifier of the packet table
-     */
-    hid_t PacketTable::GetTableId()
-    {
-        return table_id;
-    }
-
-    /* GetDatatype
-     * Returns the datatype identifier used by the packet table, on success,
-     * or H5I_INVALID_HID, on failure.
-     * Note: it is best to avoid using this identifier in applications, unless
-     * the desired functionality cannot be performed via the packet table ID.
-     */
-    hid_t PacketTable::GetDatatype()
-    {
-        return H5PTget_type(table_id);
-    }
-
-    /* GetDataset
-     * Returns the dataset identifier associated with the packet table, on
-     * success, or H5I_INVALID_HID, on failure.
-     * Note: it is best to avoid using this identifier in applications, unless
-     * the desired functionality cannot be performed via the packet table ID.
-     */
-    hid_t PacketTable::GetDataset()
-    {
-        return H5PTget_dataset(table_id);
-    }
-
-    /* FreeBuff
-     * Frees the buffers created when variable-length packets are read.
-     * Takes the number of hvl_t structs to be freed and a pointer to their
-     * location in memory.
-     * Returns 0 on success, negative on error.
-     */
-    int PacketTable::FreeBuff(size_t numStructs, hvl_t * buffer)
-    {
-        return H5PTfree_vlen_buff( table_id, numStructs, buffer);
-    }
-
-
-    /********************************/
-    /* Fixed-Length Packet Table    */
-    /********************************/
-
-    /* Constructor
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the ID of
-     * the property list to specify compression, the name of the packet table,
-     * the ID of the datatype, and the size of a memory chunk used in chunking.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, hid_t plistID)
-    {
-        table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
-    }
-
-    /* Constructor - deprecated
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the ID of
-     * the property list to specify compression, the name of the packet table,
-     * the ID of the datatype, and the size of a memory chunk used in chunking.
-     * Note: The above constructor has a better prototype, which allows default
-     * values to be used.  This constructor was only released in 1.10.0.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, hid_t plistID, const char* name, hid_t dtypeID, hsize_t chunkSize)
-    {
-        table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
-    }
-
-    /* Constructor
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the name of
-     * the packet table, the ID of the datatype of the set, and the size
-     * of a memory chunk used in chunking.
-     * Note: this overload will be deprecated in favor of the constructor above.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression)
-    {
-        table_id = H5PTcreate_fl(fileID, name, dtypeID, chunkSize, compression);
-    }
-
-    /* "Open" Constructor
-     * Opens an existing fixed-length packet table.
-     * Fails if the packet table specified is variable-length.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name) : PacketTable(fileID, name) {}
-
-    /* "Open" Constructor - will be deprecated because of char* name */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name) {}
-
-    /* AppendPacket
-     * Adds a single packet to the packet table.  Takes a pointer
-     * to the location of the data in memory.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::AppendPacket(void * data)
-    {
-        return H5PTappend(table_id, 1, data);
-    }
-
-    /* AppendPackets (multiple packets)
-     * Adds multiple packets to the packet table.  Takes the number of packets
-     * to be added and a pointer to their location in memory.
-     * Returns 0 on success, -1 on failure.
-     */
-    int FL_PacketTable::AppendPackets(size_t numPackets, void * data)
-    {
-        return H5PTappend(table_id, numPackets, data);
-    }
-
-    /* GetPacket (indexed)
-     * Gets a single packet from the packet table.  Takes the index
-     * of the packet (with 0 being the first packet) and a pointer
-     * to memory where the data should be stored.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::GetPacket(hsize_t index, void * data)
-    {
-        return H5PTread_packets(table_id, index, 1, data);
-    }
-
-    /* GetPackets (multiple packets)
-     * Gets multiple packets at once, all packets between
-     * startIndex and endIndex inclusive.  Also takes a pointer to
-     * the memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.
-     */
-    int FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void * data)
-    {
-        // Make sure the range of indexes is valid
-        if (startIndex > endIndex)
-            return -1;
-
-        return  H5PTread_packets(table_id, startIndex, (size_t)(endIndex-startIndex+1), data);
-    }
-
-    /* GetNextPacket (single packet)
-     * Gets the next packet in the packet table.  Takes a pointer to
-     * memory where the packet should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced to the next packet on failure.
-     */
-    int FL_PacketTable::GetNextPacket(void * data)
-    {
-        return H5PTget_next(table_id, 1, data);
-    }
-
-    /* GetNextPackets (multiple packets)
-     * Gets the next numPackets packets in the packet table.  Takes a
-     * pointer to memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced on failure.
-     */
-    int FL_PacketTable::GetNextPackets(size_t numPackets, void * data)
-    {
-        return H5PTget_next(table_id, numPackets, data);
-    }
+/********************************/
+/* PacketTable superclass       */
+/********************************/
+
+/* "Open" Constructor
+ * Opens an existing packet table, which can contain either fixed-length or
+ * variable-length packets.
+ */
+PacketTable::PacketTable(hid_t fileID, const char *name)
+{
+    table_id = H5PTopen(fileID, name);
+}
+
+/* "Open" Constructor - will be deprecated because of char* name */
+PacketTable::PacketTable(hid_t fileID, char *name)
+{
+    table_id = H5PTopen(fileID, name);
+}
+
+/* Destructor
+ * Cleans up the packet table
+ */
+PacketTable::~PacketTable()
+{
+    H5PTclose(table_id);
+}
+
+/* IsValid
+ * Returns true if this packet table is valid, false otherwise.
+ * Use this after the constructor to ensure HDF did not have
+ * any trouble making or opening the packet table.
+ */
+bool
+PacketTable::IsValid()
+{
+    if (H5PTis_valid(table_id) == 0)
+        return true;
+    else
+        return false;
+}
+
+/* IsVariableLength
+ * Return 1 if this packet table uses variable-length datatype,
+ * and 0, otherwise.  Returns -1 if the table is invalid (not open).
+ */
+int
+PacketTable::IsVariableLength()
+{
+    return H5PTis_varlen(table_id);
+}
+
+/* ResetIndex
+ * Sets the index to point to the first packet in the packet table
+ */
+void
+PacketTable::ResetIndex()
+{
+    H5PTcreate_index(table_id);
+}
+
+/* SetIndex
+ * Sets the index to point to the packet specified by index.
+ * Returns 0 on success, negative on failure (if index is out of bounds)
+ */
+int
+PacketTable::SetIndex(hsize_t index)
+{
+    return H5PTset_index(table_id, index);
+}
+
+/* SetIndex
+ * Sets the index to point to the packet specified by index.
+ * Returns 0 on success, negative on failure (if index is out of bounds)
+ */
+hsize_t
+PacketTable::GetIndex(int &error)
+{
+    hsize_t index;
+
+    error = H5PTget_index(table_id, &index);
+    if (error < 0)
+        return 0;
+    else
+        return index;
+}
+
+/* GetPacketCount
+ * Returns the number of packets in the packet table.  Error
+ * is set to 0 on success.  On failure, returns 0 and
+ * error is set to negative.
+ */
+hsize_t
+PacketTable::GetPacketCount(int &error)
+{
+    hsize_t npackets;
+
+    error = H5PTget_num_packets(table_id, &npackets);
+    return npackets;
+}
+
+/* GetTableId
+ * Returns the identifier of the packet table
+ */
+hid_t
+PacketTable::GetTableId()
+{
+    return table_id;
+}
+
+/* GetDatatype
+ * Returns the datatype identifier used by the packet table, on success,
+ * or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDatatype()
+{
+    return H5PTget_type(table_id);
+}
+
+/* GetDataset
+ * Returns the dataset identifier associated with the packet table, on
+ * success, or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDataset()
+{
+    return H5PTget_dataset(table_id);
+}
+
+/* FreeBuff
+ * Frees the buffers created when variable-length packets are read.
+ * Takes the number of hvl_t structs to be freed and a pointer to their
+ * location in memory.
+ * Returns 0 on success, negative on error.
+ */
+int
+PacketTable::FreeBuff(size_t numStructs, hvl_t *buffer)
+{
+    return H5PTfree_vlen_buff(table_id, numStructs, buffer);
+}
+
+/********************************/
+/* Fixed-Length Packet Table    */
+/********************************/
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize,
+                               hid_t plistID)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor - deprecated
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ * Note: The above constructor has a better prototype, which allows default
+ * values to be used.  This constructor was only released in 1.10.0.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, hid_t plistID, const char *name, hid_t dtypeID,
+                               hsize_t chunkSize)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the name of
+ * the packet table, the ID of the datatype of the set, and the size
+ * of a memory chunk used in chunking.
+ * Note: this overload will be deprecated in favor of the constructor above.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression)
+{
+    table_id = H5PTcreate_fl(fileID, name, dtypeID, chunkSize, compression);
+}
+
+/* "Open" Constructor
+ * Opens an existing fixed-length packet table.
+ * Fails if the packet table specified is variable-length.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name) : PacketTable(fileID, name)
+{
+}
+
+/* "Open" Constructor - will be deprecated because of char* name */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name) : PacketTable(fileID, name)
+{
+}
+
+/* AppendPacket
+ * Adds a single packet to the packet table.  Takes a pointer
+ * to the location of the data in memory.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::AppendPacket(void *data)
+{
+    return H5PTappend(table_id, 1, data);
+}
+
+/* AppendPackets (multiple packets)
+ * Adds multiple packets to the packet table.  Takes the number of packets
+ * to be added and a pointer to their location in memory.
+ * Returns 0 on success, -1 on failure.
+ */
+int
+FL_PacketTable::AppendPackets(size_t numPackets, void *data)
+{
+    return H5PTappend(table_id, numPackets, data);
+}
+
+/* GetPacket (indexed)
+ * Gets a single packet from the packet table.  Takes the index
+ * of the packet (with 0 being the first packet) and a pointer
+ * to memory where the data should be stored.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::GetPacket(hsize_t index, void *data)
+{
+    return H5PTread_packets(table_id, index, 1, data);
+}
+
+/* GetPackets (multiple packets)
+ * Gets multiple packets at once, all packets between
+ * startIndex and endIndex inclusive.  Also takes a pointer to
+ * the memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.
+ */
+int
+FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void *data)
+{
+    // Make sure the range of indexes is valid
+    if (startIndex > endIndex)
+        return -1;
+
+    return H5PTread_packets(table_id, startIndex, (size_t)(endIndex - startIndex + 1), data);
+}
+
+/* GetNextPacket (single packet)
+ * Gets the next packet in the packet table.  Takes a pointer to
+ * memory where the packet should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced to the next packet on failure.
+ */
+int
+FL_PacketTable::GetNextPacket(void *data)
+{
+    return H5PTget_next(table_id, 1, data);
+}
+
+/* GetNextPackets (multiple packets)
+ * Gets the next numPackets packets in the packet table.  Takes a
+ * pointer to memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced on failure.
+ */
+int
+FL_PacketTable::GetNextPackets(size_t numPackets, void *data)
+{
+    return H5PTget_next(table_id, numPackets, data);
+}
 
 /* Removed "ifdef VLPT_REMOVED" block. 03/08/2016, -BMR */
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 2665984..835b9c2 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -28,22 +28,24 @@
 #include "H5PTpublic.h"
 #include "H5api_adpt.h"
 
-class H5_HLCPPDLL  PacketTable
-{
-public:
+class H5_HLCPPDLL PacketTable {
+  public:
     /* Null constructor
      * Sets table_id to "invalid"
      */
-    PacketTable() {table_id = H5I_BADID;}
+    PacketTable()
+    {
+        table_id = H5I_BADID;
+    }
 
     /* "Open" Constructor
      * Opens an existing packet table, which can contain either fixed-length or
      * variable-length packets.
      */
-    PacketTable(hid_t fileID, const char* name);
+    PacketTable(hid_t fileID, const char *name);
 
     /* "Open" Constructor - will be deprecated because of char* name */
-    PacketTable(hid_t fileID, char* name);
+    PacketTable(hid_t fileID, char *name);
 
     /* Destructor
      * Cleans up the packet table
@@ -80,16 +82,17 @@ public:
      * Returns the position of the current packet.
      * On failure, returns 0 and error is set to negative.
      */
-    hsize_t GetIndex(int& error);
+    hsize_t GetIndex(int &error);
 
     /* GetPacketCount
      * Returns the number of packets in the packet table.  Error
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    hsize_t GetPacketCount(int& error);
+    hsize_t GetPacketCount(int &error);
 
-    hsize_t GetPacketCount()
+    hsize_t
+    GetPacketCount()
     {
         int ignoreError;
         return GetPacketCount(ignoreError);
@@ -122,22 +125,22 @@ public:
      * location in memory.
      * Returns 0 on success, negative on error.
      */
-    int FreeBuff(size_t numStructs, hvl_t * buffer);
+    int FreeBuff(size_t numStructs, hvl_t *buffer);
 
-protected:
+  protected:
     hid_t table_id;
 };
 
-class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable
-{
-public:
+class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable {
+  public:
     /* Constructor
      * Creates a packet table to store either fixed- or variable-length packets.
      * Takes the ID of the file the packet table will be created in, the ID of
      * the property list to specify compression, the name of the packet table,
      * the ID of the datatype, and the size of a memory chunk used in chunking.
      */
-    FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize = 0, hid_t plistID = H5P_DEFAULT);
+    FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize = 0,
+                   hid_t plistID = H5P_DEFAULT);
 
     /* Constructors - deprecated
      * Creates a packet table in which to store fixed length packets.
@@ -148,36 +151,36 @@ public:
      * Note: these overloaded constructors will be deprecated in favor of the
      * constructor above.
      */
-    FL_PacketTable(hid_t fileID, hid_t plist_id, const char* name, hid_t dtypeID, hsize_t chunkSize);
-    FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression = 0);
+    FL_PacketTable(hid_t fileID, hid_t plist_id, const char *name, hid_t dtypeID, hsize_t chunkSize);
+    FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression = 0);
 
     /* "Open" Constructor
      * Opens an existing fixed-length packet table.
      * Fails if the packet table specified is variable-length.
      */
-    FL_PacketTable(hid_t fileID, const char* name);
+    FL_PacketTable(hid_t fileID, const char *name);
 
     /* "Open" Constructor - will be deprecated because of char* name */
-    FL_PacketTable(hid_t fileID, char* name);
+    FL_PacketTable(hid_t fileID, char *name);
 
     /* Destructor
      * Cleans up the packet table
      */
-    virtual ~FL_PacketTable() {};
+    virtual ~FL_PacketTable(){};
 
     /* AppendPacket
      * Adds a single packet to the packet table.  Takes a pointer
      * to the location of the data in memory.
      * Returns 0 on success, negative on failure
      */
-    int AppendPacket(void * data);
+    int AppendPacket(void *data);
 
     /* AppendPackets (multiple packets)
      * Adds multiple packets to the packet table.  Takes the number of packets
      * to be added and a pointer to their location in memory.
      * Returns 0 on success, -1 on failure.
      */
-    int AppendPackets(size_t numPackets, void * data);
+    int AppendPackets(size_t numPackets, void *data);
 
     /* GetPacket (indexed)
      * Gets a single packet from the packet table.  Takes the index
@@ -185,7 +188,7 @@ public:
      * to memory where the data should be stored.
      * Returns 0 on success, negative on failure
      */
-    int GetPacket(hsize_t index, void * data);
+    int GetPacket(hsize_t index, void *data);
 
     /* GetPackets (multiple packets)
      * Gets multiple packets at once, all packets between
@@ -193,7 +196,7 @@ public:
      * the memory where these packets should be stored.
      * Returns 0 on success, negative on failure.
      */
-    int GetPackets(hsize_t startIndex, hsize_t endIndex, void * data);
+    int GetPackets(hsize_t startIndex, hsize_t endIndex, void *data);
 
     /* GetNextPacket (single packet)
      * Gets the next packet in the packet table.  Takes a pointer to
@@ -201,7 +204,7 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced to the next packet on failure.
      */
-    int GetNextPacket(void * data);
+    int GetNextPacket(void *data);
 
     /* GetNextPackets (multiple packets)
      * Gets the next numPackets packets in the packet table.  Takes a
@@ -209,7 +212,7 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced on failure.
      */
-    int GetNextPackets(size_t numPackets, void * data);
+    int GetNextPackets(size_t numPackets, void *data);
 };
 
 /* Removed "#ifdef VLPT_REMOVED" block.  03/08/2016, -BMR */
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index e873503..78b1a8a 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -22,41 +22,40 @@ using namespace std;
 #define TEST_FILE "packettest.h5"
 
 /* Main test function */
-int main(void)
+int
+main(void)
 {
     herr_t err;
     herr_t num_errors = 0;
 
     /* Create new HDF5 file */
     fileID = H5Fcreate(TEST_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if(fileID <0)
-    {
+    if (fileID < 0) {
         fprintf(stderr, "Couldn't create file.\n");
         num_errors = 1;
     }
     else {
 
-    num_errors += BasicTest();
+        num_errors += BasicTest();
 
-    num_errors += TestCompoundDatatype();
+        num_errors += TestCompoundDatatype();
 
-    num_errors += TestGetPacket();
+        num_errors += TestGetPacket();
 
-    num_errors += TestGetNext();
+        num_errors += TestGetNext();
 
-    num_errors += TestCompress();
+        num_errors += TestCompress();
 
-    num_errors += TestErrors();
+        num_errors += TestErrors();
 
-    num_errors += SystemTest();
+        num_errors += SystemTest();
 
-    /* Test data corruption in packed structs */
-    num_errors += TestHDFFV_9758();
+        /* Test data corruption in packed structs */
+        num_errors += TestHDFFV_9758();
 
         /* Terminate access to the file. */
         err = H5Fclose(fileID);
-        if( err < 0 )
-        {
+        if (err < 0) {
             fprintf(stderr, "Failed to close file.\n");
             num_errors++;
         }
@@ -66,38 +65,39 @@ int main(void)
     }
 
     if (num_errors == 0)
-      /* ALL TESTS PASSED */
-      return 0;
+        /* ALL TESTS PASSED */
+        return 0;
     else
-      /* ERRORS */
-      return -1;
+        /* ERRORS */
+        return -1;
 }
 
-const char* BASICTEST_PT("/basicTest");
-int BasicTest()
+const char *BASICTEST_PT("/basicTest");
+int
+BasicTest()
 {
-    herr_t err;
-    int myRecord;
+    herr_t  err;
+    int     myRecord;
     hsize_t count;
-    int error;
+    int     error;
 
     printf("Testing %-62s", "basic functionality");
     HDfflush(stdout);
 
     FL_PacketTable wrapper(fileID, H5P_DEFAULT, BASICTEST_PT, H5T_NATIVE_INT, 1);
-    if(! wrapper.IsValid())
-      goto error;
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Ensure initial count is zero */
     count = wrapper.GetPacketCount(error);
-    if(count != 0 || error != 0)
-      goto error;
+    if (count != 0 || error != 0)
+        goto error;
 
     myRecord = 1;
 
     /* add some records test */
     err = wrapper.AppendPacket(&myRecord);
-    if(err < 0)
+    if (err < 0)
         goto error;
 
     myRecord = 2;
@@ -106,22 +106,22 @@ int BasicTest()
 
     /* get number of records test */
     count = wrapper.GetPacketCount();
-    if(count != 2)
-      goto error;
+    if (count != 2)
+        goto error;
 
     /* get records test */
     err = wrapper.GetPacket(0, &myRecord);
-    if(err < 0)
-      goto error;
+    if (err < 0)
+        goto error;
 
-    if(myRecord != 1)
-      goto error;
+    if (myRecord != 1)
+        goto error;
 
     err = wrapper.GetPacket(1, &myRecord);
-    if(err < 0)
-      goto error;
-    if(myRecord != 2)
-      goto error;
+    if (err < 0)
+        goto error;
+    if (myRecord != 2)
+        goto error;
 
     PASSED();
     return 0;
@@ -131,58 +131,58 @@ error:
     return 1;
 }
 
-const char* CMPDTEST_PT("/compoundTest");
-int TestCompoundDatatype()
+const char *CMPDTEST_PT("/compoundTest");
+int
+TestCompoundDatatype()
 {
-    hid_t dtypeID;
+    hid_t   dtypeID;
     hsize_t count;
-    int error;
+    int     error;
 
     printf("Testing %-62s", "compound datatypes");
     HDfflush(stdout);
 
     /* Create compound datatype */
-    typedef struct compoundType
-    {
+    typedef struct compoundType {
         short a, b, c;
-        int e;
+        int   e;
     } compoundType;
 
-    dtypeID = H5Tcreate( H5T_COMPOUND, sizeof(compoundType));
+    dtypeID = H5Tcreate(H5T_COMPOUND, sizeof(compoundType));
 
-    H5Tinsert(dtypeID, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+    H5Tinsert(dtypeID, "abbey", HOFFSET(compoundType, a), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "bert", HOFFSET(compoundType, b), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "charlie", HOFFSET(compoundType, c), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "ebert", HOFFSET(compoundType, e), H5T_NATIVE_INT);
 
     /* Create packet table using default property list. */
     FL_PacketTable wrapper(fileID, H5P_DEFAULT, CMPDTEST_PT, dtypeID, 1);
 
-    if(! wrapper.IsValid())
-      goto error;
+    if (!wrapper.IsValid())
+        goto error;
 
     compoundType first;
     first.a = 1;
     first.b = first.c = 3;
-    first.e = 5;
+    first.e           = 5;
 
     /* Write packet */
     wrapper.AppendPacket(&first);
 
     count = wrapper.GetPacketCount(error);
-    if(count != 1)
-      goto error;
+    if (count != 1)
+        goto error;
 
     first.a = first.b = first.c = 0;
-    first.e = 0;
+    first.e                     = 0;
 
     /* Read packet back */
     wrapper.GetPacket(0, &first);
 
-    if(first.a != 1)
-      goto error;
-    if(first.e != 5)
-      goto error;
+    if (first.a != 1)
+        goto error;
+    if (first.e != 5)
+        goto error;
 
     PASSED();
 
@@ -191,17 +191,19 @@ int TestCompoundDatatype()
 
 error:
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(dtypeID);
-    } H5E_END_TRY;
-
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
 }
 
-const char* GETNEXT_PT("/TestGetNext");
-int TestGetNext()
+const char *GETNEXT_PT("/TestGetNext");
+int
+TestGetNext()
 {
     int error;
     int record;
@@ -214,47 +216,49 @@ int TestGetNext()
     /* Create a dataset */
     FL_PacketTable wrapper(fileID, H5P_DEFAULT, GETNEXT_PT, H5T_NATIVE_INT, 500);
 
-    if(! wrapper.IsValid())
-      goto error;
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Append 5 records to the dataset */
-    for(record = 1; record < 6; record++)
+    for (record = 1; record < 6; record++)
         wrapper.AppendPacket(&record);
 
     /* Ensure that we can interate through the records and get the right ones */
-    for(i = 1; i < 6; i++)
-    {
+    for (i = 1; i < 6; i++) {
         wrapper.GetNextPacket(&record);
-        if(record != i)
-          goto error;
+        if (record != i)
+            goto error;
     }
 
     /* Reset the index and check that it worked */
     wrapper.ResetIndex();
-    if(wrapper.GetIndex(error) != 0) goto error;
-    if(error < 0) goto error;
+    if (wrapper.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
 
     /* Ensure that we can interate through the records and get the right ones */
-    for(i = 1; i < 6; i++)
-    {
+    for (i = 1; i < 6; i++) {
         error = wrapper.GetNextPacket(&record);
-        if(record != i || error <0)
-          goto error;
+        if (record != i || error < 0)
+            goto error;
     }
 
     wrapper.SetIndex(1);
-    if(wrapper.GetIndex(error) != 1) goto error;
-    if(error < 0) goto error;
+    if (wrapper.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
 
     /* Ensure we can get multiple records with our index pointer */
     wrapper.GetNextPackets(2, records);
-    if(records[0] != 2 || records[1] != 3)
-      goto error;
+    if (records[0] != 2 || records[1] != 3)
+        goto error;
 
     /* Ensure our pointer was updated correctly */
     wrapper.GetNextPacket(&record);
-    if(record != 4)
-      goto error;
+    if (record != 4)
+        goto error;
 
     PASSED();
     return 0;
@@ -264,28 +268,29 @@ error:
     return 1;
 }
 
-const char* COMPRESS_PT("/compressTest");
-int TestCompress()
+const char *COMPRESS_PT("/compressTest");
+int
+TestCompress()
 {
-    unsigned int flags = 0;
-    unsigned int config = 0;
-    size_t cd_nelemts = 0;
+    unsigned int flags      = 0;
+    unsigned int config     = 0;
+    size_t       cd_nelemts = 0;
 
     printf("Testing %-62s", "compression");
     HDfflush(stdout);
 #ifdef H5_HAVE_FILTER_DEFLATE
     try {
-    /* Prepare property list to set compression, randomly use deflate */
-    DSetCreatPropList dscreatplist;
-    dscreatplist.setDeflate(6);
+        /* Prepare property list to set compression, randomly use deflate */
+        DSetCreatPropList dscreatplist;
+        dscreatplist.setDeflate(6);
 
         /* Create packet table with compression. */
         FL_PacketTable wrapper(fileID, COMPRESS_PT, H5T_NATIVE_CHAR, 100, dscreatplist.getId());
 
-    /* Close the property list */
-    dscreatplist.close();
+        /* Close the property list */
+        dscreatplist.close();
 
-    /* Verify that the deflate filter is set */
+        /* Verify that the deflate filter is set */
 
         /* Create an HDF5 C++ file object */
         H5File file;
@@ -297,13 +302,14 @@ int TestCompress()
 
         DSetCreatPropList dcpl = dset.getCreatePlist();
 
-    char filter_name[8];
+        char filter_name[8];
         dcpl.getFilterById(H5Z_FILTER_DEFLATE, flags, cd_nelemts, NULL, 8, filter_name, config);
-    if (HDstrncmp(filter_name, "deflate", 7) != 0)
-        H5_FAILED()
-    } catch (Exception e) {
-      H5_FAILED();
-      return 1;
+        if (HDstrncmp(filter_name, "deflate", 7) != 0)
+            H5_FAILED()
+    }
+    catch (Exception e) {
+        H5_FAILED();
+        return 1;
     }
     PASSED();
 #else
@@ -313,8 +319,9 @@ int TestCompress()
     return 0;
 }
 
-const char* PT_TESTGETPT = "/TestGetPacket";
-int TestGetPacket()
+const char *PT_TESTGETPT = "/TestGetPacket";
+int
+TestGetPacket()
 {
     int record;
     int theRecs[3];
@@ -326,24 +333,23 @@ int TestGetPacket()
        there is no compression. */
     FL_PacketTable wrapper(fileID, PT_TESTGETPT, H5T_NATIVE_INT, 1);
 
-    if(! wrapper.IsValid())
-      goto error;
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Append 5 records to the dataset */
-    for(record = 1; record < 6; record++)
+    for (record = 1; record < 6; record++)
         wrapper.AppendPacket(&record);
 
     /* Ensure that the records were written properly */
     wrapper.GetPacket(1, &record);
-    if(record != 2)
-      goto error;
+    if (record != 2)
+        goto error;
 
     /* Ensure that we can retrieve multiple records */
     wrapper.GetPackets(1, 3, theRecs);
-    for(i = 0; i < 3; i++)
-    {
-        if(theRecs[i] != i+2)
-          goto error;
+    for (i = 0; i < 3; i++) {
+        if (theRecs[i] != i + 2)
+            goto error;
     }
 
     PASSED();
@@ -354,9 +360,10 @@ error:
     return 1;
 }
 
-const char* PT_TESTERROR = "/TestErrors";
+const char *PT_TESTERROR = "/TestErrors";
 
-int TestErrors()
+int
+TestErrors()
 {
     printf("Testing %-62s", "error conditions");
     HDfflush(stdout);
@@ -364,99 +371,105 @@ int TestErrors()
     /* Create a dataset */
     FL_PacketTable wrapper(fileID, PT_TESTERROR, H5T_NATIVE_INT, 1);
 
-    if(! wrapper.IsValid())
-      goto error;
+    if (!wrapper.IsValid())
+        goto error;
 
     int record;
     int records[3];
     int error;
 
     /* Append 4 records to the dataset */
-    for(record = 1; record < 5; record++)
+    for (record = 1; record < 5; record++)
         wrapper.AppendPacket(&record);
 
     /* Try to confuse functions with bad indexes */
     error = wrapper.GetPacket(static_cast<unsigned>(-1), &record);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(4, &record);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(static_cast<unsigned>(-250), &record);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(3000, &record);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(1, &record);
-    if(error < 0)
-      goto error;
+    if (error < 0)
+        goto error;
 
     error = wrapper.GetPackets(static_cast<unsigned>(-1), 1, records);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(2, 4, records);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(static_cast<unsigned>(-60), static_cast<unsigned>(-62), records);
-     if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(10, 12, records);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(0, 2, records);
-    if(error < 0)
-      goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetPackets(2, 0, records);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(1, 1, records);
-    if(error < 0)
-      goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetPackets(1, 3, records);
-    if(error < 0)
-      goto error;
+    if (error < 0)
+        goto error;
 
     wrapper.ResetIndex();
     error = wrapper.SetIndex(static_cast<unsigned>(-1));
-    if(error >= 0)
-      goto error;
-    if(wrapper.GetIndex(error) != 0) goto error;
-    if(error < 0) goto error;
+    if (error >= 0)
+        goto error;
+    if (wrapper.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto error;
-    if(record != 1)
-      goto error;
-    if(wrapper.GetIndex(error) != 1) goto error;
-    if(error < 0) goto error;
+    if (error < 0)
+        goto error;
+    if (record != 1)
+        goto error;
+    if (wrapper.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.SetIndex(20);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto error;
-    if(record != 2)
-      goto error;
+    if (error < 0)
+        goto error;
+    if (record != 2)
+        goto error;
     wrapper.SetIndex(3);
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto error;
-    if(record != 4)
-      goto error;
-    if(wrapper.GetIndex(error) != 4) goto error;
-    if(error < 0) goto error;
+    if (error < 0)
+        goto error;
+    if (record != 4)
+        goto error;
+    if (wrapper.GetIndex(error) != 4)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
 
     wrapper.ResetIndex();
     error = wrapper.GetNextPackets(10, records);
-    if(error >= 0)
-      goto error;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetNextPackets(0, records);
-    if(error < 0)
-      goto error;
+    if (error < 0)
+        goto error;
 
     PASSED();
     return 0;
@@ -466,45 +479,44 @@ error:
     return 1;
 }
 
-const char* PT_SYSTEMTST1 = "/SystemTest1";
-const char* PT_SYSTEMTST2 = "/SystemTest2";
-int SystemTest()
+const char *PT_SYSTEMTST1 = "/SystemTest1";
+const char *PT_SYSTEMTST2 = "/SystemTest2";
+int
+SystemTest()
 {
     printf("Testing %-62s", "multiple datatypes");
     HDfflush(stdout);
 
-    hid_t dtypeID1, dtypeID2;
+    hid_t   dtypeID1, dtypeID2;
     hsize_t count;
-    int error;
+    int     error;
 
     /* Creating two inter-related datatypes.  Create two datasets and put
      * one datatype in each. */
-    typedef struct compoundType
-    {
+    typedef struct compoundType {
         short a, b, c;
-        int e;
+        int   e;
     } compoundType;
 
     dtypeID1 = H5Tcreate(H5T_COMPOUND, sizeof(compoundType));
 
-    H5Tinsert(dtypeID1, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+    H5Tinsert(dtypeID1, "abbey", HOFFSET(compoundType, a), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "bert", HOFFSET(compoundType, b), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "charlie", HOFFSET(compoundType, c), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "ebert", HOFFSET(compoundType, e), H5T_NATIVE_INT);
 
-    typedef struct cType2
-    {
-        char f;
+    typedef struct cType2 {
+        char         f;
         compoundType g;
     } cType2;
 
     dtypeID2 = H5Tcreate(H5T_COMPOUND, sizeof(cType2));
 
-    H5Tinsert(dtypeID2, "f", HOFFSET( cType2, f ), H5T_NATIVE_CHAR);
-    H5Tinsert(dtypeID2, "g", HOFFSET( cType2, g ), dtypeID1);
+    H5Tinsert(dtypeID2, "f", HOFFSET(cType2, f), H5T_NATIVE_CHAR);
+    H5Tinsert(dtypeID2, "g", HOFFSET(cType2, g), dtypeID1);
 
     cType2 ct2[10];
-    ct2[0].f = 'h';
+    ct2[0].f   = 'h';
     ct2[0].g.a = 9;
     ct2[0].g.b = -13;
     ct2[0].g.c = 0;
@@ -514,17 +526,17 @@ int SystemTest()
     FL_PacketTable wrapper1(fileID, PT_SYSTEMTST1, dtypeID1, 1);
     FL_PacketTable wrapper2(fileID, H5P_DEFAULT, PT_SYSTEMTST2, dtypeID2, 1);
 
-    if(! wrapper1.IsValid())
-      goto error;
-    if(! wrapper2.IsValid())
-      goto error;
+    if (!wrapper1.IsValid())
+        goto error;
+    if (!wrapper2.IsValid())
+        goto error;
 
     /* Write and read packets, ensure that nothing is unusual */
     wrapper2.AppendPacket(ct2);
 
     count = wrapper1.GetPacketCount();
-    if(count != 0)
-      goto error;
+    if (count != 0)
+        goto error;
 
     compoundType ct1[10];
     ct1[0].a = 31;
@@ -541,13 +553,17 @@ int SystemTest()
     wrapper1.ResetIndex();
     wrapper1.GetNextPacket(&ct1[1]);
     wrapper2.GetPacket(1, &ct2[2]);
-    if(wrapper1.GetIndex(error) != 1) goto error;
-    if(error < 0) goto error;
-    if(wrapper2.GetIndex(error) != 0) goto error;
-    if(error < 0) goto error;
+    if (wrapper1.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
+    if (wrapper2.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
 
-    if(ct1[1].b != ct2[2].g.b)
-      goto error;
+    if (ct1[1].b != ct2[2].g.b)
+        goto error;
 
     H5Tclose(dtypeID1);
     H5Tclose(dtypeID2);
@@ -556,10 +572,12 @@ int SystemTest()
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(dtypeID1);
         H5Tclose(dtypeID2);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
@@ -580,33 +598,32 @@ error:
  * 2016/10/25 -BMR
  *-------------------------------------------------------------------------
  */
-#pragma pack()  // default alignment
-const char* ABHI_PT("/abhiTest");
-const hsize_t NUM_PACKETS = 5;
-const int STRING_LENGTH = 19; // including terminating NULL
-int TestHDFFV_9758()
+#pragma pack() // default alignment
+const char *  ABHI_PT("/abhiTest");
+const hsize_t NUM_PACKETS   = 5;
+const int     STRING_LENGTH = 19; // including terminating NULL
+int
+TestHDFFV_9758()
 {
-    hid_t strtype;
-    hid_t compound_type;
+    hid_t  strtype;
+    hid_t  compound_type;
     herr_t err;
-    struct s1_t
-    {
-        int a;
-        float b;
+    struct s1_t {
+        int    a;
+        float  b;
         double c;
-        char d[STRING_LENGTH]; // null terminated string
-        int e;
+        char   d[STRING_LENGTH]; // null terminated string
+        int    e;
     };
 
     s1_t s1[NUM_PACKETS];
 
-    for (hsize_t i = 0; i < NUM_PACKETS; i++)
-    {
+    for (hsize_t i = 0; i < NUM_PACKETS; i++) {
         s1[i].a = i;
         s1[i].b = 1.f * static_cast<float>(i * i);
         s1[i].c = 1. / (i + 1);
         HDsprintf(s1[i].d, "string%d", (int)i);
-        s1[i].e = 100+i;
+        s1[i].e = 100 + i;
     }
 
     printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)");
@@ -615,73 +632,70 @@ int TestHDFFV_9758()
     // Build a compound datatype
     compound_type = H5Tcreate(H5T_COMPOUND, sizeof(s1_t));
     if (compound_type < 0)
-    goto error;
+        goto error;
 
     err = H5Tinsert(compound_type, "a_name", HOFFSET(s1_t, a), H5T_NATIVE_INT);
     if (err < 0)
-    goto error;
+        goto error;
     err = H5Tinsert(compound_type, "b_name", HOFFSET(s1_t, b), H5T_NATIVE_FLOAT);
     if (err < 0)
-    goto error;
+        goto error;
     err = H5Tinsert(compound_type, "c_name", HOFFSET(s1_t, c), H5T_NATIVE_DOUBLE);
     if (err < 0)
-    goto error;
+        goto error;
 
-    strtype = H5Tcopy (H5T_C_S1);
+    strtype = H5Tcopy(H5T_C_S1);
     if (compound_type < 0)
-    goto error;
-    err = H5Tset_size (strtype, STRING_LENGTH); /* create string */
+        goto error;
+    err = H5Tset_size(strtype, STRING_LENGTH); /* create string */
     if (err < 0)
-    goto error;
+        goto error;
     err = H5Tinsert(compound_type, "d_name", HOFFSET(s1_t, d), strtype);
     if (err < 0)
-    goto error;
+        goto error;
     err = H5Tinsert(compound_type, "e_name", HOFFSET(s1_t, e), H5T_NATIVE_INT);
     if (err < 0)
-    goto error;
+        goto error;
 
     { // so ptable will go out of scope before PASSED
 
-    // Create a packet table
-    FL_PacketTable ptable(fileID, "/examplePacketTable", compound_type, 1);
-    if (!ptable.IsValid())
-    goto error;
-
-    // Add packets to the table
-    for (size_t i = 0; i < NUM_PACKETS; i++)
-    {
-    /* Appends one packet at the current position */
-        err = ptable.AppendPacket(s1 + i);
-        if (err < 0) goto error;
-    }
+        // Create a packet table
+        FL_PacketTable ptable(fileID, "/examplePacketTable", compound_type, 1);
+        if (!ptable.IsValid())
+            goto error;
+
+        // Add packets to the table
+        for (size_t i = 0; i < NUM_PACKETS; i++) {
+            /* Appends one packet at the current position */
+            err = ptable.AppendPacket(s1 + i);
+            if (err < 0)
+                goto error;
+        }
 
-    // Check packet count
-    const hsize_t count = ptable.GetPacketCount(err);
-    if (err < 0)
-    goto error;
+        // Check packet count
+        const hsize_t count = ptable.GetPacketCount(err);
+        if (err < 0)
+            goto error;
 
-    if (count != NUM_PACKETS)
-    {
-    std::cerr
-        << "Number of packets in packet table should be " << NUM_PACKETS
-        << " but is " << count << endl;
-    }
-
-    // Read and verify the data
-    ptable.ResetIndex();
-    for (size_t i = 0; i < NUM_PACKETS; i++)
-    {
-    s1_t s2;
-    HDmemset(&s2, 0, sizeof(s1_t));
-    err = ptable.GetNextPacket(&s2);
-    if (err < 0)
-        goto error;
+        if (count != NUM_PACKETS) {
+            std::cerr << "Number of packets in packet table should be " << NUM_PACKETS << " but is " << count
+                      << endl;
+        }
 
-    if (s2.a != s1[i].a || s2.e != s1[i].e)
-        goto error;
-    else if (HDstrcmp(s2.d, s1[i].d))
-        goto error;
-    }
+        // Read and verify the data
+        ptable.ResetIndex();
+        for (size_t i = 0; i < NUM_PACKETS; i++) {
+            s1_t s2;
+            HDmemset(&s2, 0, sizeof(s1_t));
+            err = ptable.GetNextPacket(&s2);
+            if (err < 0)
+                goto error;
+
+            if (s2.a != s1[i].a || s2.e != s1[i].e)
+                goto error;
+            else if (HDstrcmp(s2.d, s1[i].d))
+                goto error;
+        }
     } // end of ptable block
 
     PASSED();
@@ -689,13 +703,14 @@ int TestHDFFV_9758()
 
 error:
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(strtype);
         H5Tclose(compound_type);
         H5Fclose(fileID);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
 }
-
diff --git a/hl/examples/ex_ds1.c b/hl/examples/ex_ds1.c
index 1e0c592..af8b581 100644
--- a/hl/examples/ex_ds1.c
+++ b/hl/examples/ex_ds1.c
@@ -14,99 +14,93 @@
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
-
-#define RANK          2
-#define DIM_DATA      12
-#define DIM1_SIZE     3
-#define DIM2_SIZE     4
-#define DIM0          0
-#define DIM1          1
-
-#define DSET_NAME      "Mydata"
-#define DS_1_NAME      "Yaxis"
-#define DS_2_NAME      "Xaxis"
-
-int main(void)
+#define RANK      2
+#define DIM_DATA  12
+#define DIM1_SIZE 3
+#define DIM2_SIZE 4
+#define DIM0      0
+#define DIM1      1
+
+#define DSET_NAME "Mydata"
+#define DS_1_NAME "Yaxis"
+#define DS_2_NAME "Xaxis"
+
+int
+main(void)
 {
 
- hid_t   fid;                                              /* file ID */
- hid_t   did;                                              /* dataset ID */
- hid_t   dsid;                                             /* DS dataset ID */
- int     rank     = RANK;                                  /* rank of data dataset */
- int     rankds   = 1;                                     /* rank of DS dataset */
- hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- int     buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
- hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
- hsize_t s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
- float   s1_wbuf[DIM1_SIZE] = {10,20,30};                  /* data of DS 1 dataset */
- int     s2_wbuf[DIM2_SIZE] = {10,20,50,100};              /* data of DS 2 dataset */
-
-
- /* create a file using default properties */
- if ((fid=H5Fcreate("ex_ds1.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
-  goto out;
-
- /* make a dataset */
- if (H5LTmake_dataset_int(fid,DSET_NAME,rank,dims,buf)<0)
-  goto out;
-
- /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_float(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf)<0)
-  goto out;
-
- /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_int(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf)<0)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * attach the DS_1_NAME dimension scale to DSET_NAME at dimension 0
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for DSET_NAME */
- if ((did = H5Dopen2(fid,DSET_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
-  goto out;
-
- /* close DS id */
- if (H5Dclose(dsid)<0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach the DS_2_NAME dimension scale to DSET_NAME
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 1)  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
-  goto out;
-
- /* close DS id */
- if (H5Dclose(dsid)<0)
-  goto out;
-
- /* close file */
- H5Fclose(fid);
-
- return 0;
+    hid_t   fid;                                                          /* file ID */
+    hid_t   did;                                                          /* dataset ID */
+    hid_t   dsid;                                                         /* DS dataset ID */
+    int     rank               = RANK;                                    /* rank of data dataset */
+    int     rankds             = 1;                                       /* rank of DS dataset */
+    hsize_t dims[RANK]         = {DIM1_SIZE, DIM2_SIZE};                  /* size of data dataset */
+    int     buf[DIM_DATA]      = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; /* data of data dataset */
+    hsize_t s1_dim[1]          = {DIM1_SIZE};                             /* size of DS 1 dataset */
+    hsize_t s2_dim[1]          = {DIM2_SIZE};                             /* size of DS 2 dataset */
+    float   s1_wbuf[DIM1_SIZE] = {10, 20, 30};                            /* data of DS 1 dataset */
+    int     s2_wbuf[DIM2_SIZE] = {10, 20, 50, 100};                       /* data of DS 2 dataset */
+
+    /* create a file using default properties */
+    if ((fid = H5Fcreate("ex_ds1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* make a dataset */
+    if (H5LTmake_dataset_int(fid, DSET_NAME, rank, dims, buf) < 0)
+        goto out;
+
+    /* make a DS dataset for the first dimension */
+    if (H5LTmake_dataset_float(fid, DS_1_NAME, rankds, s1_dim, s1_wbuf) < 0)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    if (H5LTmake_dataset_int(fid, DS_2_NAME, rankds, s2_dim, s2_wbuf) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+     * attach the DS_1_NAME dimension scale to DSET_NAME at dimension 0
+     *-------------------------------------------------------------------------
+     */
+
+    /* get the dataset id for DSET_NAME */
+    if ((did = H5Dopen2(fid, DSET_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* get the DS dataset id */
+    if ((dsid = H5Dopen2(fid, DS_1_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 0 */
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
+        goto out;
+
+    /* close DS id */
+    if (H5Dclose(dsid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+     * attach the DS_2_NAME dimension scale to DSET_NAME
+     *-------------------------------------------------------------------------
+     */
+
+    /* get the DS dataset id */
+    if ((dsid = H5Dopen2(fid, DS_2_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 1)  */
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
+        goto out;
+
+    /* close DS id */
+    if (H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close file */
+    H5Fclose(fid);
+
+    return 0;
 
 out:
- printf("Error on return function...Exiting\n");
- return 1;
-
+    printf("Error on return function...Exiting\n");
+    return 1;
 }
-
-
-
diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c
index 56a175d..ef9410b 100644
--- a/hl/examples/ex_image1.c
+++ b/hl/examples/ex_image1.c
@@ -14,56 +14,55 @@
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
-#define WIDTH         400
-#define HEIGHT        200
-#define PAL_ENTRIES   9
-unsigned char buf [ WIDTH*HEIGHT ];
+#define WIDTH       400
+#define HEIGHT      200
+#define PAL_ENTRIES 9
+unsigned char buf[WIDTH * HEIGHT];
 
-int main( void )
+int
+main(void)
 {
- hid_t         file_id;
- hsize_t       pal_dims[] = {PAL_ENTRIES,3};
- size_t        i, j;
- int           n, space;
- unsigned char pal[PAL_ENTRIES*3] = {  /* create a palette with 9 colors */
- 0,0,168,      /* dark blue */
- 0,0,252,      /* blue */
- 0,168,252,    /* ocean blue */
- 84,252,252,   /* light blue */
- 168,252,168,  /* light green */
- 0,252,168,    /* green */
- 252,252,84,   /* yellow */
- 252,168,0,    /* orange */
- 252,0,0};     /* red */
+    hid_t         file_id;
+    hsize_t       pal_dims[] = {PAL_ENTRIES, 3};
+    size_t        i, j;
+    int           n, space;
+    unsigned char pal[PAL_ENTRIES * 3] = {               /* create a palette with 9 colors */
+                                          0,   0,   168, /* dark blue */
+                                          0,   0,   252, /* blue */
+                                          0,   168, 252, /* ocean blue */
+                                          84,  252, 252, /* light blue */
+                                          168, 252, 168, /* light green */
+                                          0,   252, 168, /* green */
+                                          252, 252, 84,  /* yellow */
+                                          252, 168, 0,   /* orange */
+                                          252, 0,   0};  /* red */
 
- /* create an image of 9 values divided evenly by the array */
- space = WIDTH*HEIGHT / PAL_ENTRIES;
- for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
- {
-  buf[i] = n;
-  if ( j > space )
-  {
-   n++;
-   j=0;
-  }
-  if (n>PAL_ENTRIES-1) n=0;
- }
+    /* create an image of 9 values divided evenly by the array */
+    space = WIDTH * HEIGHT / PAL_ENTRIES;
+    for (i = 0, j = 0, n = 0; i < WIDTH * HEIGHT; i++, j++) {
+        buf[i] = n;
+        if (j > space) {
+            n++;
+            j = 0;
+        }
+        if (n > PAL_ENTRIES - 1)
+            n = 0;
+    }
 
- /* create a new HDF5 file using default properties. */
- file_id = H5Fcreate( "ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+    /* create a new HDF5 file using default properties. */
+    file_id = H5Fcreate("ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* make the image */
- H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
+    /* make the image */
+    H5IMmake_image_8bit(file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf);
 
- /* make a palette */
- H5IMmake_palette( file_id, "pallete", pal_dims, pal );
+    /* make a palette */
+    H5IMmake_palette(file_id, "pallete", pal_dims, pal);
 
- /* attach the palette to the image */
- H5IMlink_palette( file_id, "image1", "pallete" );
+    /* attach the palette to the image */
+    H5IMlink_palette(file_id, "image1", "pallete");
 
- /* close the file. */
- H5Fclose( file_id );
-
- return 0;
+    /* close the file. */
+    H5Fclose(file_id);
 
+    return 0;
 }
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index 5abf723..2a38430 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -16,90 +16,89 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define DATA_FILE1   "image8.txt"
-#define DATA_FILE2   "image24pixel.txt"
-#define IMAGE1_NAME  "image8bit"
-#define IMAGE2_NAME  "image24bitpixel"
-#define PAL_NAME     "palette"
-#define PAL_ENTRIES  256
-
-static int    read_data(const char* file_name, hsize_t *width, hsize_t *height );
-unsigned char *gbuf = NULL;  /* global buffer for image data */
-
-int main( void )
+#define DATA_FILE1  "image8.txt"
+#define DATA_FILE2  "image24pixel.txt"
+#define IMAGE1_NAME "image8bit"
+#define IMAGE2_NAME "image24bitpixel"
+#define PAL_NAME    "palette"
+#define PAL_ENTRIES 256
+
+static int     read_data(const char *file_name, hsize_t *width, hsize_t *height);
+unsigned char *gbuf = NULL; /* global buffer for image data */
+
+int
+main(void)
 {
- hid_t          file_id;                       /* HDF5 file identifier */
- hsize_t        width;                         /* width of image */
- hsize_t        height;                        /* height of image */
- unsigned char  pal[ PAL_ENTRIES * 3 ];        /* palette array */
- hsize_t        pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
- herr_t         i, n;
-
- /* create a new HDF5 file using default properties. */
- file_id = H5Fcreate( "ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* read first data file */
- if (read_data(DATA_FILE1,&width,&height)<0)
-  goto out;
-
- /* make the image */
- H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
- if (gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
-
-/*-------------------------------------------------------------------------
- * define a palette, blue to red tones
- *-------------------------------------------------------------------------
- */
- for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
- {
-  pal[i]  =n;      /* red */
-  pal[i+1]=0;      /* green */
-  pal[i+2]=255-n;  /* blue */
- }
-
- /* make a palette */
- H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
-
- /* attach the palette to the image */
- H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
-
-/*-------------------------------------------------------------------------
- * True color image example with pixel interlace
- *-------------------------------------------------------------------------
- */
-
- /* read second data file */
- if (read_data(DATA_FILE2,&width,&height)<0)
-  goto out;
-
- /* make dataset */
- H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
-
- /* close the file. */
- H5Fclose( file_id );
-
- if(gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
-
- return 0;
+    hid_t         file_id;                        /* HDF5 file identifier */
+    hsize_t       width;                          /* width of image */
+    hsize_t       height;                         /* height of image */
+    unsigned char pal[PAL_ENTRIES * 3];           /* palette array */
+    hsize_t       pal_dims[2] = {PAL_ENTRIES, 3}; /* palette dimensions */
+    herr_t        i, n;
+
+    /* create a new HDF5 file using default properties. */
+    file_id = H5Fcreate("ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* read first data file */
+    if (read_data(DATA_FILE1, &width, &height) < 0)
+        goto out;
+
+    /* make the image */
+    H5IMmake_image_8bit(file_id, IMAGE1_NAME, width, height, gbuf);
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    /*-------------------------------------------------------------------------
+     * define a palette, blue to red tones
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0, n = 0; i < PAL_ENTRIES * 3; i += 3, n++) {
+        pal[i]     = n;       /* red */
+        pal[i + 1] = 0;       /* green */
+        pal[i + 2] = 255 - n; /* blue */
+    }
+
+    /* make a palette */
+    H5IMmake_palette(file_id, PAL_NAME, pal_dims, pal);
+
+    /* attach the palette to the image */
+    H5IMlink_palette(file_id, IMAGE1_NAME, PAL_NAME);
+
+    /*-------------------------------------------------------------------------
+     * True color image example with pixel interlace
+     *-------------------------------------------------------------------------
+     */
+
+    /* read second data file */
+    if (read_data(DATA_FILE2, &width, &height) < 0)
+        goto out;
+
+    /* make dataset */
+    H5IMmake_image_24bit(file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf);
+
+    /* close the file. */
+    H5Fclose(file_id);
+
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    return 0;
 
 out:
- printf("Error on return function...Exiting\n");
+    printf("Error on return function...Exiting\n");
 
- if(gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
 
- return 1;
+    return 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * read_data
  * utility function to read ASCII image data
@@ -117,68 +116,63 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int read_data( const char* fname, /*IN*/
-                      hsize_t *width, /*OUT*/
-                      hsize_t *height /*OUT*/ )
+static int
+read_data(const char *fname, /*IN*/
+          hsize_t *   width, /*OUT*/
+          hsize_t *   height /*OUT*/)
 {
- int    i, n;
- int    color_planes;
- char   str[20];
- FILE   *f;
- int    w, h;
- char   *srcdir = getenv("srcdir"); /* the source directory */
- char   data_file[512]="";          /* buffer to hold name of existing data file */
-
-/*-------------------------------------------------------------------------
- * compose the name of the file to open, using "srcdir", if appropriate
- *-------------------------------------------------------------------------
- */
- strcpy(data_file, "");
- if (srcdir)
- {
-  strcpy(data_file, srcdir);
-  strcat(data_file, "/");
- }
- strcat(data_file,fname);
-
-/*-------------------------------------------------------------------------
- * read
- *-------------------------------------------------------------------------
- */
-
- f = fopen(data_file, "r");
- if ( f == NULL )
- {
-  printf( "Could not open file %s. Try set $srcdir \n", data_file );
-  return -1;
- }
-
- fscanf( f, "%s", str );
- fscanf( f, "%d", &color_planes );
- fscanf( f, "%s", str );
- fscanf( f, "%d", &h);
- fscanf( f, "%s", str );
- fscanf( f, "%d", &w);
-
- *width = (hsize_t)w;
- *height = (hsize_t)h;
-
- if ( gbuf )
- {
-  free( gbuf );
-  gbuf=NULL;
- }
-
- gbuf = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char ));
-
- for (i = 0; i < h * w * color_planes ; i++)
- {
-  fscanf( f, "%d",&n );
-  gbuf[i] = (unsigned char)n;
- }
- fclose(f);
-
- return 1;
-
+    int   i, n;
+    int   color_planes;
+    char  str[20];
+    FILE *f;
+    int   w, h;
+    char *srcdir         = getenv("srcdir"); /* the source directory */
+    char  data_file[512] = "";               /* buffer to hold name of existing data file */
+
+    /*-------------------------------------------------------------------------
+     * compose the name of the file to open, using "srcdir", if appropriate
+     *-------------------------------------------------------------------------
+     */
+    strcpy(data_file, "");
+    if (srcdir) {
+        strcpy(data_file, srcdir);
+        strcat(data_file, "/");
+    }
+    strcat(data_file, fname);
+
+    /*-------------------------------------------------------------------------
+     * read
+     *-------------------------------------------------------------------------
+     */
+
+    f = fopen(data_file, "r");
+    if (f == NULL) {
+        printf("Could not open file %s. Try set $srcdir \n", data_file);
+        return -1;
+    }
+
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &color_planes);
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &h);
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &w);
+
+    *width  = (hsize_t)w;
+    *height = (hsize_t)h;
+
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    gbuf = (unsigned char *)malloc(w * h * color_planes * sizeof(unsigned char));
+
+    for (i = 0; i < h * w * color_planes; i++) {
+        fscanf(f, "%d", &n);
+        gbuf[i] = (unsigned char)n;
+    }
+    fclose(f);
+
+    return 1;
 }
-
diff --git a/hl/examples/ex_lite1.c b/hl/examples/ex_lite1.c
index 89f60dc..3056480 100644
--- a/hl/examples/ex_lite1.c
+++ b/hl/examples/ex_lite1.c
@@ -11,29 +11,26 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
 #define RANK 2
 
-
-int main( void )
+int
+main(void)
 {
- hid_t       file_id;
- hsize_t     dims[RANK]={2,3};
- int         data[6]={1,2,3,4,5,6};
+    hid_t   file_id;
+    hsize_t dims[RANK] = {2, 3};
+    int     data[6]    = {1, 2, 3, 4, 5, 6};
 
- /* create a HDF5 file */
- file_id = H5Fcreate ("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a HDF5 file */
+    file_id = H5Fcreate("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* create and write an integer type dataset named "dset" */
- H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
+    /* create and write an integer type dataset named "dset" */
+    H5LTmake_dataset(file_id, "/dset", RANK, dims, H5T_NATIVE_INT, data);
 
- /* close file */
- H5Fclose (file_id);
+    /* close file */
+    H5Fclose(file_id);
 
- return 0;
+    return 0;
 }
-
-
diff --git a/hl/examples/ex_lite2.c b/hl/examples/ex_lite2.c
index 261fc73..4441844 100644
--- a/hl/examples/ex_lite2.c
+++ b/hl/examples/ex_lite2.c
@@ -14,38 +14,34 @@
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
-int main( void )
+int
+main(void)
 {
- hid_t       file_id;
- int         data[6];
- hsize_t     dims[2];
- size_t     i, j, nrow, n_values;
+    hid_t   file_id;
+    int     data[6];
+    hsize_t dims[2];
+    size_t  i, j, nrow, n_values;
 
- /* open file from ex_lite1.c */
- file_id = H5Fopen ("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
+    /* open file from ex_lite1.c */
+    file_id = H5Fopen("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
 
- /* read dataset */
- H5LTread_dataset_int(file_id,"/dset",data);
+    /* read dataset */
+    H5LTread_dataset_int(file_id, "/dset", data);
 
- /* get the dimensions of the dataset */
- H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
+    /* get the dimensions of the dataset */
+    H5LTget_dataset_info(file_id, "/dset", dims, NULL, NULL);
 
- /* print it by rows */
- n_values = (size_t)(dims[0] * dims[1]);
- nrow = (size_t)dims[1];
- for (i=0; i<n_values/nrow; i++ )
- {
-  for (j=0; j<nrow; j++)
-   printf ("  %d", data[i*nrow + j]);
-  printf ("\n");
- }
-
- /* close file */
- H5Fclose (file_id);
-
- return 0;
+    /* print it by rows */
+    n_values = (size_t)(dims[0] * dims[1]);
+    nrow     = (size_t)dims[1];
+    for (i = 0; i < n_values / nrow; i++) {
+        for (j = 0; j < nrow; j++)
+            printf("  %d", data[i * nrow + j]);
+        printf("\n");
+    }
 
+    /* close file */
+    H5Fclose(file_id);
 
+    return 0;
 }
-
-
diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index 420cbcb..f80582e 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -17,51 +17,51 @@
 
 #define ATTR_SIZE 5
 
-int main( void )
+int
+main(void)
 {
- hid_t   file_id;
- hid_t   dset_id;
- hid_t   space_id;
- hsize_t dims[1] = { ATTR_SIZE };
- int     data[ATTR_SIZE] = {1,2,3,4,5};
- int     i;
+    hid_t   file_id;
+    hid_t   dset_id;
+    hid_t   space_id;
+    hsize_t dims[1]         = {ATTR_SIZE};
+    int     data[ATTR_SIZE] = {1, 2, 3, 4, 5};
+    int     i;
 
- /* create a file */
- file_id = H5Fcreate("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a file */
+    file_id = H5Fcreate("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* create a data space  */
- space_id = H5Screate_simple(1, dims, NULL);
+    /* create a data space  */
+    space_id = H5Screate_simple(1, dims, NULL);
 
- /* create a dataset named "dset" */
- dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a dataset named "dset" */
+    dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
- /* close */
- H5Dclose(dset_id);
- H5Sclose(space_id);
+    /* close */
+    H5Dclose(dset_id);
+    H5Sclose(space_id);
 
-/*-------------------------------------------------------------------------
- * example of H5LTset_attribute_int
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * example of H5LTset_attribute_int
+     *-------------------------------------------------------------------------
+     */
 
- /* create and write the attribute "attr1" on the dataset "dset" */
- H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
+    /* create and write the attribute "attr1" on the dataset "dset" */
+    H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
 
-/*-------------------------------------------------------------------------
- * example of H5LTget_attribute_int
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * example of H5LTget_attribute_int
+     *-------------------------------------------------------------------------
+     */
 
- /* get the attribute "attr1" from the dataset "dset" */
- H5LTget_attribute_int(file_id, "dset", "attr1", data);
+    /* get the attribute "attr1" from the dataset "dset" */
+    H5LTget_attribute_int(file_id, "dset", "attr1", data);
 
- for(i = 0; i < ATTR_SIZE; i++ )
-  printf("  %d", data[i]);
- printf("\n");
+    for (i = 0; i < ATTR_SIZE; i++)
+        printf("  %d", data[i]);
+    printf("\n");
 
- /* close file */
- H5Fclose(file_id);
+    /* close file */
+    H5Fclose(file_id);
 
- return 0;
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index f1d0266..f3f1b0d 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -24,112 +24,91 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
 #define TABLE_NAME "table"
 
-
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
-  /* Define field information */
-  const char *field_names[NFIELDS]  =
-  { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
-  hid_t      field_type[NFIELDS];
-  hid_t      string_type;
-  hid_t      file_id;
-  hsize_t    chunk_size = 10;
-  int        *fill_data = NULL;
-  int        compress  = 0;
-  int        i;
-
-  /* Initialize field_type */
-  string_type = H5Tcopy( H5T_C_S1 );
-  H5Tset_size( string_type, 16 );
-  field_type[0] = string_type;
-  field_type[1] = H5T_NATIVE_INT;
-  field_type[2] = H5T_NATIVE_INT;
-  field_type[3] = H5T_NATIVE_FLOAT;
-  field_type[4] = H5T_NATIVE_DOUBLE;
-
-  /* Create a new file using default properties. */
-  file_id = H5Fcreate( "ex_table_01.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
-/*-------------------------------------------------------------------------
- * H5TBmake_table
- *-------------------------------------------------------------------------
- */
-
- H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
-/*-------------------------------------------------------------------------
- * H5TBread_table
- *-------------------------------------------------------------------------
- */
-
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-/*-------------------------------------------------------------------------
- * end
- *-------------------------------------------------------------------------
- */
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    size_t dst_sizes[NFIELDS] = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int *       fill_data  = NULL;
+    int         compress   = 0;
+    int         i;
+
+    /* Initialize field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_01.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*-------------------------------------------------------------------------
+     * H5TBmake_table
+     *-------------------------------------------------------------------------
+     */
+
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /*-------------------------------------------------------------------------
+     * H5TBread_table
+     *-------------------------------------------------------------------------
+     */
+
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /*-------------------------------------------------------------------------
+     * end
+     *-------------------------------------------------------------------------
+     */
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 923f810..2c2f56b 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -23,107 +23,85 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)     5
-#define NRECORDS (hsize_t)     8
-#define NRECORDS_ADD (hsize_t) 2
-#define TABLE_NAME             "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)2
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS+NRECORDS_ADD];
-
-/* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- size_t dst_sizes[NFIELDS] = { sizeof( p_data[0].name),
-                               sizeof( p_data[0].lati),
-                               sizeof( p_data[0].longi),
-                               sizeof( p_data[0].pressure),
-                               sizeof( p_data[0].temperature)};
-
- /* Define field information */
- const char *field_names[NFIELDS] =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        *fill_data = NULL;
- int        compress  = 0;
- int        i;
-
-  /* Append particles */
- Particle particle_in[ NRECORDS_ADD ] =
- {{ "eight",80,80, 8.0f, 80.0},
- {"nine",90,90, 9.0f, 90.0} };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* make a table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                        dst_size, field_names, dst_offset, field_type,
-                        chunk_size, fill_data, compress, p_data  );
-
- /* append two records */
- H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
-  &particle_in );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS+NRECORDS_ADD; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_ADD];
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    size_t dst_sizes[NFIELDS] = {sizeof(p_data[0].name), sizeof(p_data[0].lati), sizeof(p_data[0].longi),
+                                 sizeof(p_data[0].pressure), sizeof(p_data[0].temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int *       fill_data  = NULL;
+    int         compress   = 0;
+    int         i;
+
+    /* Append particles */
+    Particle particle_in[NRECORDS_ADD] = {{"eight", 80, 80, 8.0f, 80.0}, {"nine", 90, 90, 9.0f, 90.0}};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* append two records */
+    H5TBappend_records(file_id, TABLE_NAME, NRECORDS_ADD, dst_size, dst_offset, dst_sizes, &particle_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS + NRECORDS_ADD; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index 76a9eae..8787275 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 #include <stdlib.h>
@@ -24,113 +23,85 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)       5
-#define NRECORDS (hsize_t)       8
-#define NRECORDS_WRITE (hsize_t) 2
-#define TABLE_NAME               "table"
+#define NFIELDS        (hsize_t)5
+#define NRECORDS       (hsize_t)8
+#define NRECORDS_WRITE (hsize_t)2
+#define TABLE_NAME     "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- Particle  p = {"zero",0,0, 0.0f, 0.0};
- size_t dst_sizes[NFIELDS] = { sizeof( p.name),
-                               sizeof( p.lati),
-                               sizeof( p.longi),
-                               sizeof( p.pressure),
-                               sizeof( p.temperature)};
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- /* Fill value particle */
- Particle   fill_data[1] =
-	{ {"no data",-1,-1, -99.0f, -99.0} };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- hsize_t    start;      /* Record to start reading/writing */
- hsize_t    nrecords;   /* Number of records to read/write */
- int        i;
-
- /* Define 2 new particles to write */
- Particle  particle_in[NRECORDS_WRITE] =
- { {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0} };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
-/* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",
-  file_id,
-  TABLE_NAME,
-  NFIELDS,
-  NRECORDS,
-  dst_size,
-  field_names,
-  dst_offset,
-  field_type,
-  chunk_size,
-  fill_data,
-  0,           /* no compression */
-  NULL );      /* no data written */
-
-
- /* Overwrite 2 records starting at record 0 */
- start    = 0;
- nrecords = NRECORDS_WRITE;
- H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
-  dst_sizes, particle_in);
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    Particle p                  = {"zero", 0, 0, 0.0f, 0.0};
+    size_t   dst_sizes[NFIELDS] = {sizeof(p.name), sizeof(p.lati), sizeof(p.longi), sizeof(p.pressure),
+                                 sizeof(p.temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    /* Fill value particle */
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    hid_t    field_type[NFIELDS];
+    hid_t    string_type;
+    hid_t    file_id;
+    hsize_t  chunk_size = 10;
+    hsize_t  start;    /* Record to start reading/writing */
+    hsize_t  nrecords; /* Number of records to read/write */
+    int      i;
+
+    /* Define 2 new particles to write */
+    Particle particle_in[NRECORDS_WRITE] = {{"zero", 0, 0, 0.0f, 0.0}, {"one", 10, 10, 1.0f, 10.0}};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, 0, /* no compression */
+                   NULL);                                /* no data written */
+
+    /* Overwrite 2 records starting at record 0 */
+    start    = 0;
+    nrecords = NRECORDS_WRITE;
+    H5TBwrite_records(file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset, dst_sizes, particle_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 203114c..9cb9137 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -23,141 +23,117 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS       (hsize_t)   5
-#define NRECORDS      (hsize_t)   8
-#define NRECORDS_ADD  (hsize_t)   3
-#define TABLE_NAME               "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)3
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define a subset of Particle, with latitude and longitude fields */
- typedef struct Position
- {
-  int    lati;
-  int    longi;
- } Position;
-
- /* Define a subset of Particle, with name and pressure fields */
- typedef struct NamePressure
- {
-  char   name[16];
-  float  pressure;
- } NamePressure;
-
- Particle  dst_buf[NRECORDS];
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
- size_t field_offset_pos[2] = { HOFFSET( Position, lati ),
-                                HOFFSET( Position, longi )};
- const char *field_names[NFIELDS]  =     /* Define field information */
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- hsize_t    start;                       /* Record to start reading/writing */
- hsize_t    nrecords;                    /* Number of records to read/write */
- int        compress  = 0;
- int        i;
- Particle  *p_data = NULL;               /* Initially no data */
- float      pressure_in [NRECORDS_ADD] = /* Define new values for the field "Pressure"  */
- { 0.0f,1.0f,2.0f};
- Position   position_in[NRECORDS_ADD] = {/* Define new values for "Latitude,Longitude"  */
- {0,0},
- {10,10},
- {20,20}};
- NamePressure   namepre_in[NRECORDS_ADD] =/* Define new values for "Name,Pressure"  */
- { {"zero",0.0f},
- {"one",   1.0f},
- {"two",   2.0f},
- };
- size_t field_sizes_pos[2]=
- {
-  sizeof(position_in[0].longi),
-  sizeof(position_in[0].lati)
- };
- size_t field_sizes_pre[1]=
- {
-  sizeof(namepre_in[0].pressure)
- };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Write the pressure field starting at record 2 */
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
-   sizeof( float ), 0, field_sizes_pre, pressure_in  );
-
- /* Write the new longitude and latitude information starting at record 2 */
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
-   sizeof( Position ), field_offset_pos, field_sizes_pos,  position_in  );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-/*-------------------------------------------------------------------------
- * end
- *-------------------------------------------------------------------------
- */
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define a subset of Particle, with latitude and longitude fields */
+    typedef struct Position {
+        int lati;
+        int longi;
+    } Position;
+
+    /* Define a subset of Particle, with name and pressure fields */
+    typedef struct NamePressure {
+        char  name[16];
+        float pressure;
+    } NamePressure;
+
+    Particle dst_buf[NRECORDS];
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+    size_t field_offset_pos[2] = {HOFFSET(Position, lati), HOFFSET(Position, longi)};
+    const char *field_names[NFIELDS] = /* Define field information */
+        {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t     field_type[NFIELDS];
+    hid_t     string_type;
+    hid_t     file_id;
+    hsize_t   chunk_size   = 10;
+    Particle  fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    hsize_t   start;                                               /* Record to start reading/writing */
+    hsize_t   nrecords;                                            /* Number of records to read/write */
+    int       compress = 0;
+    int       i;
+    Particle *p_data                    = NULL; /* Initially no data */
+    float     pressure_in[NRECORDS_ADD] =       /* Define new values for the field "Pressure"  */
+        {0.0f, 1.0f, 2.0f};
+    Position     position_in[NRECORDS_ADD] = {/* Define new values for "Latitude,Longitude"  */
+                                          {0, 0},
+                                          {10, 10},
+                                          {20, 20}};
+    NamePressure namepre_in[NRECORDS_ADD]  = /* Define new values for "Name,Pressure"  */
+        {
+            {"zero", 0.0f},
+            {"one", 1.0f},
+            {"two", 2.0f},
+        };
+    size_t field_sizes_pos[2] = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
+    size_t field_sizes_pre[1] = {sizeof(namepre_in[0].pressure)};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Write the pressure field starting at record 2 */
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_name(file_id, TABLE_NAME, "Pressure", start, nrecords, sizeof(float), 0, field_sizes_pre,
+                          pressure_in);
+
+    /* Write the new longitude and latitude information starting at record 2 */
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_name(file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords, sizeof(Position),
+                          field_offset_pos, field_sizes_pos, position_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /*-------------------------------------------------------------------------
+     * end
+     *-------------------------------------------------------------------------
+     */
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index b43d635..ab1b77f 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 #include <stdlib.h>
@@ -24,142 +23,111 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS       (hsize_t)   5
-#define NRECORDS      (hsize_t)   8
-#define NRECORDS_ADD  (hsize_t)   3
-#define TABLE_NAME               "table"
-
-
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)3
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define a subset of Particle, with latitude and longitude fields */
- typedef struct Position
- {
-  int    lati;
-  int    longi;
- } Position;
-
- /* Calculate the type_size and the offsets of our struct members */
- Particle  dst_buf[NRECORDS];
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
- size_t field_offset_pos[2] = { HOFFSET( Position, lati ),
-                                HOFFSET( Position, longi )};
-
- /* Initially no data */
- Particle  *p_data = NULL;
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
-  Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- int        compress  = 0;
- hsize_t    nfields;
- hsize_t    start;                       /* Record to start reading/writing */
- hsize_t    nrecords;                    /* Number of records to read/write */
- int        i;
-
- /* Define new values for the field "Pressure"  */
- float      pressure_in  [NRECORDS_ADD] =
- { 0.0f,1.0f,2.0f};
- int        field_index_pre[1]     = { 3 };
- int        field_index_pos[2]     = { 1,2 };
-
- /* Define new values for the fields "Latitude,Longitude"  */
- Position   position_in[NRECORDS_ADD] = { {0,0},
- {10,10},
- {20,20} };
-
- size_t field_sizes_pos[2]=
- {
-  sizeof(position_in[0].longi),
-  sizeof(position_in[0].lati)
- };
-
- size_t field_sizes_pre[1]=
- {
-  sizeof(float)
- };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Write the pressure field starting at record 2 */
- nfields  = 1;
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
-   sizeof( float ), 0, field_sizes_pre, pressure_in  );
-
-
- /* Write the new longitude and latitude information starting at record 2  */
- nfields  = 2;
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
-   sizeof( Position ), field_offset_pos, field_sizes_pos, position_in  );
-
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
- /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define a subset of Particle, with latitude and longitude fields */
+    typedef struct Position {
+        int lati;
+        int longi;
+    } Position;
+
+    /* Calculate the type_size and the offsets of our struct members */
+    Particle dst_buf[NRECORDS];
+    size_t   dst_size          = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    size_t field_offset_pos[2] = {HOFFSET(Position, lati), HOFFSET(Position, longi)};
+
+    /* Initially no data */
+    Particle *p_data = NULL;
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    int         compress     = 0;
+    hsize_t     nfields;
+    hsize_t     start;    /* Record to start reading/writing */
+    hsize_t     nrecords; /* Number of records to read/write */
+    int         i;
+
+    /* Define new values for the field "Pressure"  */
+    float pressure_in[NRECORDS_ADD] = {0.0f, 1.0f, 2.0f};
+    int   field_index_pre[1]        = {3};
+    int   field_index_pos[2]        = {1, 2};
+
+    /* Define new values for the fields "Latitude,Longitude"  */
+    Position position_in[NRECORDS_ADD] = {{0, 0}, {10, 10}, {20, 20}};
+
+    size_t field_sizes_pos[2] = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
+
+    size_t field_sizes_pre[1] = {sizeof(float)};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Write the pressure field starting at record 2 */
+    nfields  = 1;
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_index(file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords, sizeof(float), 0,
+                           field_sizes_pre, pressure_in);
+
+    /* Write the new longitude and latitude information starting at record 2  */
+    nfields  = 2;
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_index(file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords, sizeof(Position),
+                           field_offset_pos, field_sizes_pos, position_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index 0397e83..2784430 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -23,73 +23,64 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
 #define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
-  /* Define field information */
-  const char *field_names[NFIELDS]  =
-  { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
-  hid_t      field_type[NFIELDS];
-  hid_t      string_type;
-  hid_t      file_id;
-  hsize_t    chunk_size = 10;
-  Particle   fill_data[1] =
-  { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
-  int        compress  = 0;
-  hsize_t    nfields_out;
-  hsize_t    nrecords_out;
-
-  /* Initialize field_type */
-  string_type = H5Tcopy( H5T_C_S1 );
-  H5Tset_size( string_type, 16 );
-  field_type[0] = string_type;
-  field_type[1] = H5T_NATIVE_INT;
-  field_type[2] = H5T_NATIVE_INT;
-  field_type[3] = H5T_NATIVE_FLOAT;
-  field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make a table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
-                       field_names, dst_offset, field_type,
-                       chunk_size, fill_data, compress, NULL);
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    int         compress     = 0;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, NULL);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index d9ea444..b12cc27 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -23,90 +23,77 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- const char *field_names[NFIELDS]  =     /* Define field information */
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };
- hsize_t    start;                      /* Record to start reading */
- hsize_t    nrecords;                   /* Number of records to insert/delete */
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-  dst_size,field_names, dst_offset, field_type,
-  chunk_size, fill_data, compress, p_data  );
-
- /* Delete records  */
- start    = 3;
- nrecords = 3;
- H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
-
-  /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    const char *field_names[NFIELDS] = /* Define field information */
+        {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t    field_type[NFIELDS];
+    hid_t    string_type;
+    hid_t    file_id;
+    hsize_t  chunk_size   = 10;
+    int      compress     = 0;
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    hsize_t  start;    /* Record to start reading */
+    hsize_t  nrecords; /* Number of records to insert/delete */
+    hsize_t  nfields_out;
+    hsize_t  nrecords_out;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Delete records  */
+    start    = 3;
+    nrecords = 3;
+    H5TBdelete_record(file_id, TABLE_NAME, start, nrecords);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index a45520d..4210460 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -22,121 +22,96 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS      (hsize_t)  5
-#define NRECORDS     (hsize_t)  8
-#define NRECORDS_INS (hsize_t)  2
-#define TABLE_NAME              "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_INS (hsize_t)2
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[ NRECORDS + NRECORDS_INS ];
-
-  /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( p_data[0].name),
-                               sizeof( p_data[0].lati),
-                               sizeof( p_data[0].longi),
-                               sizeof( p_data[0].pressure),
-                               sizeof( p_data[0].temperature)};
-
- /* Define an array of Particles to insert */
- Particle  p_data_insert[NRECORDS_INS] =
- { {"new",30,30, 3.0f, 30.0},
- {"new",40,40, 4.0f, 40.0}
- };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- int        *fill_data = NULL;
- hsize_t    start;      /* Record to start reading */
- hsize_t    nrecords;   /* Number of records to insert/delete */
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
- int        i;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Insert records */
- start    = 3;
- nrecords = NRECORDS_INS;
- H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
-  dst_sizes, p_data_insert );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* get table info  */
- H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_INS];
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(p_data[0].name), sizeof(p_data[0].lati), sizeof(p_data[0].longi),
+                                 sizeof(p_data[0].pressure), sizeof(p_data[0].temperature)};
+
+    /* Define an array of Particles to insert */
+    Particle p_data_insert[NRECORDS_INS] = {{"new", 30, 30, 3.0f, 30.0}, {"new", 40, 40, 4.0f, 40.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int         compress   = 0;
+    int *       fill_data  = NULL;
+    hsize_t     start;    /* Record to start reading */
+    hsize_t     nrecords; /* Number of records to insert/delete */
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+    int         i;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Insert records */
+    start    = 3;
+    nrecords = NRECORDS_INS;
+    H5TBinsert_record(file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset, dst_sizes, p_data_insert);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index a9f5f11..5374aff 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -22,121 +22,99 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS      (hsize_t)  5
-#define NRECORDS     (hsize_t)  8
-#define NRECORDS_INS (hsize_t)  2
-#define TABLE1_NAME             "table1"
-#define TABLE2_NAME             "table2"
-
-int main( void )
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_INS (hsize_t)2
+#define TABLE1_NAME  "table1"
+#define TABLE2_NAME  "table2"
+
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[ NRECORDS + NRECORDS_INS ];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- hsize_t    start1;                      /* Record to start reading from 1st table */
- hsize_t    nrecords;                    /* Number of records to insert */
- hsize_t    start2;                      /* Record to start writing in 2nd table */
- int        i;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make 2 tables: TABLE2_NAME is empty  */
- H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, NULL  );
-
-
- /* Add 2 records from TABLE1_NAME to TABLE2_NAME  */
- start1    = 3;
- nrecords  = NRECORDS_INS;
- start2    = 6;
- H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
-
- /* read TABLE2_NAME: it should have 2 more records now */
- H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_INS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    int         compress     = 0;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    hsize_t     start1;   /* Record to start reading from 1st table */
+    hsize_t     nrecords; /* Number of records to insert */
+    hsize_t     start2;   /* Record to start writing in 2nd table */
+    int         i;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make 2 tables: TABLE2_NAME is empty  */
+    H5TBmake_table("Table Title", file_id, TABLE1_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    H5TBmake_table("Table Title", file_id, TABLE2_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, NULL);
+
+    /* Add 2 records from TABLE1_NAME to TABLE2_NAME  */
+    start1   = 3;
+    nrecords = NRECORDS_INS;
+    start2   = 6;
+    H5TBadd_records_from(file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2);
+
+    /* read TABLE2_NAME: it should have 2 more records now */
+    H5TBread_table(file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE2_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index 8c4d8ae..754974a 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -22,114 +22,92 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE1_NAME         "table1"
-#define TABLE2_NAME         "table2"
-#define TABLE3_NAME         "table3"
-
-int main( void )
+#define NFIELDS     (hsize_t)5
+#define NRECORDS    (hsize_t)8
+#define TABLE1_NAME "table1"
+#define TABLE2_NAME "table2"
+#define TABLE3_NAME "table3"
+
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- Particle  dst_buf[ 2 * NRECORDS ];
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- int        *fill_data = NULL;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
- int        i;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make two tables */
- H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Combine the two tables into a third in the same file  */
- H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
-
- /* read the combined table */
- H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    Particle dst_buf[2 * NRECORDS];
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int         compress   = 0;
+    int *       fill_data  = NULL;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+    int         i;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make two tables */
+    H5TBmake_table("Table Title", file_id, TABLE1_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    H5TBmake_table("Table Title", file_id, TABLE2_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Combine the two tables into a third in the same file  */
+    H5TBcombine_tables(file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME);
+
+    /* read the combined table */
+    H5TBread_table(file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE3_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index d6215cb..4f666b9 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -22,95 +22,81 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle1
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle1;
-
-/* Define an array of Particles */
- Particle1  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size1 =  sizeof( Particle1 );
- size_t dst_offset1[NFIELDS] = { HOFFSET( Particle1, name ),
-  HOFFSET( Particle1, lati ),
-  HOFFSET( Particle1, longi ),
-  HOFFSET( Particle1, pressure ),
-  HOFFSET( Particle1, temperature )};
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle1  fill_data[1] = { {"no data",-1,-1, -99.0f, -99.0} };
- int        fill_data_new[1] = { -100 };
- hsize_t    position;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Define the inserted field information */
- hid_t      field_type_new = H5T_NATIVE_INT;
- int        data[NRECORDS] = { 0,1,2,3,4,5,6,7 };
-
- /* Initialize the field type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size1,field_names, dst_offset1, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Insert the new field at the end of the field list */
- position = NFIELDS;
- H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
-  fill_data_new, data );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle1 {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle1;
+
+    /* Define an array of Particles */
+    Particle1 p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                  {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                  {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                  {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size1            = sizeof(Particle1);
+    size_t dst_offset1[NFIELDS] = {HOFFSET(Particle1, name), HOFFSET(Particle1, lati),
+                                   HOFFSET(Particle1, longi), HOFFSET(Particle1, pressure),
+                                   HOFFSET(Particle1, temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size       = 10;
+    int         compress         = 0;
+    Particle1   fill_data[1]     = {{"no data", -1, -1, -99.0f, -99.0}};
+    int         fill_data_new[1] = {-100};
+    hsize_t     position;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Define the inserted field information */
+    hid_t field_type_new = H5T_NATIVE_INT;
+    int   data[NRECORDS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+    /* Initialize the field type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size1, field_names, dst_offset1,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Insert the new field at the end of the field list */
+    position = NFIELDS;
+    H5TBinsert_field(file_id, TABLE_NAME, "New Field", field_type_new, position, fill_data_new, data);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index f287c29..c13401f 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -23,87 +23,73 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-  HOFFSET( Particle, lati ),
-  HOFFSET( Particle, longi ),
-  HOFFSET( Particle, pressure ),
-  HOFFSET( Particle, temperature )};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
- };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make a table */
- H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
-  field_names, dst_offset, field_type,
-  chunk_size, fill_data, compress, p_data  );
-
- /* Delete the field */
- H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
+                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
+                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
+                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    int         compress     = 0;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize the field type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Delete the field */
+    H5TBdelete_field(file_id, TABLE_NAME, "Pressure");
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/pal_rgb.h b/hl/examples/pal_rgb.h
index f3905b3..a032a77 100644
--- a/hl/examples/pal_rgb.h
+++ b/hl/examples/pal_rgb.h
@@ -11,267 +11,41 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-const unsigned char pal_rgb[256*3] = {255,255,255,
-0,0,131,
-0,0,135,
-0,0,139,
-0,0,143,
-0,0,147,
-0,0,151,
-0,0,155,
-0,0,159,
-0,0,163,
-0,0,167,
-0,0,171,
-0,0,175,
-0,0,179,
-0,0,183,
-0,0,187,
-0,0,191,
-0,0,195,
-0,0,199,
-0,0,203,
-0,0,207,
-0,0,211,
-0,0,215,
-0,0,219,
-0,0,223,
-0,0,227,
-0,0,231,
-0,0,235,
-0,0,239,
-0,0,243,
-0,0,247,
-0,0,251,
-0,0,255,
-0,0,255,
-0,3,255,
-0,7,255,
-0,11,255,
-0,15,255,
-0,19,255,
-0,23,255,
-0,27,255,
-0,31,255,
-0,35,255,
-0,39,255,
-0,43,255,
-0,47,255,
-0,51,255,
-0,55,255,
-0,59,255,
-0,63,255,
-0,67,255,
-0,71,255,
-0,75,255,
-0,79,255,
-0,83,255,
-0,87,255,
-0,91,255,
-0,95,255,
-0,99,255,
-0,103,255,
-0,107,255,
-0,111,255,
-0,115,255,
-0,119,255,
-0,123,255,
-0,127,255,
-0,131,255,
-0,135,255,
-0,139,255,
-0,143,255,
-0,147,255,
-0,151,255,
-0,155,255,
-0,159,255,
-0,163,255,
-0,167,255,
-0,171,255,
-0,175,255,
-0,179,255,
-0,183,255,
-0,187,255,
-0,191,255,
-0,195,255,
-0,199,255,
-0,203,255,
-0,207,255,
-0,211,255,
-0,215,255,
-0,219,255,
-0,223,255,
-0,227,255,
-0,231,255,
-0,235,255,
-0,239,255,
-0,243,255,
-0,247,255,
-0,251,255,
-0,255,255,
-0,255,255,
-3,255,251,
-7,255,247,
-11,255,243,
-15,255,239,
-19,255,235,
-23,255,231,
-27,255,227,
-31,255,223,
-35,255,219,
-39,255,215,
-43,255,211,
-47,255,207,
-51,255,203,
-55,255,199,
-59,255,195,
-63,255,191,
-67,255,187,
-71,255,183,
-75,255,179,
-79,255,175,
-83,255,171,
-87,255,167,
-91,255,163,
-95,255,159,
-99,255,155,
-103,255,151,
-107,255,147,
-111,255,143,
-115,255,139,
-119,255,135,
-123,255,131,
-127,255,127,
-131,255,123,
-135,255,119,
-139,255,115,
-143,255,111,
-147,255,107,
-151,255,103,
-155,255,99,
-159,255,95,
-163,255,91,
-167,255,87,
-171,255,83,
-175,255,79,
-179,255,75,
-183,255,71,
-187,255,67,
-191,255,63,
-195,255,59,
-199,255,55,
-203,255,51,
-207,255,47,
-211,255,43,
-215,255,39,
-219,255,35,
-223,255,31,
-227,255,27,
-231,255,23,
-235,255,19,
-239,255,15,
-243,255,11,
-247,255,7,
-251,255,3,
-255,255,0,
-255,251,0,
-255,247,0,
-255,243,0,
-255,239,0,
-255,235,0,
-255,231,0,
-255,227,0,
-255,223,0,
-255,219,0,
-255,215,0,
-255,211,0,
-255,207,0,
-255,203,0,
-255,199,0,
-255,195,0,
-255,191,0,
-255,187,0,
-255,183,0,
-255,179,0,
-255,175,0,
-255,171,0,
-255,167,0,
-255,163,0,
-255,159,0,
-255,155,0,
-255,151,0,
-255,147,0,
-255,143,0,
-255,139,0,
-255,135,0,
-255,131,0,
-255,127,0,
-255,123,0,
-255,119,0,
-255,115,0,
-255,111,0,
-255,107,0,
-255,103,0,
-255,99,0,
-255,95,0,
-255,91,0,
-255,87,0,
-255,83,0,
-255,79,0,
-255,75,0,
-255,71,0,
-255,67,0,
-255,63,0,
-255,59,0,
-255,55,0,
-255,51,0,
-255,47,0,
-255,43,0,
-255,39,0,
-255,35,0,
-255,31,0,
-255,27,0,
-255,23,0,
-255,19,0,
-255,15,0,
-255,11,0,
-255,7,0,
-255,3,0,
-255,0,0,
-250,0,0,
-246,0,0,
-241,0,0,
-237,0,0,
-233,0,0,
-228,0,0,
-224,0,0,
-219,0,0,
-215,0,0,
-211,0,0,
-206,0,0,
-202,0,0,
-197,0,0,
-193,0,0,
-189,0,0,
-184,0,0,
-180,0,0,
-175,0,0,
-171,0,0,
-167,0,0,
-162,0,0,
-158,0,0,
-153,0,0,
-149,0,0,
-145,0,0,
-140,0,0,
-136,0,0,
-131,0,0,
-127,0,0
-};
-
-
-
-
-
-
-
+const unsigned char pal_rgb[256 * 3] = {
+    255, 255, 255, 0,   0,   131, 0,   0,   135, 0,   0,   139, 0,   0,   143, 0,   0,   147, 0,   0,   151,
+    0,   0,   155, 0,   0,   159, 0,   0,   163, 0,   0,   167, 0,   0,   171, 0,   0,   175, 0,   0,   179,
+    0,   0,   183, 0,   0,   187, 0,   0,   191, 0,   0,   195, 0,   0,   199, 0,   0,   203, 0,   0,   207,
+    0,   0,   211, 0,   0,   215, 0,   0,   219, 0,   0,   223, 0,   0,   227, 0,   0,   231, 0,   0,   235,
+    0,   0,   239, 0,   0,   243, 0,   0,   247, 0,   0,   251, 0,   0,   255, 0,   0,   255, 0,   3,   255,
+    0,   7,   255, 0,   11,  255, 0,   15,  255, 0,   19,  255, 0,   23,  255, 0,   27,  255, 0,   31,  255,
+    0,   35,  255, 0,   39,  255, 0,   43,  255, 0,   47,  255, 0,   51,  255, 0,   55,  255, 0,   59,  255,
+    0,   63,  255, 0,   67,  255, 0,   71,  255, 0,   75,  255, 0,   79,  255, 0,   83,  255, 0,   87,  255,
+    0,   91,  255, 0,   95,  255, 0,   99,  255, 0,   103, 255, 0,   107, 255, 0,   111, 255, 0,   115, 255,
+    0,   119, 255, 0,   123, 255, 0,   127, 255, 0,   131, 255, 0,   135, 255, 0,   139, 255, 0,   143, 255,
+    0,   147, 255, 0,   151, 255, 0,   155, 255, 0,   159, 255, 0,   163, 255, 0,   167, 255, 0,   171, 255,
+    0,   175, 255, 0,   179, 255, 0,   183, 255, 0,   187, 255, 0,   191, 255, 0,   195, 255, 0,   199, 255,
+    0,   203, 255, 0,   207, 255, 0,   211, 255, 0,   215, 255, 0,   219, 255, 0,   223, 255, 0,   227, 255,
+    0,   231, 255, 0,   235, 255, 0,   239, 255, 0,   243, 255, 0,   247, 255, 0,   251, 255, 0,   255, 255,
+    0,   255, 255, 3,   255, 251, 7,   255, 247, 11,  255, 243, 15,  255, 239, 19,  255, 235, 23,  255, 231,
+    27,  255, 227, 31,  255, 223, 35,  255, 219, 39,  255, 215, 43,  255, 211, 47,  255, 207, 51,  255, 203,
+    55,  255, 199, 59,  255, 195, 63,  255, 191, 67,  255, 187, 71,  255, 183, 75,  255, 179, 79,  255, 175,
+    83,  255, 171, 87,  255, 167, 91,  255, 163, 95,  255, 159, 99,  255, 155, 103, 255, 151, 107, 255, 147,
+    111, 255, 143, 115, 255, 139, 119, 255, 135, 123, 255, 131, 127, 255, 127, 131, 255, 123, 135, 255, 119,
+    139, 255, 115, 143, 255, 111, 147, 255, 107, 151, 255, 103, 155, 255, 99,  159, 255, 95,  163, 255, 91,
+    167, 255, 87,  171, 255, 83,  175, 255, 79,  179, 255, 75,  183, 255, 71,  187, 255, 67,  191, 255, 63,
+    195, 255, 59,  199, 255, 55,  203, 255, 51,  207, 255, 47,  211, 255, 43,  215, 255, 39,  219, 255, 35,
+    223, 255, 31,  227, 255, 27,  231, 255, 23,  235, 255, 19,  239, 255, 15,  243, 255, 11,  247, 255, 7,
+    251, 255, 3,   255, 255, 0,   255, 251, 0,   255, 247, 0,   255, 243, 0,   255, 239, 0,   255, 235, 0,
+    255, 231, 0,   255, 227, 0,   255, 223, 0,   255, 219, 0,   255, 215, 0,   255, 211, 0,   255, 207, 0,
+    255, 203, 0,   255, 199, 0,   255, 195, 0,   255, 191, 0,   255, 187, 0,   255, 183, 0,   255, 179, 0,
+    255, 175, 0,   255, 171, 0,   255, 167, 0,   255, 163, 0,   255, 159, 0,   255, 155, 0,   255, 151, 0,
+    255, 147, 0,   255, 143, 0,   255, 139, 0,   255, 135, 0,   255, 131, 0,   255, 127, 0,   255, 123, 0,
+    255, 119, 0,   255, 115, 0,   255, 111, 0,   255, 107, 0,   255, 103, 0,   255, 99,  0,   255, 95,  0,
+    255, 91,  0,   255, 87,  0,   255, 83,  0,   255, 79,  0,   255, 75,  0,   255, 71,  0,   255, 67,  0,
+    255, 63,  0,   255, 59,  0,   255, 55,  0,   255, 51,  0,   255, 47,  0,   255, 43,  0,   255, 39,  0,
+    255, 35,  0,   255, 31,  0,   255, 27,  0,   255, 23,  0,   255, 19,  0,   255, 15,  0,   255, 11,  0,
+    255, 7,   0,   255, 3,   0,   255, 0,   0,   250, 0,   0,   246, 0,   0,   241, 0,   0,   237, 0,   0,
+    233, 0,   0,   228, 0,   0,   224, 0,   0,   219, 0,   0,   215, 0,   0,   211, 0,   0,   206, 0,   0,
+    202, 0,   0,   197, 0,   0,   193, 0,   0,   189, 0,   0,   184, 0,   0,   180, 0,   0,   175, 0,   0,
+    171, 0,   0,   167, 0,   0,   162, 0,   0,   158, 0,   0,   153, 0,   0,   149, 0,   0,   145, 0,   0,
+    140, 0,   0,   136, 0,   0,   131, 0,   0,   127, 0,   0};
diff --git a/hl/examples/ptExampleFL.c b/hl/examples/ptExampleFL.c
index ba7a3a0..66f2040 100644
--- a/hl/examples/ptExampleFL.c
+++ b/hl/examples/ptExampleFL.c
@@ -23,82 +23,80 @@
  *-------------------------------------------------------------------------
  */
 
-int main(void)
+int
+main(void)
 {
- hid_t          fid;        /* File identifier */
- hid_t          ptable;     /* Packet table identifier */
+    hid_t fid;    /* File identifier */
+    hid_t ptable; /* Packet table identifier */
 
- herr_t         err;        /* Function return status */
- hsize_t        count;      /* Number of records in the table */
+    herr_t  err;   /* Function return status */
+    hsize_t count; /* Number of records in the table */
 
- int            x;          /* Loop variable */
+    int x; /* Loop variable */
 
     /* Buffers to hold data */
- int writeBuffer[5];
- int readBuffer[5];
+    int writeBuffer[5];
+    int readBuffer[5];
 
-   /* Initialize buffers */
- for(x=0; x<5; x++)
- {
-     writeBuffer[x]=x;
-     readBuffer[x] = -1;
- }
+    /* Initialize buffers */
+    for (x = 0; x < 5; x++) {
+        writeBuffer[x] = x;
+        readBuffer[x]  = -1;
+    }
 
     /* Create a file using default properties */
- fid=H5Fcreate("packet_table_FLexample.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+    fid = H5Fcreate("packet_table_FLexample.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create a fixed-length packet table within the file */
     /* This table's "packets" will be simple integers and it will use compression
      * level 5. */
- ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, (hsize_t)100, 5);
- if(ptable == H5I_INVALID_HID)
-     goto out;
+    ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, (hsize_t)100, 5);
+    if (ptable == H5I_INVALID_HID)
+        goto out;
 
     /* Write one packet to the packet table */
- err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]) );
- if(err < 0)
-     goto out;
+    err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]));
+    if (err < 0)
+        goto out;
 
     /* Write several packets to the packet table */
- err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]) );
- if(err < 0)
-     goto out;
+    err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]));
+    if (err < 0)
+        goto out;
 
     /* Get the number of packets in the packet table.  This should be five. */
- err = H5PTget_num_packets(ptable, &count);
- if(err < 0)
-     goto out;
+    err = H5PTget_num_packets(ptable, &count);
+    if (err < 0)
+        goto out;
 
- printf("Number of packets in packet table after five appends: %d\n", (int)count);
+    printf("Number of packets in packet table after five appends: %d\n", (int)count);
 
     /* Initialize packet table's "current record" */
- err = H5PTcreate_index(ptable);
- if(err < 0)
-     goto out;
+    err = H5PTcreate_index(ptable);
+    if (err < 0)
+        goto out;
 
     /* Iterate through packets, read each one back */
- for(x=0; x<5; x++)
- {
-    err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]) );
-    if(err < 0)
-	goto out;
+    for (x = 0; x < 5; x++) {
+        err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]));
+        if (err < 0)
+            goto out;
 
-    printf("Packet %d's value is %d\n", x, readBuffer[x]);
- }
+        printf("Packet %d's value is %d\n", x, readBuffer[x]);
+    }
 
     /* Close the packet table */
- err = H5PTclose(ptable);
- if(err < 0)
-     goto out;
+    err = H5PTclose(ptable);
+    if (err < 0)
+        goto out;
 
     /* Close the file */
- H5Fclose(fid);
+    H5Fclose(fid);
 
- return 0;
+    return 0;
 
- out: /* An error has occurred.  Clean up and exit. */
+out: /* An error has occurred.  Clean up and exit. */
     H5PTclose(ptable);
     H5Fclose(fid);
     return -1;
 }
-
diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c
index 0bb594d..398e2b3 100644
--- a/hl/fortran/src/H5DSfc.c
+++ b/hl/fortran/src/H5DSfc.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -18,354 +18,352 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5dsset_scale_c
-*
-* Purpose: Calls H5DSset_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsset_scale_c
+ *
+ * Purpose: Calls H5DSset_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen) 
+h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen)
 {
-  char *c_dimname = NULL;
-  int_f ret_value = 0;
-  
-  /*
-   * convert FORTRAN name to C name
-   */
-  
-  if(*dimnamelen != 0)
-    if(NULL == (c_dimname = (char *)HD5f2cstring(dimname, (size_t)*dimnamelen)))
-      HGOTO_DONE(FAIL)
-
-   /*
-    * call H5DSset_scale function.
-    */
-
-   if(H5DSset_scale( (hid_t)*dsid, c_dimname) < 0)
-     HGOTO_DONE(FAIL)
-
-   done:
-     if(c_dimname)
-       HDfree(c_dimname);
-
-  return ret_value;
+    char *c_dimname = NULL;
+    int_f ret_value = 0;
 
-} /* end h5dsset_scale_c() */
+    /*
+     * convert FORTRAN name to C name
+     */
+
+    if (*dimnamelen != 0)
+        if (NULL == (c_dimname = (char *)HD5f2cstring(dimname, (size_t)*dimnamelen)))
+            HGOTO_DONE(FAIL)
+
+    /*
+     * call H5DSset_scale function.
+     */
+
+    if (H5DSset_scale((hid_t)*dsid, c_dimname) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
+    if (c_dimname)
+        HDfree(c_dimname);
 
+    return ret_value;
+
+} /* end h5dsset_scale_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSattach_scale_c
-*
-* Purpose: Calls H5DSattach_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSattach_scale_c
+ *
+ * Purpose: Calls H5DSattach_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx) 
+h5dsattach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if(H5DSattach_scale( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx ) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
+    int_f ret_value = 0;
+
+    /*
+     * call H5DSset_scale function.
+     */
+
+    if (H5DSattach_scale((hid_t)*did, (hid_t)*dsid, (unsigned)*idx) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
     return ret_value;
 
 } /* end h5dsattach_scale_c() */
 
-
 /*-------------------------------------------------------------------------
-* Function: H5DSdetach_scale_c
-*
-* Purpose: Calls H5DSdetach_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSdetach_scale_c
+ *
+ * Purpose: Calls H5DSdetach_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsdetach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx) 
+h5dsdetach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if(H5DSdetach_scale( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx ) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
+    int_f ret_value = 0;
+
+    /*
+     * call H5DSset_scale function.
+     */
+
+    if (H5DSdetach_scale((hid_t)*did, (hid_t)*dsid, (unsigned)*idx) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
     return ret_value;
 
 } /* end h5dsdetach_scale_c() */
 
-
 /*-------------------------------------------------------------------------
-* Function: H5DSis_attached_c
-*
-* Purpose: Calls H5DSis_attached
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSis_attached_c
+ *
+ * Purpose: Calls H5DSis_attached
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsis_attached_c( hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *is_attached) 
+h5dsis_attached_c(hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *is_attached)
 {
-  int_f ret_value = 0;
-  htri_t c_is_attached;
-  
-  /*
-   * call H5DSis_attached function.
-   */
+    int_f  ret_value = 0;
+    htri_t c_is_attached;
+
+    /*
+     * call H5DSis_attached function.
+     */
+
+    if ((c_is_attached = H5DSis_attached((hid_t)*did, (hid_t)*dsid, (unsigned)*idx)) < 0)
+        HGOTO_DONE(FAIL)
 
-  if((c_is_attached = H5DSis_attached( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx )) < 0)
-    HGOTO_DONE(FAIL)
+    *is_attached = (int_f)c_is_attached;
 
-  *is_attached = (int_f)c_is_attached;
-      
-  done:
-      return ret_value;
+done:
+    return ret_value;
 
 } /* end h5dsis_attached_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_scale_c
-*
-* Purpose: Calls H5DSis_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSis_scale_c
+ *
+ * Purpose: Calls H5DSis_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsis_scale_c( hid_t_f *did, int_f *is_scale) 
+h5dsis_scale_c(hid_t_f *did, int_f *is_scale)
 {
-  int_f ret_value = 0;
-  htri_t c_is_scale;
-  
-  /*
-   * call H5DSis_scale function.
-   */
-  
-  if((c_is_scale=H5DSis_scale( (hid_t)*did )) < 0)
-    HGOTO_DONE(FAIL)
-
-  *is_scale = (int_f)c_is_scale;
-      
-  done:
+    int_f  ret_value = 0;
+    htri_t c_is_scale;
+
+    /*
+     * call H5DSis_scale function.
+     */
+
+    if ((c_is_scale = H5DSis_scale((hid_t)*did)) < 0)
+        HGOTO_DONE(FAIL)
+
+    *is_scale = (int_f)c_is_scale;
+
+done:
     return ret_value;
 
 } /* end h5dsis_scale_c() */
 
-
 /*-------------------------------------------------------------------------
-* Function: h5dsset_label_c
-*
-* Purpose: Calls H5DSset_label
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsset_label_c
+ *
+ * Purpose: Calls H5DSset_label
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen) 
+h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen)
 {
-  char *c_label = NULL;
-  int_f ret_value = 0;
-  
-  /*
-   * convert FORTRAN name to C name
-   */
-  
-  if(NULL == (c_label = (char *)HD5f2cstring(label, (size_t)*labellen)))
-    HGOTO_DONE(FAIL)
+    char *c_label   = NULL;
+    int_f ret_value = 0;
+
+    /*
+     * convert FORTRAN name to C name
+     */
 
-  /*
-   * call H5DSset_label function.
-   */
+    if (NULL == (c_label = (char *)HD5f2cstring(label, (size_t)*labellen)))
+        HGOTO_DONE(FAIL)
 
-  if(H5DSset_label( (hid_t)*did, (unsigned)*idx, c_label) < 0)
-    HGOTO_DONE(FAIL)
+    /*
+     * call H5DSset_label function.
+     */
 
-  done:
-     if(c_label)
-       HDfree(c_label);
+    if (H5DSset_label((hid_t)*did, (unsigned)*idx, c_label) < 0)
+        HGOTO_DONE(FAIL)
 
-  return ret_value;
+done:
+    if (c_label)
+        HDfree(c_label);
+
+    return ret_value;
 
 } /* end h5dsset_label_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5dsget_label_c
-*
-* Purpose: Calls H5DSget_label
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsget_label_c
+ *
+ * Purpose: Calls H5DSget_label
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size) 
+h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
 {
-  char *c_label = NULL;
-  ssize_t size_c = -1;
-  int_f ret_value = 0;
-
-  /*
-   * Allocate buffer to hold label
-   */
-  if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * call H5DSget_label function.
-   */
-      
-  if( (size_c = H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
-    HGOTO_DONE(FAIL)
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-      
-  HD5packFstring(c_label, _fcdtocp(label), (size_t)*size);
+    char *  c_label   = NULL;
+    ssize_t size_c    = -1;
+    int_f   ret_value = 0;
+
+    /*
+     * Allocate buffer to hold label
+     */
+    if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * call H5DSget_label function.
+     */
+
+    if ((size_c = H5DSget_label((hid_t)*did, (unsigned)*idx, c_label, (size_t)*size + 1)) < 0)
+        HGOTO_DONE(FAIL)
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+
+    HD5packFstring(c_label, _fcdtocp(label), (size_t)*size);
 
 done:
-     *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the 
-                                * trailing NULL in the length calculation, Ref. HDFFV-7596 */
-     if(c_label) HDfree(c_label);
-     return ret_value;
+    *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the
+                               * trailing NULL in the length calculation, Ref. HDFFV-7596 */
+    if (c_label)
+        HDfree(c_label);
+    return ret_value;
 
 } /* end h5dsget_label_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5dsget_scale_name_c
-*
-* Purpose: Calls H5DSget_scale_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsget_scale_name_c
+ *
+ * Purpose: Calls H5DSget_scale_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size) 
+h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
 {
-  char *c_scale_name = NULL;
-  ssize_t size_c = -1;
-  int_f ret_value = 0;
-
-  /*
-   * Allocate buffer to hold name
-   */
-  if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * call H5DSget_scale_name function.
-   */
-      
-  if( (size_c = H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
-    HGOTO_DONE(FAIL)
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-  HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
-  *size = (size_t_f)size_c;
+    char *  c_scale_name = NULL;
+    ssize_t size_c       = -1;
+    int_f   ret_value    = 0;
+
+    /*
+     * Allocate buffer to hold name
+     */
+    if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * call H5DSget_scale_name function.
+     */
+
+    if ((size_c = H5DSget_scale_name((hid_t)*did, c_scale_name, (size_t)*size + 1)) < 0)
+        HGOTO_DONE(FAIL)
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
+    *size = (size_t_f)size_c;
 
 done:
-  if(c_scale_name) HDfree(c_scale_name);
-  return ret_value;
+    if (c_scale_name)
+        HDfree(c_scale_name);
+    return ret_value;
 
 } /* end h5dsget_scale_name_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_num_scales_c
-*
-* Purpose: Calls H5DSget_num_scales
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSget_num_scales_c
+ *
+ * Purpose: Calls H5DSget_num_scales
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales) 
+h5dsget_num_scales_c(hid_t_f *did, int_f *idx, int_f *num_scales)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if( (*num_scales = (int_f)H5DSget_num_scales( (hid_t)*did, (unsigned)*idx)) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
+    int_f ret_value = 0;
+
+    /*
+     * call H5DSset_scale function.
+     */
+
+    if ((*num_scales = (int_f)H5DSget_num_scales((hid_t)*did, (unsigned)*idx)) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
     return ret_value;
 
 } /* end h5dsget_num_scales_c() */
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index c6e4b1b..8a43589 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -16,16 +16,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-
 /*-------------------------------------------------------------------------
  * private functions
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         hid_t tid,
-                         void *pal_data);
+herr_t H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid, void *pal_data);
 
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_image_8bitf
@@ -48,77 +43,76 @@ herr_t H5IM_get_palette(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_8bitf(hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t width,
-                             hsize_t height,
-                             int_f *buf)
+herr_t
+H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, int_f *buf)
 {
- hid_t    did;                  /* dataset ID */
- hid_t    sid;                  /* space ID */
- hsize_t  dims[IMAGE8_RANK];  /* dimensions */
+    hid_t   did;               /* dataset ID */
+    hid_t   sid;               /* space ID */
+    hsize_t dims[IMAGE8_RANK]; /* dimensions */
 
- /* initialize the image dimensions */
- dims[0] = height;
- dims[1] = width;
+    /* initialize the image dimensions */
+    dims[0] = height;
+    dims[1] = width;
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(IMAGE8_RANK, dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UINT8, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/
- /* Fail if otherwise */
- if(buf) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else
-       return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(IMAGE8_RANK, dims, NULL)) < 0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UINT8, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
- /* attach the CLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
-  return -1;
+    /* write with memory type H5T_NATIVE_INT */
+    /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/
+    /* Fail if otherwise */
+    if (buf) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* attach the VERSION attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- /* attach the IMAGE_SUBCLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
-  return -1;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
- return 0;
-}
+    /* attach the CLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
+        return -1;
 
+    /* attach the VERSION attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
+        return -1;
+
+    /* attach the IMAGE_SUBCLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
+        return -1;
 
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_image_24bitf
@@ -146,96 +140,94 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_24bitf(hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t width,
-                              hsize_t height,
-                              const char *interlace,
-                              int_f *buf)
+herr_t
+H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                      const char *interlace, int_f *buf)
 {
- hid_t    did;                /* dataset ID */
- hid_t    sid;                /* space ID */
- hsize_t  dims[IMAGE24_RANK]; /* dimensions */
+    hid_t   did;                /* dataset ID */
+    hid_t   sid;                /* space ID */
+    hsize_t dims[IMAGE24_RANK]; /* dimensions */
+
+    /*-------------------------------------------------------------------------
+     * attach the image dimensions according to the interlace mode
+     *-------------------------------------------------------------------------
+     */
+    if (strcmp(interlace, "INTERLACE_PIXEL") == 0) {
+        /* Number of color planes is defined as the third dimension */
+        dims[0] = height;
+        dims[1] = width;
+        dims[2] = IMAGE24_RANK;
+    }
+    else if (strcmp(interlace, "INTERLACE_PLANE") == 0) {
+        /* Number of color planes is defined as the first dimension */
+        dims[0] = IMAGE24_RANK;
+        dims[1] = height;
+        dims[2] = width;
+    }
+    else
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the image dimensions according to the interlace mode
- *-------------------------------------------------------------------------
- */
- if(strcmp(interlace, "INTERLACE_PIXEL") == 0) {
-  /* Number of color planes is defined as the third dimension */
-  dims[0] = height;
-  dims[1] = width;
-  dims[2] = IMAGE24_RANK;
- }
- else
- if(strcmp(interlace, "INTERLACE_PLANE") == 0) {
-  /* Number of color planes is defined as the first dimension */
-  dims[0] = IMAGE24_RANK;
-  dims[1] = height;
-  dims[2] = width;
- }
- else
-  return -1;
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(IMAGE24_RANK, dims, NULL)) < 0)
+        return -1;
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(IMAGE24_RANK, dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- if(buf) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else
-   return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* write with memory type H5T_NATIVE_INT */
+    if (buf) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* Attach the CLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- /* Attach the VERSION attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
-  return -1;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
- /* Attach the IMAGE_SUBCLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
-  return -1;
+    /* Attach the CLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
+        return -1;
 
- /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
- if(H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
-  return -1;
+    /* Attach the VERSION attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
+        return -1;
 
- return 0;
+    /* Attach the IMAGE_SUBCLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
+        return -1;
 
-}
+    /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
+    if (H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
+        return -1;
 
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMread_imagef
@@ -258,33 +250,32 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMread_imagef(hid_t loc_id,
-                        const char *dset_name,
-                        int_f *buf)
+herr_t
+H5IMread_imagef(hid_t loc_id, const char *dset_name, int_f *buf)
 {
-    hid_t   did;
-    hid_t   tid;
+    hid_t did;
+    hid_t tid;
 
     /* open the dataset */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* determine appropriate datatype to use */
-    if(sizeof(int_f) == sizeof(int))
+    if (sizeof(int_f) == sizeof(int))
         tid = H5T_NATIVE_INT;
-    else if(sizeof(int_f) == sizeof(long))
+    else if (sizeof(int_f) == sizeof(long))
         tid = H5T_NATIVE_LONG;
-    else if(sizeof(int_f) == sizeof(long long))
+    else if (sizeof(int_f) == sizeof(long long))
         tid = H5T_NATIVE_LLONG;
     else
         goto out;
 
     /* read to memory */
-    if(H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         return -1;
 
     return 0;
@@ -294,7 +285,6 @@ out:
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_palettef
  *
@@ -318,75 +308,75 @@ out:
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_palettef(hid_t loc_id,
-                          const char *pal_name,
-                          const hsize_t *pal_dims,
-                          int_f *pal_data)
+herr_t
+H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, int_f *pal_data)
 
 {
 
- hid_t did;                /* dataset ID */
- hid_t sid;                /* space ID */
- int   has_pal;
+    hid_t did; /* dataset ID */
+    hid_t sid; /* space ID */
+    int   has_pal;
 
- /* Check if the dataset already exists */
- has_pal = H5LTfind_dataset(loc_id, pal_name);
+    /* Check if the dataset already exists */
+    has_pal = H5LTfind_dataset(loc_id, pal_name);
 
- /* It exists. Return */
- if(has_pal == 1)
-  return 0;
+    /* It exists. Return */
+    if (has_pal == 1)
+        return 0;
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(2, pal_dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, pal_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- if(pal_data) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else
-      return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(2, pal_dims, NULL)) < 0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, pal_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
- /* Attach the attribute "CLASS" to the >>palette<< dataset*/
- if(H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
-  return -1;
+    /* write with memory type H5T_NATIVE_INT */
+    if (pal_data) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
- if(H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- return 0;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
-}
+    /* Attach the attribute "CLASS" to the >>palette<< dataset*/
+    if (H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
+        return -1;
 
+    /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
+    if (H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
+        return -1;
+
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMget_palettef
@@ -411,20 +401,17 @@ herr_t H5IMmake_palettef(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMget_palettef(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         int_f *pal_data)
+herr_t
+H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data)
 {
- if(sizeof(int_f) == sizeof(int))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_INT,pal_data);
- else if(sizeof(int_f) == sizeof(long))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LONG,pal_data);
- else if(sizeof(int_f) == sizeof(long long))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LLONG,pal_data);
- else
-  return -1;
-
+    if (sizeof(int_f) == sizeof(int))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_INT, pal_data);
+    else if (sizeof(int_f) == sizeof(long))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_LONG, pal_data);
+    else if (sizeof(int_f) == sizeof(long long))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_LLONG, pal_data);
+    else
+        return -1;
 }
 
 /*-------------------------------------------------------------------------
@@ -452,96 +439,88 @@ herr_t H5IMget_palettef(hid_t loc_id,
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         hid_t tid,
-                         void *pal_data)
+herr_t
+H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid, void *pal_data)
 {
- hid_t      image_id;
- int        has_pal;
- hid_t      attr_type;
- hid_t      attr_id;
- hid_t      attr_space_id;
- hid_t      attr_class;
- hssize_t   n_refs;
- size_t    dim_ref;
- hobj_ref_t *refbuf;     /* buffer to read references */
- hid_t      pal_id;
-
- /* Open the dataset. */
- if((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* Try to find the attribute "PALETTE" on the >>image<< dataset */
- has_pal = H5IM_find_palette(image_id);
+    hid_t       image_id;
+    int         has_pal;
+    hid_t       attr_type;
+    hid_t       attr_id;
+    hid_t       attr_space_id;
+    hid_t       attr_class;
+    hssize_t    n_refs;
+    size_t      dim_ref;
+    hobj_ref_t *refbuf; /* buffer to read references */
+    hid_t       pal_id;
+
+    /* Open the dataset. */
+    if ((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+        return -1;
 
- if(has_pal ==  1)
- {
+    /* Try to find the attribute "PALETTE" on the >>image<< dataset */
+    has_pal = H5IM_find_palette(image_id);
 
-  if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
-   goto out;
+    if (has_pal == 1) {
 
-  if((attr_type = H5Aget_type(attr_id)) < 0)
-   goto out;
+        if ((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
+            goto out;
 
-  if((attr_class = H5Tget_class(attr_type)) < 0)
-   goto out;
+        if ((attr_type = H5Aget_type(attr_id)) < 0)
+            goto out;
 
-  /* Check if it is really a reference */
-  if(attr_class == H5T_REFERENCE)
-  {
+        if ((attr_class = H5Tget_class(attr_type)) < 0)
+            goto out;
 
-   /* Get the reference(s) */
-   if((attr_space_id = H5Aget_space(attr_id)) < 0)
-    goto out;
+        /* Check if it is really a reference */
+        if (attr_class == H5T_REFERENCE) {
 
-   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
+            /* Get the reference(s) */
+            if ((attr_space_id = H5Aget_space(attr_id)) < 0)
+                goto out;
 
-   dim_ref = (size_t)n_refs;
+            n_refs = H5Sget_simple_extent_npoints(attr_space_id);
 
-   refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
+            dim_ref = (size_t)n_refs;
 
-   if(H5Aread(attr_id, attr_type, refbuf) < 0)
-    goto out;
+            refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
 
-   /* Get the palette id */
-   if((pal_id = H5Rdereference2(image_id, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
-    goto out;
+            if (H5Aread(attr_id, attr_type, refbuf) < 0)
+                goto out;
 
-   /* Read the palette dataset using the memory type TID */
-   if(H5Dread(pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-    goto out;
+            /* Get the palette id */
+            if ((pal_id = H5Rdereference2(image_id, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
+                goto out;
 
-   if(H5Sclose(attr_space_id) < 0)
-    goto out;
+            /* Read the palette dataset using the memory type TID */
+            if (H5Dread(pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                goto out;
 
-   /* close the dereferenced dataset */
-   if(H5Dclose(pal_id) < 0)
-    goto out;
+            if (H5Sclose(attr_space_id) < 0)
+                goto out;
 
-   HDfree(refbuf);
+            /* close the dereferenced dataset */
+            if (H5Dclose(pal_id) < 0)
+                goto out;
 
-  } /* H5T_REFERENCE */
+            HDfree(refbuf);
 
-  if(H5Tclose(attr_type) < 0)
-   goto out;
+        } /* H5T_REFERENCE */
 
-  /* Close the attribute. */
-  if(H5Aclose(attr_id) < 0)
-   goto out;
+        if (H5Tclose(attr_type) < 0)
+            goto out;
 
- }
+        /* Close the attribute. */
+        if (H5Aclose(attr_id) < 0)
+            goto out;
+    }
 
- /* Close the image dataset. */
- if(H5Dclose(image_id) < 0)
-  return -1;
+    /* Close the image dataset. */
+    if (H5Dclose(image_id) < 0)
+        return -1;
 
- return 0;
+    return 0;
 
 out:
- H5Dclose(image_id);
- return -1;
-
-
+    H5Dclose(image_id);
+    return -1;
 }
diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h
index a65669d..34d3a4e 100644
--- a/hl/fortran/src/H5IMcc.h
+++ b/hl/fortran/src/H5IMcc.h
@@ -22,34 +22,16 @@
 extern "C" {
 #endif
 
+herr_t H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, int_f *buf);
 
-herr_t H5IMmake_image_8bitf( hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t width,
-                             hsize_t height,
-                             int_f *buf );
-
-herr_t H5IMmake_image_24bitf( hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t width,
-                              hsize_t height,
-                              const char *interlace,
-                              int_f *buf);
-
-herr_t H5IMread_imagef( hid_t loc_id,
-                        const char *dset_name,
-                        int_f *buf );
-
-herr_t H5IMmake_palettef( hid_t loc_id,
-                          const char *pal_name,
-                          const hsize_t *pal_dims,
-                          int_f *pal_data );
-
-herr_t H5IMget_palettef( hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         int_f *pal_data );
+herr_t H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                             const char *interlace, int_f *buf);
 
+herr_t H5IMread_imagef(hid_t loc_id, const char *dset_name, int_f *buf);
+
+herr_t H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, int_f *pal_data);
+
+herr_t H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data);
 
 #ifdef __cplusplus
 }
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index cafd623..f892e51 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -18,51 +18,47 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5immake_image_8bit_c
-*
-* Purpose: Call H5IMmake_image_8bit
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_image_8bit_c
+ *
+ * Purpose: Call H5IMmake_image_8bit
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5immake_image_8bit_c (hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *width,
-                        hsize_t_f *height,
-                        int_f *buf)
+h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                      int_f *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
     hid_t   c_loc_id;
-    char    *c_name = NULL;
-    hsize_t w = (hsize_t)*width;
-    hsize_t h = (hsize_t)*height;
+    char *  c_name = NULL;
+    hsize_t w      = (hsize_t)*width;
+    hsize_t h      = (hsize_t)*height;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMmake_image_8bitf function.
-    */
+     * call H5IMmake_image_8bitf function.
+     */
     c_loc_id = (hid_t)*loc_id;
-    ret = H5IMmake_image_8bitf(c_loc_id,c_name,w,h,buf);
+    ret      = H5IMmake_image_8bitf(c_loc_id, c_name, w, h, buf);
 
     if (ret < 0)
         goto done;
@@ -70,54 +66,49 @@ h5immake_image_8bit_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
-
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5imread_image_c
-*
-* Purpose: Call H5IMread_image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imread_image_c
+ *
+ * Purpose: Call H5IMread_image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imread_image_c (hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *buf)
+h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    char    *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    char * c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMread_image function.
-    */
-    ret = H5IMread_imagef((hid_t)*loc_id,c_name,buf);
+     * call H5IMread_image function.
+     */
+    ret = H5IMread_imagef((hid_t)*loc_id, c_name, buf);
 
     if (ret < 0)
         goto done;
@@ -125,52 +116,46 @@ h5imread_image_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5immake_image_24bit_c
-*
-* Purpose: Call H5IMmake_image_24bit
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_image_24bit_c
+ *
+ * Purpose: Call H5IMmake_image_24bit
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5immake_image_24bit_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         size_t_f *ilen,
-                         _fcd il,
-                         hsize_t_f *width,
-                         hsize_t_f *height,
-                         void *buf)
+h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd il,
+                       hsize_t_f *width, hsize_t_f *height, void *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
     hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_il = NULL;
-    hsize_t w = (hsize_t)*width;
-    hsize_t h = (hsize_t)*height;
+    char *  c_name = NULL;
+    char *  c_il   = NULL;
+    hsize_t w      = (hsize_t)*width;
+    hsize_t h      = (hsize_t)*height;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -180,11 +165,11 @@ h5immake_image_24bit_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMmake_image_24bitf function.
-    */
+     * call H5IMmake_image_24bitf function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,(int_f *)buf);
+    ret = H5IMmake_image_24bitf(c_loc_id, c_name, w, h, c_il, (int_f *)buf);
 
     if (ret < 0)
         goto done;
@@ -192,238 +177,218 @@ h5immake_image_24bit_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_il!=NULL)
+    if (c_il != NULL)
         HDfree(c_il);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5imget_image_info_c
-*
-* Purpose: Call H5IMget_image_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imget_image_info_c
+ *
+ * Purpose: Call H5IMget_image_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imget_image_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *width,
-                      hsize_t_f *height,
-                      hsize_t_f *planes,
-                      hsize_t_f *npals,
-                      size_t_f *ilen,
-                      _fcd interlace)
+h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                     hsize_t_f *planes, hsize_t_f *npals, size_t_f *ilen, _fcd interlace)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hsize_t      c_width;
-    hsize_t      c_height;
-    hsize_t      c_planes;
-    hssize_t     c_npals;
-    char         *c_buf=NULL;           /* buffer to hold C string */
+    int      ret_value = -1;
+    herr_t   ret;
+    hid_t    c_loc_id;
+    char *   c_name = NULL;
+    hsize_t  c_width;
+    hsize_t  c_height;
+    hsize_t  c_planes;
+    hssize_t c_npals;
+    char *   c_buf = NULL; /* buffer to hold C string */
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * allocate buffer to hold name of an attribute
-    */
-    if ((c_buf = (char *)HDmalloc((size_t)*ilen +1)) == NULL)
+     * allocate buffer to hold name of an attribute
+     */
+    if ((c_buf = (char *)HDmalloc((size_t)*ilen + 1)) == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_image_info(c_loc_id,c_name,&c_width,&c_height,&c_planes,c_buf,&c_npals);
+    ret = H5IMget_image_info(c_loc_id, c_name, &c_width, &c_height, &c_planes, c_buf, &c_npals);
 
     if (ret < 0)
         goto done;
 
-    *width  = (hsize_t_f) c_width;
-    *height = (hsize_t_f) c_height;
-    *planes = (hsize_t_f) c_planes;
-    *npals  = (hsize_t_f) c_npals;
+    *width  = (hsize_t_f)c_width;
+    *height = (hsize_t_f)c_height;
+    *planes = (hsize_t_f)c_planes;
+    *npals  = (hsize_t_f)c_npals;
 
     /*
-    * convert C name to FORTRAN and place it in the given buffer
-    */
+     * convert C name to FORTRAN and place it in the given buffer
+     */
     HD5packFstring(c_buf, _fcdtocp(interlace), (size_t)*ilen);
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imis_image_c
-*
-* Purpose: Call H5IMis_image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imis_image_c
+ *
+ * Purpose: Call H5IMis_image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imis_image_c(hid_t_f *loc_id,
-                size_t_f *namelen,
-                _fcd name)
+h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
 {
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    herr_t  ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
+    herr_t ret;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * call H5LTget_dataset_ndims function.
-    */
+     * call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5IMis_image(c_loc_id, c_name);
 
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5immake_palette_c
-*
-* Purpose: Call H5IMmake_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_palette_c
+ *
+ * Purpose: Call H5IMmake_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5immake_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *dims,
-                     void *buf)
+h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf)
 {
-    char    *c_name = NULL;
+    char *  c_name = NULL;
     hsize_t c_dims[H5S_MAX_RANK];
     int     i;
-    int     rank=2;
+    int     rank      = 2;
     int_f   ret_value = 0;
 
     /*
-    * convert FORTRAN name to C name
-    */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+     * convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < rank ; i++)
-      c_dims[i] =  (hsize_t)dims[i];
+    for (i = 0; i < rank; i++)
+        c_dims[i] = (hsize_t)dims[i];
 
     /*
-    * call H5IMmake_palette function.
-    */
-    if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
+     * call H5IMmake_palette function.
+     */
+    if (H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imlink_palette_c
-*
-* Purpose: Call H5IMlink_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imlink_palette_c
+ *
+ * Purpose: Call H5IMlink_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imlink_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     size_t_f *ilen,
-                     _fcd pal_name)
+h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_namepal = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name    = NULL;
+    char * c_namepal = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -433,11 +398,11 @@ h5imlink_palette_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMlink_palette function.
-    */
+     * call H5IMlink_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMlink_palette(c_loc_id,c_name,c_namepal);
+    ret = H5IMlink_palette(c_loc_id, c_name, c_namepal);
 
     if (ret < 0)
         goto done;
@@ -445,50 +410,45 @@ h5imlink_palette_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_namepal!=NULL)
+    if (c_namepal != NULL)
         HDfree(c_namepal);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imunlink_palette_c
-*
-* Purpose: Call H5IMunlink_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imunlink_palette_c
+ *
+ * Purpose: Call H5IMunlink_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imunlink_palette_c (hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *ilen,
-                       _fcd pal_name)
+h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_namepal = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name    = NULL;
+    char * c_namepal = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -498,11 +458,11 @@ h5imunlink_palette_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMunlink_palette function.
-    */
+     * call H5IMunlink_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMunlink_palette(c_loc_id,c_name,c_namepal);
+    ret = H5IMunlink_palette(c_loc_id, c_name, c_namepal);
 
     if (ret < 0)
         goto done;
@@ -510,62 +470,57 @@ h5imunlink_palette_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_namepal!=NULL)
+    if (c_namepal != NULL)
         HDfree(c_namepal);
 
     return ret_value;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_npalettes_c
-*
-* Purpose: Call H5IMget_npalettes
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imget_npalettes_c
+ *
+ * Purpose: Call H5IMget_npalettes
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imget_npalettes_c(hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *npals)
+h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *npals)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hssize_t     c_npals;
+    int      ret_value = -1;
+    herr_t   ret;
+    hid_t    c_loc_id;
+    char *   c_name = NULL;
+    hssize_t c_npals;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_npalettes(c_loc_id,c_name,&c_npals);
+    ret = H5IMget_npalettes(c_loc_id, c_name, &c_npals);
 
-    *npals  = (hsize_t_f) c_npals;
+    *npals = (hsize_t_f)c_npals;
 
     if (ret < 0)
         goto done;
@@ -573,184 +528,166 @@ h5imget_npalettes_c(hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_palette_info_c
-*
-* Purpose: Call H5IMget_palette_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: h5imget_palette_info_c
+ *
+ * Purpose: Call H5IMget_palette_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imget_palette_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *pal_number,
-                        hsize_t_f *dims)
+h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, hsize_t_f *dims)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hsize_t      c_dims[2];
-    int          i;
+    int     ret_value = -1;
+    herr_t  ret;
+    hid_t   c_loc_id;
+    char *  c_name = NULL;
+    hsize_t c_dims[2];
+    int     i;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_palette_info(c_loc_id,c_name,*pal_number,c_dims);
+    ret = H5IMget_palette_info(c_loc_id, c_name, *pal_number, c_dims);
 
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < 2 ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[i];
+    for (i = 0; i < 2; i++) {
+        dims[i] = (hsize_t_f)c_dims[i];
     }
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_palette_c
-*
-* Purpose: Call H5IMget_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: h5imget_palette_c
+ *
+ * Purpose: Call H5IMget_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imget_palette_c(hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *pal_number,
-                   void *buf)
+h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, void *buf)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
-         goto done;
+        goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,(int_f *)buf);
+    ret = H5IMget_palettef(c_loc_id, c_name, *pal_number, (int_f *)buf);
 
     if (ret < 0)
-         goto done;
+        goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imis_palette_c
-*
-* Purpose: Call H5IMis_palette
-*
-* Return: true, false, fail
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imis_palette_c
+ *
+ * Purpose: Call H5IMis_palette
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5imis_palette_c(hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name)
+h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
 {
-    hid_t   c_loc_id;
-    char    *c_name;
-    herr_t  ret;
+    hid_t  c_loc_id;
+    char * c_name;
+    herr_t ret;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * call H5IMis_palette function.
-    */
+     * call H5IMis_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5IMis_palette(c_loc_id, c_name);
 
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret;
-
 }
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 031db2c..b3c0a72 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -1,16 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef _H5LTf90proto_H
 #define _H5LTf90proto_H
@@ -22,414 +21,189 @@
 
 /* These definitions should match those in fortran/src/H5f90kit.c */
 
-H5_FCDLL char*  HD5f2cstring (_fcd fdesc, size_t len);
-H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
+H5_FCDLL char *HD5f2cstring(_fcd fdesc, size_t len);
+H5_FCDLL void  HD5packFstring(char *src, char *dest, size_t len);
 
 /*
  *  Functions from H5DSfc.c
  */
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
+int_f h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
+int_f h5dsattach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsdetach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
+int_f h5dsdetach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsis_attached_c( hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *c_is_attached);
+int_f h5dsis_attached_c(hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *c_is_attached);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsis_scale_c(hid_t_f *did, int_f *is_scale);
+int_f h5dsis_scale_c(hid_t_f *did, int_f *is_scale);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
+int_f h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
+int_f h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsget_scale_name_c(hid_t_f *did, _fcd label, size_t_f *size);
+int_f h5dsget_scale_name_c(hid_t_f *did, _fcd label, size_t_f *size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales);
+int_f h5dsget_num_scales_c(hid_t_f *did, int_f *idx, int_f *num_scales);
 
 /*
  *  Functions from H5LTfc.c
  */
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5ltmake_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltread_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltset_attribute_c(hid_t_f *loc_id,
-		    size_t_f *namelen,
-		    _fcd dsetname,
-		    size_t_f *attrnamelen,
-		    _fcd attrname,
-		    size_t_f *size,
-		    void *buf, char *dtype, size_t_f *sizeof_val);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_attribute_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-		         void *buf, char* dtype, size_t_f *sizeof_val);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_attribute_string_c(hid_t_f *loc_id,
-			   size_t_f *namelen,
-			   _fcd dsetname,
-			   size_t_f *attrnamelen,
-			   _fcd attrname,
-			   _fcd buf,
-			   size_t_f *buf_size);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltfind_dataset_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_dataset_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *dims,
-                        int_f *type_class,
-                        size_t_f *type_size);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           int_f *rank);
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltget_attribute_info_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *attrnamelen,
-                          _fcd attrname,
-                          hsize_t_f *dims,
-                          int_f *type_class,
-                          size_t_f *type_size);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *buflen,
-                            char *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltread_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            char *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5ltpath_valid_c(hid_t_f *loc_id, 
-                  _fcd path, 
-                  size_t_f *pathlen, 
-                  int_f *check_object_valid_c);
+int_f h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, hsize_t_f *dims,
+                         hid_t_f *type_id, void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_id, void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, size_t_f *size, void *buf, char *dtype, size_t_f *sizeof_val);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, void *buf, char *dtype, size_t_f *sizeof_val);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                                 _fcd attrname, _fcd buf, size_t_f *buf_size);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank);
 
-/*-------------------------------------------------------------------------
-* Image
-*-------------------------------------------------------------------------
-*/
 HDF5_HL_F90CSTUBDLL
-int_f
-h5immake_image_8bit_c (hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *width,
-                        hsize_t_f *height,
-                        int_f *buf);
+int_f h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
+
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imread_image_c (hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *buf);
+int_f h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims,
+                             int_f *type_class, size_t_f *type_size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5immake_image_24bit_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         size_t_f *ilen,
-                         _fcd il,
-                         hsize_t_f *width,
-                         hsize_t_f *height,
-                         void *buf);
+int_f h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                                _fcd attrname, int_f *rank);
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imget_image_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *width,
-                      hsize_t_f *height,
-                      hsize_t_f *planes,
-                      hsize_t_f *npals,
-                      size_t_f *ilen,
-                      _fcd interlace);
+int_f h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *attrnamelen,
+                               _fcd attrname, hsize_t_f *dims, int_f *type_class, size_t_f *type_size);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *buflen, char *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imis_image_c(hid_t_f *loc_id,
-                size_t_f *namelen,
-                _fcd name);
+int_f h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *buf);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c);
 
+/*-------------------------------------------------------------------------
+ * Image
+ *-------------------------------------------------------------------------
+ */
 HDF5_HL_F90CSTUBDLL
-int_f
-h5immake_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *dims,
-                     void *buf);
+int_f h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width,
+                            hsize_t_f *height, int_f *buf);
+HDF5_HL_F90CSTUBDLL
+int_f h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imlink_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     size_t_f *ilen,
-                     _fcd pal_name);
+int_f h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd il,
+                             hsize_t_f *width, hsize_t_f *height, void *buf);
+HDF5_HL_F90CSTUBDLL
+int_f h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                           hsize_t_f *planes, hsize_t_f *npals, size_t_f *ilen, _fcd interlace);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imunlink_palette_c (hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *ilen,
-                       _fcd pal_name);
+int_f h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imget_npalettes_c(hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *npals);
+int_f h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imget_palette_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *pal_number,
-                        hsize_t_f *dims);
+int_f h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imget_palette_c(hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *pal_number,
-                   void *buf);
+int_f h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *npals);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-h5imis_palette_c(hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name);
+int_f h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number,
+                             hsize_t_f *dims);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, void *buf);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
 
 /*-------------------------------------------------------------------------
-* Table
-*-------------------------------------------------------------------------
-*/
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbmake_table_c(size_t_f *namelen1,
-                  _fcd name1,
-                  hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name,
-                  hsize_t_f *nfields,
-                  hsize_t_f *nrecords,
-                  size_t_f *type_size,
-                  size_t_f *field_offset,
-                  hid_t_f *field_types,
-                  hsize_t_f *chunk_size,
-                  int_f *compress,
-                  size_t_f *char_len_field_names, /* field_names lengths */
-                  size_t_f *max_char_size_field_names, /* char len of fields */
-                  _fcd buf);          /* field_names */
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbread_table_c(hid_t_f *loc_id,
-                  _fcd name,
-                  size_t_f *namelen,
-		  hsize_t_f *nfields,
-                  size_t_f *dst_size,
-                  size_t_f *dst_offset,
-                  size_t_f *dst_sizes,
-		 void *dst_buf);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbmake_table_ptr_c(size_t_f *namelen1,
-		     _fcd name1,
-		     hid_t_f *loc_id,
-		     size_t_f *namelen,
-		     _fcd name,
-		     hsize_t_f *nfields,
-		     hsize_t_f *nrecords,
-		     size_t_f *type_size,
-		     size_t_f *field_offset,
-		     hid_t_f *field_types,
-		     hsize_t_f *chunk_size,
-		     void *fill_data,
-		     int_f *compress,
-		     size_t_f *char_len_field_names, /* field_names lengths */
-		     size_t_f *max_char_size_field_names, /* char len of fields */
-		     char *field_names, /* field_names */
-		     void *data);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbwrite_field_name_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        size_t_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
-
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbread_field_name_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hsize_t_f *start,
-                       hsize_t_f *nrecords,
-                       size_t_f *type_size,
-                       void *buf);
-
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbwrite_field_index_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *field_index,
-                         hsize_t_f *start,
-                         hsize_t_f *nrecords,
-                         size_t_f *type_size,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbread_field_index_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbinsert_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbdelete_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbget_table_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      hsize_t_f *nrecords);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-h5tbget_field_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      size_t_f *field_sizes,
-                      size_t_f *field_offsets,
-                      size_t_f *type_size,
-                      size_t_f *namelen2,
-                      size_t_f *lenmax,
-                      _fcd field_names,
-                      size_t_f *maxlen_out);    
+ * Table
+ *-------------------------------------------------------------------------
+ */
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                       hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                       hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
+                       size_t_f *char_len_field_names,      /* field_names lengths */
+                       size_t_f *max_char_size_field_names, /* char len of fields */
+                       _fcd      buf);                           /* field_names */
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size,
+                       size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                           hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size,
+                           size_t_f *field_offset, hid_t_f *field_types, hsize_t_f *chunk_size,
+                           void *fill_data, int_f *compress,
+                           size_t_f *char_len_field_names,      /* field_names lengths */
+                           size_t_f *max_char_size_field_names, /* char len of fields */
+                           char *    field_names,               /* field_names */
+                           void *    data);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,
+                             _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size,
+                             void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,
+                            _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size,
+                            void *buf);
 
+HDF5_HL_F90CSTUBDLL
+int_f h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index,
+                              hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index,
+                             hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                         hid_t_f *field_type, int_f *position, void *buf);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
+                           hsize_t_f *nrecords);
+
+HDF5_HL_F90CSTUBDLL
+int_f h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
+                           size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size,
+                           size_t_f *namelen2, size_t_f *lenmax, _fcd field_names, size_t_f *maxlen_out);
 
 #endif /* _H5LTf90proto_H */
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 0f8a58f..afe6419 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -18,121 +18,111 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTmake_dataset_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltmake_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf)
+h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, hsize_t_f *dims,
+                   hid_t_f *type_id, void *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    char    *c_name = NULL;
+    int      ret_value = -1;
+    herr_t   ret;
+    char *   c_name = NULL;
     hsize_t *c_dims = NULL;
-    int     i;
+    int      i;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_dims =  (hsize_t *)HDmalloc(sizeof(hsize_t) * ( (size_t)*rank ));
+    c_dims = (hsize_t *)HDmalloc(sizeof(hsize_t) * ((size_t)*rank));
     if (c_dims == NULL)
         goto done;
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
-    for (i = 0; i < *rank ; i++)
-    {
-        c_dims[i] =  dims[*rank - i - 1];
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
+    for (i = 0; i < *rank; i++) {
+        c_dims[i] = dims[*rank - i - 1];
     }
 
     /*
-    * call H5LTmake_dataset function.
-    */
+     * call H5LTmake_dataset function.
+     */
 
-    ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf );
+    ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf);
     if (ret < 0)
         goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_dims!=NULL)
+    if (c_dims != NULL)
         HDfree(c_dims);
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltread_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf)
+h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_id, void *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    hid_t   c_type_id;
-    char    *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    hid_t  c_type_id;
+    char * c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTread_dataset function.
-    */
-    c_loc_id = (hid_t)*loc_id;
+     * call H5LTread_dataset function.
+     */
+    c_loc_id  = (hid_t)*loc_id;
     c_type_id = (hid_t)*type_id;
 
-    ret = H5LTread_dataset(c_loc_id, c_name, c_type_id, buf );
+    ret = H5LTread_dataset(c_loc_id, c_name, c_type_id, buf);
 
     if (ret < 0)
         goto done;
@@ -140,47 +130,43 @@ h5ltread_dataset_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_string_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTmake_dataset_string_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *buflen,
-                            char *buf)
+h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *buflen, char *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_buf = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
+    char * c_buf  = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -190,11 +176,11 @@ h5ltmake_dataset_string_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTmake_dataset_string function.
-    */
+     * call H5LTmake_dataset_string function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTmake_dataset_string(c_loc_id,c_name,c_buf);
+    ret = H5LTmake_dataset_string(c_loc_id, c_name, c_buf);
 
     if (ret < 0)
         goto done;
@@ -202,58 +188,54 @@ h5ltmake_dataset_string_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_string_c
-*
-* Purpose: Call H5LTread_dataset_string
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_string_c
+ *
+ * Purpose: Call H5LTread_dataset_string
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltread_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            char *buf)
+h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTread_dataset_string function.
-    */
+     * call H5LTread_dataset_string function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTread_dataset_string(c_loc_id,c_name,buf);
+    ret = H5LTread_dataset_string(c_loc_id, c_name, buf);
 
     if (ret < 0)
         goto done;
@@ -261,51 +243,46 @@ h5ltread_dataset_string_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_int_c
-*
-* Purpose: Call H5LTset_attribute_int
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_int_c
+ *
+ * Purpose: Call H5LTset_attribute_int
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltset_attribute_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-                         size_t_f *size,
-		         void *buf, char *dtype, size_t_f *sizeof_val)
+h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname,
+                    size_t_f *size, void *buf, char *dtype, size_t_f *sizeof_val)
 {
-    int     ret_value = -1;
-    herr_t  ret = SUCCEED;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    char    *c_buf = NULL;
-    size_t  c_size;
+    int    ret_value = -1;
+    herr_t ret       = SUCCEED;
+    hid_t  c_loc_id;
+    char * c_name     = NULL;
+    char * c_attrname = NULL;
+    char * c_buf      = NULL;
+    size_t c_size;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -315,93 +292,97 @@ h5ltset_attribute_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTset_attribute_int function.
-    */
+     * call H5LTset_attribute_int function.
+     */
     c_loc_id = (hid_t)*loc_id;
     c_size   = (size_t)*size;
 
-    if( HDstrncmp(dtype,"I",1) == 0 ) {
-      if ((size_t)*sizeof_val == sizeof(int))
-        ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_INT, (const int *)buf);
-      else if ((size_t)*sizeof_val == sizeof(long))
-	ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_LONG, (const long *)buf);
+    if (HDstrncmp(dtype, "I", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(int))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_INT,
+                                               (const int *)buf);
+        else if ((size_t)*sizeof_val == sizeof(long))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LONG,
+                                               (const long *)buf);
 #if H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG
-      else if ((size_t)*sizeof_val == sizeof(long long))
-        ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_LLONG, (const long long *)buf);
+        else if ((size_t)*sizeof_val == sizeof(long long))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LLONG,
+                                               (const long long *)buf);
 #endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
-      else
-        goto done;
-    } else if ( HDstrncmp(dtype,"R",1) == 0 ) {
-      if((size_t)*sizeof_val == sizeof(float))
-	ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_FLOAT, (const float *)buf);
-      else if((size_t)*sizeof_val == sizeof(double))
-	ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_DOUBLE,  (const double *)buf);
-#if H5_SIZEOF_LONG_DOUBLE !=0
-      else if((size_t)*sizeof_val == sizeof(long double))
-	ret = H5LT_set_attribute_numerical(c_loc_id,c_name,c_attrname, c_size, H5T_NATIVE_LDOUBLE, (const long double *)buf);
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "R", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(float))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_FLOAT,
+                                               (const float *)buf);
+        else if ((size_t)*sizeof_val == sizeof(double))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_DOUBLE,
+                                               (const double *)buf);
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        else if ((size_t)*sizeof_val == sizeof(long double))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LDOUBLE,
+                                               (const long double *)buf);
 #endif
-      else
-        goto done;
-    } else if ( HDstrncmp(dtype,"C",1) == 0 ) {
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "C", 1) == 0) {
 
-      c_buf = (char *)HD5f2cstring((_fcd)buf, c_size);
-      if (c_buf == NULL)
-        goto done;
+        c_buf = (char *)HD5f2cstring((_fcd)buf, c_size);
+        if (c_buf == NULL)
+            goto done;
 
-      ret = H5LTset_attribute_string(c_loc_id,c_name,c_attrname,c_buf);
+        ret = H5LTset_attribute_string(c_loc_id, c_name, c_attrname, c_buf);
     }
     if (ret < 0)
-      goto done;
+        goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-     if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_c
-*
-* Purpose: Call H5LTget_attribute_int
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_c
+ *
+ * Purpose: Call H5LTget_attribute_int
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_attribute_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-		         void *buf, char *dtype, size_t_f *sizeof_val)
+h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname,
+                    void *buf, char *dtype, size_t_f *sizeof_val)
 {
-    int     ret_value = -1;
-    herr_t  ret = SUCCEED;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
+    int    ret_value = -1;
+    herr_t ret       = SUCCEED;
+    hid_t  c_loc_id;
+    char * c_name     = NULL;
+    char * c_attrname = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -411,84 +392,81 @@ h5ltget_attribute_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTget_attribute_int function.
-    */
+     * call H5LTget_attribute_int function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    if( HDstrncmp(dtype,"I",1) == 0) {
-      if((size_t)*sizeof_val == sizeof(int))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_INT,buf);
-      else if ((size_t)*sizeof_val == sizeof(long))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_LONG,buf);
+    if (HDstrncmp(dtype, "I", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(int))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_INT, buf);
+        else if ((size_t)*sizeof_val == sizeof(long))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LONG, buf);
 #if H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG
-      else if ((size_t)*sizeof_val == sizeof(long long))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_LLONG,buf);
+        else if ((size_t)*sizeof_val == sizeof(long long))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LLONG, buf);
 #endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
-      else
-        goto done;
-    } else if ( HDstrncmp(dtype,"R",1) == 0 ) {
-      if((size_t)*sizeof_val == sizeof(float))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_FLOAT,buf);
-      else if((size_t)*sizeof_val == sizeof(double))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_DOUBLE,buf);
-#if H5_SIZEOF_LONG_DOUBLE !=0
-      else if((size_t)*sizeof_val == sizeof(long double))
-	ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_LDOUBLE,buf);
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "R", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(float))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_FLOAT, buf);
+        else if ((size_t)*sizeof_val == sizeof(double))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_DOUBLE, buf);
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        else if ((size_t)*sizeof_val == sizeof(long double))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LDOUBLE, buf);
 #endif
-      else
-        goto done;
+        else
+            goto done;
     }
- 
+
     if (ret < 0)
         goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_string_c
-*
-* Purpose: Call H5LTget_attribute_string
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_string_c
+ *
+ * Purpose: Call H5LTget_attribute_string
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_attribute_string_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            _fcd buf, size_t_f *buf_size)
+h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                           _fcd attrname, _fcd buf, size_t_f *buf_size)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    char    *c_buf = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    char * c_name     = NULL;
+    char * c_attrname = NULL;
+    char * c_buf      = NULL;
 
     /*
-    * Convert FORTRAN name to C name
-    */
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -500,75 +478,71 @@ h5ltget_attribute_string_c(hid_t_f *loc_id,
      * Allocate buffer to hold C attribute string
      */
     if ((c_buf = (char *)HDmalloc((size_t)*buf_size + 1)) == NULL)
-      goto done;
+        goto done;
 
     /*
      * Call H5LTget_attribute_int function.
      */
-    ret = H5LTget_attribute_string((hid_t)*loc_id,c_name,c_attrname,c_buf);
+    ret = H5LTget_attribute_string((hid_t)*loc_id, c_name, c_attrname, c_buf);
     if (ret < 0)
         goto done;
 
     /*
      * Convert C name to FORTRAN and place it in the given buffer
      */
-    HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buf_size); 
+    HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buf_size);
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_dataset_ndims_c
-*
-* Purpose: Call H5LTget_dataset_ndims
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_dataset_ndims_c
+ *
+ * Purpose: Call H5LTget_dataset_ndims
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank)
+h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    int     c_rank;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
+    int    c_rank;
 
     /*
-    * Convert FORTRAN name to C name
-    */
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * Call H5LTget_dataset_ndims function.
-    */
+     * Call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank);
@@ -576,113 +550,105 @@ h5ltget_dataset_ndims_c(hid_t_f *loc_id,
     if (ret < 0)
         goto done;
 
-    *rank = (int_f)c_rank;
+    *rank     = (int_f)c_rank;
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5ltfind_dataset_c
-*
-* Purpose: Call H5LTfind_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5ltfind_dataset_c
+ *
+ * Purpose: Call H5LTfind_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltfind_dataset_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name)
+h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
 {
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    herr_t  ret;
+    hid_t  c_loc_id;
+    char * c_name = NULL;
+    herr_t ret;
 
     /*
-    * Convert FORTRAN name to C name
-    */
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * Call H5LTget_dataset_ndims function.
-    */
+     * Call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTfind_dataset(c_loc_id, c_name);
 
-    if(c_name!=NULL)
-       HDfree(c_name);
+    if (c_name != NULL)
+        HDfree(c_name);
 
     return ret;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltget_dataset_info_c
-*
-* Purpose: Call H5LTget_dataset_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5ltget_dataset_info_c
+ *
+ * Purpose: Call H5LTget_dataset_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_dataset_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *dims,
-                        int_f *type_class,
-                        size_t_f *type_size)
+h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, int_f *type_class,
+                       size_t_f *type_size)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    H5T_class_t  c_classtype;
-    size_t       c_type_size;
-    hsize_t      c_dims[32];
-    int          i;
-    int          c_rank;
+    int         ret_value = -1;
+    herr_t      ret;
+    hid_t       c_loc_id;
+    char *      c_name = NULL;
+    H5T_class_t c_classtype;
+    size_t      c_type_size;
+    hsize_t     c_dims[32];
+    int         i;
+    int         c_rank;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTget_dataset_ndims function.
-    */
+     * call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTget_dataset_info(c_loc_id, c_name, c_dims, &c_classtype, &c_type_size);
@@ -690,68 +656,62 @@ h5ltget_dataset_info_c(hid_t_f *loc_id,
         goto done;
 
     *type_class = c_classtype;
-    *type_size = (size_t_f)c_type_size;
+    *type_size  = (size_t_f)c_type_size;
 
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
 
     ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank);
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < c_rank ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[c_rank - i - 1];
+    for (i = 0; i < c_rank; i++) {
+        dims[i] = (hsize_t_f)c_dims[c_rank - i - 1];
     }
 
-
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltget_attribute_ndims_c
-*
-* Purpose: Call H5LTget_attribute_ndims
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5ltget_attribute_ndims_c
+ *
+ * Purpose: Call H5LTget_attribute_ndims
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           int_f *rank)
+h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, int_f *rank)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    int     c_rank;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char * c_name     = NULL;
+    char * c_attrname = NULL;
+    int    c_rank;
 
     /*
-    * Convert FORTRAN name to C name
-    */
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -761,72 +721,64 @@ h5ltget_attribute_ndims_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * Call H5LTset_attribute_ndims function.
-    */
+     * Call H5LTset_attribute_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank);
+    ret = H5LTget_attribute_ndims(c_loc_id, c_name, c_attrname, &c_rank);
 
     if (ret < 0)
         goto done;
 
-    *rank = (int_f)c_rank;
+    *rank     = (int_f)c_rank;
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5ltget_attribute_info_c
-*
-* Purpose: Call H5LTget_attribute_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5ltget_attribute_info_c
+ *
+ * Purpose: Call H5LTget_attribute_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltget_attribute_info_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *attrnamelen,
-                          _fcd attrname,
-                          hsize_t_f *dims,
-                          int_f *type_class,
-                          size_t_f *type_size)
+h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *attrnamelen, _fcd attrname,
+                         hsize_t_f *dims, int_f *type_class, size_t_f *type_size)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    char         *c_attrname = NULL;
-    H5T_class_t  c_classtype;
-    size_t       c_type_size;
-    hsize_t      c_dims[32];
-    int          i;
-    int          c_rank;
+    int         ret_value = -1;
+    herr_t      ret;
+    hid_t       c_loc_id;
+    char *      c_name     = NULL;
+    char *      c_attrname = NULL;
+    H5T_class_t c_classtype;
+    size_t      c_type_size;
+    hsize_t     c_dims[32];
+    int         i;
+    int         c_rank;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -836,90 +788,84 @@ h5ltget_attribute_info_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTget_attribute_info function.
-    */
+     * call H5LTget_attribute_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_info(c_loc_id,c_name,c_attrname,c_dims,&c_classtype,&c_type_size);
+    ret = H5LTget_attribute_info(c_loc_id, c_name, c_attrname, c_dims, &c_classtype, &c_type_size);
     if (ret < 0)
         goto done;
 
     *type_class = c_classtype;
-    *type_size = (size_t_f)c_type_size;
+    *type_size  = (size_t_f)c_type_size;
 
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
 
-    ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank);
+    ret = H5LTget_attribute_ndims(c_loc_id, c_name, c_attrname, &c_rank);
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < c_rank ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[c_rank - i - 1];
+    for (i = 0; i < c_rank; i++) {
+        dims[i] = (hsize_t_f)c_dims[c_rank - i - 1];
     }
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
-
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltpath_valid_c
-*
-* Purpose: Calls h5ltpath_valid
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: February 18, 2012
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5ltpath_valid_c
+ *
+ * Purpose: Calls h5ltpath_valid
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: February 18, 2012
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-h5ltpath_valid_c(hid_t_f *loc_id, 
-                  _fcd path, 
-                  size_t_f *pathlen, 
-                  int_f *check_object_valid_c)
+h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c)
 {
-    htri_t ret = -1;
-    char *c_path = NULL;
+    htri_t  ret    = -1;
+    char *  c_path = NULL;
     hbool_t check_object_valid;
 
     /*
      * convert FORTRAN name to C name
      */
-    if( NULL == (c_path = (char *)HD5f2cstring(path, (size_t)*pathlen)))
-      goto done;
-    
+    if (NULL == (c_path = (char *)HD5f2cstring(path, (size_t)*pathlen)))
+        goto done;
+
     check_object_valid = FALSE;
-    if(*check_object_valid_c == 1)
-      check_object_valid = TRUE;
+    if (*check_object_valid_c == 1)
+        check_object_valid = TRUE;
 
     /*
      * call H5LTpath_valid function.
      */
-    ret = H5LTpath_valid( (hid_t)*loc_id, c_path, check_object_valid );
+    ret = H5LTpath_valid((hid_t)*loc_id, c_path, check_object_valid);
 
 done:
-    if(c_path != NULL)
-      HDfree(c_path);
+    if (c_path != NULL)
+        HDfree(c_path);
 
     return (int_f)ret;
 }
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 331f0bc..c95600b 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <math.h>
 
@@ -20,579 +20,570 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5tbmake_table_c
-*
-* Purpose: Call H5TBmake_table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbmake_table_c
+ *
+ * Purpose: Call H5TBmake_table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
 h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
-		 hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
-		 hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
-		 size_t_f *char_len_field_names, /* field_names lengths */
-		 size_t_f *max_char_size_field_names, /* char len of fields */
-		 char *field_names)            /* field_names */
+                 hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                 hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
+                 size_t_f *char_len_field_names,      /* field_names lengths */
+                 size_t_f *max_char_size_field_names, /* char len of fields */
+                 char *    field_names)                   /* field_names */
 {
-    char *c_name = NULL;
-    char *c_name1 = NULL;
+    char *  c_name  = NULL;
+    char *  c_name1 = NULL;
     hsize_t num_elem;
     hsize_t i;
-    hsize_t c_nfields = (hsize_t)*nfields;
+    hsize_t c_nfields      = (hsize_t)*nfields;
     size_t *c_field_offset = NULL;
-    hid_t *c_field_types = NULL;
-    char **c_field_names = NULL;
-    char *tmp = NULL, *tmp_p;
-    int_f ret_value = 0;
+    hid_t * c_field_types  = NULL;
+    char ** c_field_names  = NULL;
+    char *  tmp            = NULL, *tmp_p;
+    int_f   ret_value      = 0;
 
     num_elem = (hsize_t)*nfields;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < num_elem; i++) {
-      c_field_offset[i] = (size_t)field_offset[i];
-        c_field_types[i] = field_types[i];
+    for (i = 0; i < num_elem; i++) {
+        c_field_offset[i] = (size_t)field_offset[i];
+        c_field_types[i]  = field_types[i];
     } /* end for */
 
     /*
      * allocate array of character pointers
      */
-    if(NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     /* copy data to long C string */
-    if(NULL == (tmp = (char *)HD5f2cstring(field_names, (size_t)*(max_char_size_field_names)*(size_t)num_elem)))
+    if (NULL ==
+        (tmp = (char *)HD5f2cstring(field_names, (size_t) * (max_char_size_field_names) * (size_t)num_elem)))
         HGOTO_DONE(FAIL)
     /*
      * move data from temorary buffer
      */
     tmp_p = tmp;
-    for(i = 0; i < num_elem; i++) {
-        if(NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+    for (i = 0; i < num_elem; i++) {
+        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
         HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
         c_field_names[i][char_len_field_names[i]] = '\0';
-        tmp_p = tmp_p + *max_char_size_field_names;
+        tmp_p                                     = tmp_p + *max_char_size_field_names;
     } /* end for */
 
     /*
      * call H5TBmake_table function.
      */
-    if(H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords,
-            (size_t)*type_size, (const char **)c_field_names, c_field_offset, c_field_types,
-            (hsize_t)*chunk_size, NULL, *compress, NULL) < 0)
+    if (H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords, (size_t)*type_size,
+                       (const char **)c_field_names, c_field_offset, c_field_types, (hsize_t)*chunk_size,
+                       NULL, *compress, NULL) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
-    if(c_field_names) {
-        for(i = 0; i < num_elem; i++) {
-            if(c_field_names[i])
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++) {
+            if (c_field_names[i])
                 HDfree(c_field_names[i]);
         } /* end for */
         HDfree(c_field_names);
     } /* end if */
-    if(tmp)
+    if (tmp)
         HDfree(tmp);
-    if(c_field_offset)
+    if (c_field_offset)
         HDfree(c_field_offset);
-    if(c_field_types)
+    if (c_field_types)
         HDfree(c_field_types);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5tbmake_table_ptr_c
-*
-* Purpose: Call H5TBmake_table using F2003 features
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: Sept. 10, 2015
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbmake_table_ptr_c
+ *
+ * Purpose: Call H5TBmake_table using F2003 features
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: Sept. 10, 2015
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen,
-		     _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size,
-		     size_t_f *field_offset, hid_t_f *field_types, hsize_t_f *chunk_size,
-		     void *fill_data, int_f *compress, 
-		     size_t_f *char_len_field_names, /* field_names lengths */
-		     size_t_f *max_char_size_field_names, /* char len of fields */
-		     char *field_names,
-		     void *data)            /* field_names */
+h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                     hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                     hid_t_f *field_types, hsize_t_f *chunk_size, void *fill_data, int_f *compress,
+                     size_t_f *char_len_field_names,      /* field_names lengths */
+                     size_t_f *max_char_size_field_names, /* char len of fields */
+                     char *field_names, void *data)       /* field_names */
 {
-    char *c_name = NULL;
-    char *c_name1 = NULL;
+    char *  c_name  = NULL;
+    char *  c_name1 = NULL;
     hsize_t num_elem;
     hsize_t i;
-    hsize_t c_nfields = (hsize_t)*nfields;
+    hsize_t c_nfields      = (hsize_t)*nfields;
     size_t *c_field_offset = NULL;
-    hid_t *c_field_types = NULL;
-    char **c_field_names = NULL;
-    char *tmp = NULL, *tmp_p;
-    int_f ret_value = 0;
+    hid_t * c_field_types  = NULL;
+    char ** c_field_names  = NULL;
+    char *  tmp            = NULL, *tmp_p;
+    int_f   ret_value      = 0;
 
     num_elem = (hsize_t)*nfields;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < num_elem; i++) {
-      c_field_offset[i] = (size_t)field_offset[i];
-        c_field_types[i] = field_types[i];
+    for (i = 0; i < num_elem; i++) {
+        c_field_offset[i] = (size_t)field_offset[i];
+        c_field_types[i]  = field_types[i];
     } /* end for */
 
     /*
      * allocate array of character pointers
      */
-    if(NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     /* copy data to long C string */
-    if(NULL == (tmp = (char *)HD5f2cstring(field_names, (size_t)*(max_char_size_field_names)*(size_t)num_elem)))
+    if (NULL ==
+        (tmp = (char *)HD5f2cstring(field_names, (size_t) * (max_char_size_field_names) * (size_t)num_elem)))
         HGOTO_DONE(FAIL)
     /*
      * move data from temorary buffer
      */
     tmp_p = tmp;
-    for(i = 0; i < num_elem; i++) {
-        if(NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+    for (i = 0; i < num_elem; i++) {
+        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
         HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
         c_field_names[i][char_len_field_names[i]] = '\0';
-        tmp_p = tmp_p + *max_char_size_field_names;
+        tmp_p                                     = tmp_p + *max_char_size_field_names;
     } /* end for */
 
     /*
      * call H5TBmake_table function.
      */
-    if(H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords,
-            (size_t)*type_size, (const char **)c_field_names, c_field_offset, c_field_types,
-            (hsize_t)*chunk_size, fill_data, *compress, data) < 0)
+    if (H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords, (size_t)*type_size,
+                       (const char **)c_field_names, c_field_offset, c_field_types, (hsize_t)*chunk_size,
+                       fill_data, *compress, data) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
-    if(c_field_names) {
-        for(i = 0; i < num_elem; i++) {
-            if(c_field_names[i])
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++) {
+            if (c_field_names[i])
                 HDfree(c_field_names[i]);
         } /* end for */
         HDfree(c_field_names);
     } /* end if */
-    if(tmp)
+    if (tmp)
         HDfree(tmp);
-    if(c_field_offset)
+    if (c_field_offset)
         HDfree(c_field_offset);
-    if(c_field_types)
+    if (c_field_types)
         HDfree(c_field_types);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
 
-
 /*-------------------------------------------------------------------------
-* Function: h5tbread_table_c
-*
-* Purpose: Call H5TBread_table using F2003 features 
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: Sept. 14, 2015
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbread_table_c
+ *
+ * Purpose: Call H5TBread_table using F2003 features
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: Sept. 14, 2015
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields,
-		 size_t_f *dst_size, size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf)
+h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size,
+                 size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf)
 {
-    char *c_name = NULL;
+    char *  c_name       = NULL;
     size_t *c_dst_offset = NULL;
-    size_t *c_dst_sizes = NULL;
-    hsize_t c_nfields = (hsize_t)*nfields;
-    int_f ret_value = 0;
+    size_t *c_dst_sizes  = NULL;
+    hsize_t c_nfields    = (hsize_t)*nfields;
+    int_f   ret_value    = 0;
     hsize_t i;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-	  
-    if(NULL == (c_dst_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+
+    if (NULL == (c_dst_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_dst_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_dst_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < c_nfields; i++) {
-      c_dst_offset[i] = (size_t)dst_offset[i];
-      c_dst_sizes[i] = (size_t)dst_sizes[i];
-    } /* end for */	  
+    for (i = 0; i < c_nfields; i++) {
+        c_dst_offset[i] = (size_t)dst_offset[i];
+        c_dst_sizes[i]  = (size_t)dst_sizes[i];
+    } /* end for */
 
     /*
      * call H5TBread_table function.
      */
-    if(H5TBread_table( (hid_t)*loc_id, c_name, (size_t)*dst_size, c_dst_offset,
-		       c_dst_sizes, dst_buf) < 0)
+    if (H5TBread_table((hid_t)*loc_id, c_name, (size_t)*dst_size, c_dst_offset, c_dst_sizes, dst_buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
-    if(c_dst_offset)
+    if (c_dst_offset)
         HDfree(c_dst_offset);
-    if(c_dst_sizes)
+    if (c_dst_sizes)
         HDfree(c_dst_sizes);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
 
-
-
-
 /*-------------------------------------------------------------------------
-* Function: h5tbwrite_field_name_c
-*
-* Purpose: Call H5TBwrite_fields_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbwrite_field_name_c
+ *
+ * Purpose: Call H5TBwrite_fields_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
 h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
-		       hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
+                       hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    size_t  c_type_size[1]  = {(size_t)*type_size};
-    int_f   ret_value = 0;
+    char * c_name         = NULL;
+    char * c_name1        = NULL;
+    size_t c_type_size[1] = {(size_t)*type_size};
+    int_f  ret_value      = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBwrite_fields_name function.
      */
-    if(H5TBwrite_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start,
-            (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0)
+    if (H5TBwrite_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, (hsize_t)*nrecords,
+                              c_type_size[0], 0, c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5tbread_field_name_c
-*
-* Purpose: Call H5TBread_fields_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbread_field_name_c
+ *
+ * Purpose: Call H5TBread_fields_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
 h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
-		      hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
+                      hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    size_t  c_type_size[1]  = {(size_t)*type_size};
-    int_f   ret_value = 0;
+    char * c_name         = NULL;
+    char * c_name1        = NULL;
+    size_t c_type_size[1] = {(size_t)*type_size};
+    int_f  ret_value      = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBread_fields_name function.
      */
-    if(H5TBread_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start,
-            (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0)
+    if (H5TBread_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, (hsize_t)*nrecords,
+                             c_type_size[0], 0, c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbwrite_field_index_c
-*
-* Purpose: Call H5TBwrite_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbwrite_field_index_c
+ *
+ * Purpose: Call H5TBwrite_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
 h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
-			hsize_t_f *nrecords, size_t_f *type_size, void *buf)
+                        hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name =  NULL;
-    size_t  c_type_size  = *type_size;
-    int     c_field_index = *field_index - 1; /* C zero based index */
-    int_f   ret_value = 0;
+    char * c_name        = NULL;
+    size_t c_type_size   = *type_size;
+    int    c_field_index = *field_index - 1; /* C zero based index */
+    int_f  ret_value     = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-
     /*
      * call H5TBwrite_fields_name function.
      */
-    if(H5TBwrite_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index,
-            (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
+    if (H5TBwrite_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index, (hsize_t)*start,
+                               (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbread_field_index_c
-*
-* Purpose: Call H5TBread_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbread_field_index_c
+ *
+ * Purpose: Call H5TBread_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
 h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
-		       hsize_t_f *nrecords, size_t_f *type_size, void *buf)
+                       hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name = NULL;
-    size_t  c_type_size  = *type_size;
-    int     c_field_index = *field_index - 1; /* C zero based index */
-    int_f   ret_value = 0;
+    char * c_name        = NULL;
+    size_t c_type_size   = *type_size;
+    int    c_field_index = *field_index - 1; /* C zero based index */
+    int_f  ret_value     = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBread_fields_index function.
      */
-    if(H5TBread_fields_index((hid_t)*loc_id, c_name,(hsize_t)1, &c_field_index,
-            (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
+    if (H5TBread_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index, (hsize_t)*start,
+                              (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbinsert_field_c
-*
-* Purpose: Call H5TBinsert_field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbinsert_field_c
+ *
+ * Purpose: Call H5TBinsert_field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,
-		   _fcd field_name, hid_t_f *field_type, int_f *position, void *buf)
+h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                   hid_t_f *field_type, int_f *position, void *buf)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    int_f   ret_value = 0;
+    char *c_name    = NULL;
+    char *c_name1   = NULL;
+    int_f ret_value = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
     /*
      * call H5TBinsert_field function.
      */
 
-    if(H5TBinsert_field((hid_t)*loc_id, c_name, c_name1, (hid_t)*field_type, 
-            (hsize_t)*position, NULL, buf) < 0)
+    if (H5TBinsert_field((hid_t)*loc_id, c_name, c_name1, (hid_t)*field_type, (hsize_t)*position, NULL, buf) <
+        0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbdelete_field_c
-*
-* Purpose: Call H5TBdelete_field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbdelete_field_c
+ *
+ * Purpose: Call H5TBdelete_field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name,
-		   size_t_f *namelen1, _fcd field_name)
+h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    int_f   ret_value = 0;
+    char *c_name    = NULL;
+    char *c_name1   = NULL;
+    int_f ret_value = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBinsert_field function.
      */
-    if(H5TBdelete_field((hid_t)*loc_id, c_name, c_name1) < 0)
+    if (H5TBdelete_field((hid_t)*loc_id, c_name, c_name1) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbget_table_info_c
-*
-* Purpose: Call H5TBread_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbget_table_info_c
+ *
+ * Purpose: Call H5TBread_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen,
-		     _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords)
+h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords)
 {
-    char   *c_name = NULL;
+    char *  c_name = NULL;
     hsize_t c_nfields;
     hsize_t c_nrecords;
     int_f   ret_value = 0;
@@ -600,62 +591,61 @@ h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen,
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-
     /*
      * call H5TBread_fields_index function.
      */
 
-    if(H5TBget_table_info((hid_t)*loc_id, c_name, &c_nfields, &c_nrecords) < 0)
+    if (H5TBget_table_info((hid_t)*loc_id, c_name, &c_nfields, &c_nrecords) < 0)
         HGOTO_DONE(FAIL)
-    *nfields = (hsize_t_f) c_nfields;
-    *nrecords = (hsize_t_f) c_nrecords;
+    *nfields  = (hsize_t_f)c_nfields;
+    *nrecords = (hsize_t_f)c_nrecords;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbget_field_info_c
-*
-* Purpose: Call H5TBget_field_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbget_field_info_c
+ *
+ * Purpose: Call H5TBget_field_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
-		     size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size,
-		     size_t_f *namelen2,       /* field_names lengths */
-		     size_t_f *lenmax,         /* character len max */
-		     _fcd field_names,      /* field_names */
-		     size_t_f *maxlen_out)
+h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, size_t_f *field_sizes,
+                     size_t_f *field_offsets, size_t_f *type_size,
+                     size_t_f *namelen2,    /* field_names lengths */
+                     size_t_f *lenmax,      /* character len max */
+                     _fcd      field_names, /* field_names */
+                     size_t_f *maxlen_out)
 
 {
-    char   *c_name = NULL;
+    char *  c_name = NULL;
     hsize_t num_elem;
-    hsize_t c_nfields  = *nfields;
-    size_t *c_field_sizes = NULL;
+    hsize_t c_nfields       = *nfields;
+    size_t *c_field_sizes   = NULL;
     size_t *c_field_offsets = NULL;
     size_t  c_type_size;
-    char  **c_field_names = NULL;
-    char   *tmp = NULL, *tmp_p;
+    char ** c_field_names = NULL;
+    char *  tmp           = NULL, *tmp_p;
     hsize_t i;
     int_f   ret_value = 0;
-    size_t c_lenmax;
-    size_t length = 0;
+    size_t  c_lenmax;
+    size_t  length = 0;
 
     c_lenmax = (size_t)*lenmax;
 
@@ -664,69 +654,68 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_offsets =  (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offsets = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_sizes =  (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_names = (char **)HDcalloc((size_t)c_nfields, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)c_nfields, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < c_nfields; i++)
-        if(NULL == (c_field_names[i] = (char *)HDmalloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
+    for (i = 0; i < c_nfields; i++)
+        if (NULL == (c_field_names[i] = (char *)HDmalloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
             HGOTO_DONE(FAIL)
 
     /*
      * call H5TBget_field_info function.
      */
-    if(H5TBget_field_info((hid_t)*loc_id, c_name, c_field_names, c_field_sizes,
-            c_field_offsets, &c_type_size) < 0)
+    if (H5TBget_field_info((hid_t)*loc_id, c_name, c_field_names, c_field_sizes, c_field_offsets,
+                           &c_type_size) < 0)
         HGOTO_DONE(FAIL)
-   
+
     /* return values */
 
     /* names array */
-    if(NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1)))
+    if (NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1)))
         HGOTO_DONE(FAIL)
     tmp_p = tmp;
     HDmemset(tmp, ' ', c_lenmax * (size_t)c_nfields);
     tmp[c_lenmax * c_nfields] = '\0';
-    for(i = 0; i < c_nfields; i++) {
-         size_t field_name_len = HDstrlen(c_field_names[i]);
+    for (i = 0; i < c_nfields; i++) {
+        size_t field_name_len = HDstrlen(c_field_names[i]);
 
-         HDmemcpy(tmp_p, c_field_names[i], field_name_len);
-         namelen2[i] = (size_t_f)field_name_len;
-         length = MAX(length, strlen((c_field_names[i])));
-         tmp_p = tmp_p + c_lenmax;
+        HDmemcpy(tmp_p, c_field_names[i], field_name_len);
+        namelen2[i] = (size_t_f)field_name_len;
+        length      = MAX(length, strlen((c_field_names[i])));
+        tmp_p       = tmp_p + c_lenmax;
     } /* end for */
 
-    HD5packFstring(tmp, _fcdtocp(field_names), (size_t)( c_lenmax* c_nfields));
+    HD5packFstring(tmp, _fcdtocp(field_names), (size_t)(c_lenmax * c_nfields));
 
     *type_size = (size_t_f)c_type_size;
-    for(i = 0; i < num_elem; i++) {
+    for (i = 0; i < num_elem; i++) {
         field_sizes[i]   = (size_t_f)c_field_sizes[i];
         field_offsets[i] = (size_t_f)c_field_offsets[i];
     } /* end for */
 
-    *maxlen_out = (size_t_f)length; 
+    *maxlen_out = (size_t_f)length;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_field_names) {
-        for(i = 0; i < num_elem; i++)
-            if(c_field_names[i])
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++)
+            if (c_field_names[i])
                 HDfree(c_field_names[i]);
         HDfree(c_field_names);
     } /* end if */
-    if(tmp)
+    if (tmp)
         HDfree(tmp);
-    if(c_field_offsets)
+    if (c_field_offsets)
         HDfree(c_field_offsets);
-    if(c_field_sizes)
+    if (c_field_sizes)
         HDfree(c_field_sizes);
 
     return ret_value;
 }
-
diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c
index 057c43b..bd9b320 100644
--- a/hl/src/H5DO.c
+++ b/hl/src/H5DO.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* High-level library internal header file */
 #include "H5HLprivate2.h"
@@ -18,7 +18,7 @@
 #include "H5DOpublic.h"
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5DOwrite_chunk
  *
@@ -33,8 +33,8 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset,
-         size_t data_size, const void *buf)
+H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset, size_t data_size,
+                const void *buf)
 {
     /* Call underlying H5D function */
     if (H5Dwrite_chunk(dset_id, dxpl_id, filters, offset, data_size, buf) < 0)
@@ -44,7 +44,6 @@ H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *o
 
 } /* end H5DOwrite_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5DOread_chunk
  *
@@ -59,19 +58,17 @@ H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *o
  *---------------------------------------------------------------------------
  */
 herr_t
-H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters,
-         void *buf)
+H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters, void *buf)
 {
     /* Call underlying H5D function */
     if (H5Dread_chunk(dset_id, dxpl_id, offset, filters, buf) < 0)
         return FAIL;
     else
         return SUCCEED;
- } /* end H5DOread_chunk() */
+} /* end H5DOread_chunk() */
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5DOappend()
  *
@@ -90,7 +87,7 @@ H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *fi
  * 	This routine is copied from the fast forward feature branch: features/hdf5_ff
  *	src/H5FF.c:H5DOappend() with the following modifications:
  * 	1) Remove and replace macro calls such as
- *		FUNC_ENTER_API, H5TRACE, HGOTO_ERROR 
+ *		FUNC_ENTER_API, H5TRACE, HGOTO_ERROR
  * 	   accordingly because hl does not have these macros
  *	2) Replace H5I_get_type() by H5Iget_type()
  *	3) Replace H5P_isa_class() by H5Pisa_class()
@@ -103,168 +100,166 @@ H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *fi
  *-------------------------------------------------------------------------
  */
 herr_t
-H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, 
-           hid_t memtype, const void *buf)
+H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t memtype, const void *buf)
 {
-    hbool_t created_dxpl = FALSE;       /* Whether we created a DXPL */
-    hsize_t size[H5S_MAX_RANK];		/* The new size (after extension */
-    hsize_t old_size = 0; 		/* The size of the dimension to be extended */
-    int sndims; 			/* Number of dimensions in dataspace (signed) */
-    unsigned ndims; 			/* Number of dimensions in dataspace */
-    hid_t space_id = FAIL; 		/* Old file space */
-    hid_t new_space_id = FAIL; 		/* New file space (after extension) */
-    hid_t mem_space_id = FAIL; 		/* Memory space for data buffer */
-    hssize_t snelmts; 			/* Number of elements in selection (signed) */
-    hsize_t nelmts; 			/* Number of elements in selection */
-    hid_t dapl = FAIL;			/* Dataset access property list */
-
-    hsize_t start[H5S_MAX_RANK];	/* H5Sselect_Hyperslab: starting offset */
-    hsize_t count[H5S_MAX_RANK];	/* H5Sselect_hyperslab: # of blocks to select */
-    hsize_t stride[H5S_MAX_RANK];	/* H5Sselect_hyperslab: # of elements to move when selecting */
-    hsize_t block[H5S_MAX_RANK];	/* H5Sselect_hyperslab: # of elements in a block */
-
-    hsize_t *boundary = NULL;		/* Boundary set in append flush property */
-    H5D_append_cb_t append_cb;		/* Callback function set in append flush property */
-    void *udata;			/* User data set in append flush property */
-    hbool_t hit = FALSE;		/* Boundary is hit or not */
-    hsize_t k;				/* Local index variable */
-    unsigned u; 		        /* Local index variable */
-    herr_t ret_value = FAIL;		/* Return value */
+    hbool_t  created_dxpl = FALSE; /* Whether we created a DXPL */
+    hsize_t  size[H5S_MAX_RANK];   /* The new size (after extension */
+    hsize_t  old_size = 0;         /* The size of the dimension to be extended */
+    int      sndims;               /* Number of dimensions in dataspace (signed) */
+    unsigned ndims;                /* Number of dimensions in dataspace */
+    hid_t    space_id     = FAIL;  /* Old file space */
+    hid_t    new_space_id = FAIL;  /* New file space (after extension) */
+    hid_t    mem_space_id = FAIL;  /* Memory space for data buffer */
+    hssize_t snelmts;              /* Number of elements in selection (signed) */
+    hsize_t  nelmts;               /* Number of elements in selection */
+    hid_t    dapl = FAIL;          /* Dataset access property list */
+
+    hsize_t start[H5S_MAX_RANK];  /* H5Sselect_Hyperslab: starting offset */
+    hsize_t count[H5S_MAX_RANK];  /* H5Sselect_hyperslab: # of blocks to select */
+    hsize_t stride[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements to move when selecting */
+    hsize_t block[H5S_MAX_RANK];  /* H5Sselect_hyperslab: # of elements in a block */
+
+    hsize_t *       boundary = NULL;  /* Boundary set in append flush property */
+    H5D_append_cb_t append_cb;        /* Callback function set in append flush property */
+    void *          udata;            /* User data set in append flush property */
+    hbool_t         hit = FALSE;      /* Boundary is hit or not */
+    hsize_t         k;                /* Local index variable */
+    unsigned        u;                /* Local index variable */
+    herr_t          ret_value = FAIL; /* Return value */
 
     /* check arguments */
-    if(H5I_DATASET != H5Iget_type(dset_id))
+    if (H5I_DATASET != H5Iget_type(dset_id))
         goto done;
 
     /* If the user passed in a default DXPL, create one to pass to H5Dwrite() */
-    if(H5P_DEFAULT == dxpl_id) {
-        if((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+    if (H5P_DEFAULT == dxpl_id) {
+        if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
             goto done;
         created_dxpl = TRUE;
     } /* end if */
-    else if(TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
+    else if (TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
         goto done;
 
     /* Get the dataspace of the dataset */
-    if(FAIL == (space_id = H5Dget_space(dset_id)))
+    if (FAIL == (space_id = H5Dget_space(dset_id)))
         goto done;
 
     /* Get the rank of this dataspace */
-    if((sndims = H5Sget_simple_extent_ndims(space_id)) < 0)
+    if ((sndims = H5Sget_simple_extent_ndims(space_id)) < 0)
         goto done;
     ndims = (unsigned)sndims;
 
     /* Verify correct axis */
-    if(axis >= ndims)
+    if (axis >= ndims)
         goto done;
 
     /* Get the dimensions sizes of the dataspace */
-    if(H5Sget_simple_extent_dims(space_id, size, NULL) < 0)
+    if (H5Sget_simple_extent_dims(space_id, size, NULL) < 0)
         goto done;
 
-    /* Adjust the dimension size of the requested dimension, 
+    /* Adjust the dimension size of the requested dimension,
      * but first record the old dimension size
      */
     old_size = size[axis];
     size[axis] += extension;
-    if(size[axis] < old_size)
+    if (size[axis] < old_size)
         goto done;
 
     /* Set the extent of the dataset to the new dimension */
-    if(H5Dset_extent(dset_id, size) < 0)
+    if (H5Dset_extent(dset_id, size) < 0)
         goto done;
 
     /* Get the new dataspace of the dataset */
-    if(FAIL == (new_space_id = H5Dget_space(dset_id)))
+    if (FAIL == (new_space_id = H5Dget_space(dset_id)))
         goto done;
 
     /* Select a hyperslab corresponding to the append operation */
-    for(u = 0 ; u < ndims ; u++) {
-        start[u] = 0;
+    for (u = 0; u < ndims; u++) {
+        start[u]  = 0;
         stride[u] = 1;
-        count[u] = size[u];
-        block[u] = 1;
-        if(u == axis) {
+        count[u]  = size[u];
+        block[u]  = 1;
+        if (u == axis) {
             count[u] = extension;
             start[u] = old_size;
         } /* end if */
-    } /* end for */
-    if(FAIL == H5Sselect_hyperslab(new_space_id, H5S_SELECT_SET, start, stride, count, block))
+    }     /* end for */
+    if (FAIL == H5Sselect_hyperslab(new_space_id, H5S_SELECT_SET, start, stride, count, block))
         goto done;
 
     /* The # of elemnts in the new extended dataspace */
-    if((snelmts = H5Sget_select_npoints(new_space_id)) < 0)
+    if ((snelmts = H5Sget_select_npoints(new_space_id)) < 0)
         goto done;
     nelmts = (hsize_t)snelmts;
 
     /* create a memory space */
-    if(FAIL == (mem_space_id = H5Screate_simple(1, &nelmts, NULL)))
+    if (FAIL == (mem_space_id = H5Screate_simple(1, &nelmts, NULL)))
         goto done;
 
     /* Write the data */
-    if(H5Dwrite(dset_id, memtype, mem_space_id, new_space_id, dxpl_id, buf) < 0)
+    if (H5Dwrite(dset_id, memtype, mem_space_id, new_space_id, dxpl_id, buf) < 0)
         goto done;
 
     /* Obtain the dataset's access property list */
-    if((dapl = H5Dget_access_plist(dset_id)) < 0)
+    if ((dapl = H5Dget_access_plist(dset_id)) < 0)
         goto done;
 
     /* Allocate the boundary array */
     boundary = (hsize_t *)HDmalloc(ndims * sizeof(hsize_t));
 
     /* Retrieve the append flush property */
-    if(H5Pget_append_flush(dapl, ndims, boundary, &append_cb, &udata) < 0)
+    if (H5Pget_append_flush(dapl, ndims, boundary, &append_cb, &udata) < 0)
         goto done;
 
     /* No boundary for this axis */
-    if(boundary[axis] != 0) {
+    if (boundary[axis] != 0) {
 
         /* Determine whether a boundary is hit or not */
-        for(k = start[axis]; k < size[axis]; k++)
-            if(!((k + 1) % boundary[axis])) {
+        for (k = start[axis]; k < size[axis]; k++)
+            if (!((k + 1) % boundary[axis])) {
                 hit = TRUE;
                 break;
             }
 
-        if(hit) { /* Hit the boundary */
+        if (hit) { /* Hit the boundary */
             /* Invoke callback if there is one */
-            if(append_cb && append_cb(dset_id, size, udata) < 0)
+            if (append_cb && append_cb(dset_id, size, udata) < 0)
                 goto done;
 
-	        /* Do a dataset flush */
-            if(H5Dflush(dset_id) < 0)
+            /* Do a dataset flush */
+            if (H5Dflush(dset_id) < 0)
                 goto done;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Indicate success */
     ret_value = SUCCEED;
 
 done:
     /* Close dxpl if we created it vs. one was passed in */
-    if(created_dxpl) {
-        if(H5Pclose(dxpl_id) < 0)
+    if (created_dxpl) {
+        if (H5Pclose(dxpl_id) < 0)
             ret_value = FAIL;
     } /* end if */
 
     /* Close old dataspace */
-    if(space_id != FAIL && H5Sclose(space_id) < 0)
+    if (space_id != FAIL && H5Sclose(space_id) < 0)
         ret_value = FAIL;
 
     /* Close new dataspace */
-    if(new_space_id != FAIL && H5Sclose(new_space_id) < 0)
+    if (new_space_id != FAIL && H5Sclose(new_space_id) < 0)
         ret_value = FAIL;
 
     /* Close memory dataspace */
-    if(mem_space_id != FAIL && H5Sclose(mem_space_id) < 0)
+    if (mem_space_id != FAIL && H5Sclose(mem_space_id) < 0)
         ret_value = FAIL;
 
     /* Close the dataset access property list */
-    if(dapl != FAIL && H5Pclose(dapl) < 0)
+    if (dapl != FAIL && H5Pclose(dapl) < 0)
         ret_value = FAIL;
 
-    if(boundary)
+    if (boundary)
         HDfree(boundary);
 
     return ret_value;
 } /* H5DOappend() */
-
diff --git a/hl/src/H5DOpublic.h b/hl/src/H5DOpublic.h
index e09ebca..214f1e5 100644
--- a/hl/src/H5DOpublic.h
+++ b/hl/src/H5DOpublic.h
@@ -25,8 +25,8 @@ extern "C" {
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis,
-    size_t extension, hid_t memtype, const void *buf);
+H5_HLDLL herr_t H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t memtype,
+                           const void *buf);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -35,10 +35,10 @@ H5_HLDLL herr_t H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis,
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 
 /* Compatibility wrappers for functionality moved to H5D */
-H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters,
-    const hsize_t *offset, size_t data_size, const void *buf);
-H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset,
-    uint32_t *filters /*out*/, void *buf /*out*/);
+H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset,
+                                size_t data_size, const void *buf);
+H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters /*out*/,
+                               void *buf /*out*/);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -47,4 +47,3 @@ H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offs
 #endif
 
 #endif
-
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 63fb461..7cb5759 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <assert.h>
 #include <stdlib.h>
@@ -19,138 +19,133 @@
 #include "H5IMprivate.h"
 #include "H5TBprivate.h"
 
-
 /* Local routines */
 static herr_t H5DS_is_reserved(hid_t did);
-static hid_t H5DS_get_REFLIST_type(void);
+static hid_t  H5DS_get_REFLIST_type(void);
 
 /*-------------------------------------------------------------------------
-* Function: H5DSset_scale
-*
-* Purpose: The dataset DSID is converted to a Dimension Scale dataset.
-*   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
-*   and an empty REFERENCE_LIST attribute.
-*   If DIMNAME is specified, then an attribute called NAME is created,
-*   with the value DIMNAME.
-*
-* Return: Success: SUCCEED, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSset_scale(hid_t dsid,
-                     const char *dimname)
+ * Function: H5DSset_scale
+ *
+ * Purpose: The dataset DSID is converted to a Dimension Scale dataset.
+ *   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
+ *   and an empty REFERENCE_LIST attribute.
+ *   If DIMNAME is specified, then an attribute called NAME is created,
+ *   with the value DIMNAME.
+ *
+ * Return: Success: SUCCEED, Failure: FAIL
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 04, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5DSset_scale(hid_t dsid, const char *dimname)
 {
-    int has_dimlist;
+    int        has_dimlist;
     H5I_type_t it;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(dsid)) < 0)
         return FAIL;
 
-    if (H5I_DATASET!=it)
+    if (H5I_DATASET != it)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * check if the dataset is a dataset wich has references to dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * check if the dataset is a dataset wich has references to dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "DIMENSION_LIST"  */
-    if ((has_dimlist = H5LT_find_attribute(dsid,DIMENSION_LIST)) < 0)
+    if ((has_dimlist = H5LT_find_attribute(dsid, DIMENSION_LIST)) < 0)
         return FAIL;
 
     if (has_dimlist == 1)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * write the standard attributes for a Dimension Scale dataset
-    *-------------------------------------------------------------------------
-    */
+     * write the standard attributes for a Dimension Scale dataset
+     *-------------------------------------------------------------------------
+     */
 
-    if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
+    if (H5LT_set_attribute_string(dsid, "CLASS", DIMENSION_SCALE_CLASS) < 0)
         return FAIL;
 
-    if (dimname!=NULL)
-    {
-        if (H5LT_set_attribute_string(dsid,"NAME",dimname) < 0)
+    if (dimname != NULL) {
+        if (H5LT_set_attribute_string(dsid, "NAME", dimname) < 0)
             return FAIL;
     }
 
     return SUCCEED;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5DSattach_scale
-*
-* Purpose: Define Dimension Scale DSID to be associated with dimension IDX
-*  of Dataset DID. Entries are created in the DIMENSION_LIST and
-*  REFERENCE_LIST attributes.
-*
-* Return:
-*   Success: SUCCEED
-*   Failure: FAIL
-*
-* Fails if: Bad arguments
-*           If DSID is not a Dimension Scale
-*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: December 20, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSattach_scale(hid_t did,
-                        hid_t dsid,
-                        unsigned int idx)
+ * Function: H5DSattach_scale
+ *
+ * Purpose: Define Dimension Scale DSID to be associated with dimension IDX
+ *  of Dataset DID. Entries are created in the DIMENSION_LIST and
+ *  REFERENCE_LIST attributes.
+ *
+ * Return:
+ *   Success: SUCCEED
+ *   Failure: FAIL
+ *
+ * Fails if: Bad arguments
+ *           If DSID is not a Dimension Scale
+ *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: December 20, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
-    int        has_dimlist;
-    int        has_reflist;
-    int        is_ds;
-    hssize_t   nelmts;
-    hid_t      sid;          /* space ID */
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      ntid = -1;    /* attribute native type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    int        rank;         /* rank of dataset */
-    hsize_t    dims[1];      /* dimension of the "REFERENCE_LIST" array */
-    ds_list_t  dsl;          /* attribute data in the DS pointing to the dataset */
-    ds_list_t  *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
-    hobj_ref_t ref_to_ds;    /* reference to the DS */
-    hobj_ref_t ref_j;        /* iterator reference */
-    hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
-    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    int         has_dimlist;
+    int         has_reflist;
+    int         is_ds;
+    hssize_t    nelmts;
+    hid_t       sid;          /* space ID */
+    hid_t       tid  = -1;    /* attribute type ID */
+    hid_t       ntid = -1;    /* attribute native type ID */
+    hid_t       aid  = -1;    /* attribute ID */
+    int         rank;         /* rank of dataset */
+    hsize_t     dims[1];      /* dimension of the "REFERENCE_LIST" array */
+    ds_list_t   dsl;          /* attribute data in the DS pointing to the dataset */
+    ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
+    hobj_ref_t  ref_to_ds;    /* reference to the DS */
+    hobj_ref_t  ref_j;        /* iterator reference */
+    hvl_t *     buf = NULL;   /* VL buffer to store in the attribute */
+    hid_t       dsid_j;       /* DS dataset ID in DIMENSION_LIST */
     H5O_info2_t oi1, oi2;
-    H5I_type_t it1, it2;
-    int        i;
-    size_t     len;
-    int        found_ds=0;
-    htri_t     is_scale;
+    H5I_type_t  it1, it2;
+    int         i;
+    size_t      len;
+    int         found_ds = 0;
+    htri_t      is_scale;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
 
     if ((is_scale = H5DSis_scale(did)) < 0)
         return FAIL;
@@ -160,20 +155,20 @@ herr_t H5DSattach_scale(hid_t did,
         return FAIL;
 
     /* get info for the dataset in the parameter list */
-    if(H5Oget_info3(did, &oi1, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(did, &oi1, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* get info for the scale in the parameter list */
-    if(H5Oget_info3(dsid, &oi2, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(dsid, &oi2, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* same object, not valid */
-    if(oi1.fileno == oi2.fileno) {
+    if (oi1.fileno == oi2.fileno) {
         int token_cmp;
 
-        if(H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
+        if (H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
             return FAIL;
-        if(!token_cmp)
+        if (!token_cmp)
             return FAIL;
     } /* end if */
 
@@ -187,21 +182,20 @@ herr_t H5DSattach_scale(hid_t did,
         return FAIL;
 
     /* the DS dataset cannot have dimension scales */
-    if (H5LT_find_attribute(dsid,DIMENSION_LIST)==1)
+    if (H5LT_find_attribute(dsid, DIMENSION_LIST) == 1)
         return FAIL;
 
     /* check if the dataset is a "reserved" dataset (image, table) */
-    if (H5DS_is_reserved(did)==1)
+    if (H5DS_is_reserved(did) == 1)
         return FAIL;
 
-
     /*-------------------------------------------------------------------------
-    * The dataset may or may not have the associated DS attribute
-    * First we try to open to see if it is already there; if not, it is created.
-    * If it exists, the array of references is extended to hold the reference
-    * to the new DS
-    *-------------------------------------------------------------------------
-    */
+     * The dataset may or may not have the associated DS attribute
+     * First we try to open to see if it is already there; if not, it is created.
+     * If it exists, the array of references is extended to hold the reference
+     * to the new DS
+     *-------------------------------------------------------------------------
+     */
 
     /* get dataset space */
     if ((sid = H5Dget_space(did)) < 0)
@@ -220,14 +214,14 @@ herr_t H5DSattach_scale(hid_t did,
         return FAIL;
 
     /* parameter range checking */
-    if (idx > (unsigned)rank-1)
+    if (idx > (unsigned)rank - 1)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * two references are created: one to the DS, saved in "DIMENSION_LIST"
-    *  and one to the dataset, saved in "REFERENCE_LIST"
-    *-------------------------------------------------------------------------
-    */
+     * two references are created: one to the DS, saved in "DIMENSION_LIST"
+     *  and one to the dataset, saved in "REFERENCE_LIST"
+     *-------------------------------------------------------------------------
+     */
     /* create a reference for the >>DS<< dataset */
     if (H5Rcreate(&ref_to_ds, dsid, ".", H5R_OBJECT, (hid_t)-1) < 0)
         return FAIL;
@@ -237,57 +231,56 @@ herr_t H5DSattach_scale(hid_t did,
         return FAIL;
 
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
-    if ((has_dimlist = H5LT_find_attribute(did,DIMENSION_LIST)) < 0)
+    if ((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * it does not exist. we create the attribute and its reference data
-    *-------------------------------------------------------------------------
-    */
-    if (has_dimlist == 0)
-    {
+     * it does not exist. we create the attribute and its reference data
+     *-------------------------------------------------------------------------
+     */
+    if (has_dimlist == 0) {
 
         dims[0] = (hsize_t)rank;
 
         /* space for the attribute */
-        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
             return FAIL;
 
         /* create the type for the attribute "DIMENSION_LIST" */
-        if((tid = H5Tvlen_create(H5T_STD_REF_OBJ)) < 0)
+        if ((tid = H5Tvlen_create(H5T_STD_REF_OBJ)) < 0)
             goto out;
 
         /* create the attribute */
-        if((aid = H5Acreate2(did, DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(did, DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* allocate and initialize the VL */
         buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
-        if(buf == NULL)
+        if (buf == NULL)
             goto out;
 
-        for(i = 0; i < rank; i++) {
+        for (i = 0; i < rank; i++) {
             buf[i].len = 0;
-            buf[i].p = NULL;
+            buf[i].p   = NULL;
         }
 
         /* store the REF information in the index of the dataset that has the DS */
-        buf[idx].len = 1;
-        buf[idx].p = HDmalloc( 1 * sizeof(hobj_ref_t));
+        buf[idx].len                  = 1;
+        buf[idx].p                    = HDmalloc(1 * sizeof(hobj_ref_t));
         ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
 
         /* write the attribute with the reference */
-        if(H5Awrite(aid, tid, buf) < 0)
+        if (H5Awrite(aid, tid, buf) < 0)
             goto out;
 
         /* close */
-        if(H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
+        if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
             goto out;
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
 
         HDfree(buf);
@@ -295,218 +288,217 @@ herr_t H5DSattach_scale(hid_t did,
     }
 
     /*-------------------------------------------------------------------------
-    * the attribute already exists, open it, extend the buffer,
-    *  and insert the new reference
-    *-------------------------------------------------------------------------
-    */
-    else if(has_dimlist == 1)
-    {
-        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+     * the attribute already exists, open it, extend the buffer,
+     *  and insert the new reference
+     *-------------------------------------------------------------------------
+     */
+    else if (has_dimlist == 1) {
+        if ((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
             goto out;
 
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
         /* allocate and initialize the VL */
         buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
-        if(buf == NULL)
+        if (buf == NULL)
             goto out;
 
         /* read */
-        if(H5Aread(aid, tid, buf) < 0)
+        if (H5Aread(aid, tid, buf) < 0)
             goto out;
 
         /* check to avoid inserting duplicates. it is not FAIL, just do nothing */
         /* iterate all the REFs in this dimension IDX */
-        for(i = 0; i < (int)buf[idx].len; i++) {
+        for (i = 0; i < (int)buf[idx].len; i++) {
             /* get the reference */
             ref_j = ((hobj_ref_t *)buf[idx].p)[i];
 
             /* get the scale id for this REF */
-            if((dsid_j = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref_j)) < 0)
+            if ((dsid_j = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref_j)) < 0)
                 goto out;
 
             /* get info for DS in the parameter list */
-            if(H5Oget_info3(dsid, &oi1, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(dsid, &oi1, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* get info for this DS */
-            if(H5Oget_info3(dsid_j, &oi2, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(dsid_j, &oi2, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* same object, so this DS scale is already in this DIM IDX */
-            if(oi1.fileno == oi2.fileno) {
+            if (oi1.fileno == oi2.fileno) {
                 int token_cmp;
 
-                if(H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
+                if (H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
                     goto out;
-                if(!token_cmp)
+                if (!token_cmp)
                     found_ds = 1;
             } /* end if */
 
             /* close the dereferenced dataset */
-            if(H5Dclose(dsid_j) < 0)
+            if (H5Dclose(dsid_j) < 0)
                 goto out;
         } /* end for */
 
-        if(found_ds == 0) {
+        if (found_ds == 0) {
             /* we are adding one more DS to this dimension */
-            if(buf[idx].len > 0) {
+            if (buf[idx].len > 0) {
                 buf[idx].len++;
-                len = buf[idx].len;
-                buf[idx].p = HDrealloc(buf[idx].p, len * sizeof(hobj_ref_t));
+                len                                 = buf[idx].len;
+                buf[idx].p                          = HDrealloc(buf[idx].p, len * sizeof(hobj_ref_t));
                 ((hobj_ref_t *)buf[idx].p)[len - 1] = ref_to_ds;
             } /* end if */
             else {
                 /* store the REF information in the index of the dataset that has the DS */
-                buf[idx].len = 1;
-                buf[idx].p = HDmalloc(sizeof(hobj_ref_t));
+                buf[idx].len                  = 1;
+                buf[idx].p                    = HDmalloc(sizeof(hobj_ref_t));
                 ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
             } /* end else */
-        } /* end if */
+        }     /* end if */
 
         /* write the attribute with the new references */
-        if(H5Awrite(aid, tid, buf) < 0)
+        if (H5Awrite(aid, tid, buf) < 0)
             goto out;
 
         /* close */
-        if(H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
+        if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
             goto out;
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
         HDfree(buf);
         buf = NULL;
     } /* has_dimlist */
 
     /*-------------------------------------------------------------------------
-    * save DS info on the >>DS<< dataset
-    *-------------------------------------------------------------------------
-    */
+     * save DS info on the >>DS<< dataset
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
-    if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
+    if ((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * it does not exist. we create the attribute and its reference data
-    *-------------------------------------------------------------------------
-    */
-    if(has_reflist == 0) {
+     * it does not exist. we create the attribute and its reference data
+     *-------------------------------------------------------------------------
+     */
+    if (has_reflist == 0) {
         dims[0] = 1;
 
         /* space for the attribute */
-        if((sid = H5Screate_simple(1,dims,NULL)) < 0)
+        if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
             goto out;
 
         /* create the compound datatype for the attribute "REFERENCE_LIST" */
-        if((tid = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
+        if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
             goto out;
 
         /* insert reference field */
-        if(H5Tinsert(tid, "dataset", HOFFSET(ds_list_t,ref), H5T_STD_REF_OBJ) < 0)
+        if (H5Tinsert(tid, "dataset", HOFFSET(ds_list_t, ref), H5T_STD_REF_OBJ) < 0)
             goto out;
 
         /* insert dimension idx of the dataset field */
-        if(H5Tinsert(tid, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
+        if (H5Tinsert(tid, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
             goto out;
 
         /* create the attribute */
-        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* store the IDX information */
         dsl.dim_idx = idx;
 
         /* write the attribute with the reference */
-        if(H5Awrite(aid, tid, &dsl) < 0)
+        if (H5Awrite(aid, tid, &dsl) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
     } /* end if */
 
     /*-------------------------------------------------------------------------
-    * the "REFERENCE_LIST" array already exists, open it and extend it
-    *-------------------------------------------------------------------------
-    */
-    else if(has_reflist ==  1) {
-        if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+     * the "REFERENCE_LIST" array already exists, open it and extend it
+     *-------------------------------------------------------------------------
+     */
+    else if (has_reflist == 1) {
+        if ((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
             goto out;
 
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
 
         /* get native type to read attribute REFERENCE_LIST */
-        if((ntid = H5DS_get_REFLIST_type()) < 0)
+        if ((ntid = H5DS_get_REFLIST_type()) < 0)
             goto out;
 
         /* get and save the old reference(s) */
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
-        if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+        if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
             goto out;
 
         nelmts++;
 
-        dsbuf = (ds_list_t*) HDmalloc((size_t)nelmts * sizeof(ds_list_t));
-        if(dsbuf == NULL)
+        dsbuf = (ds_list_t *)HDmalloc((size_t)nelmts * sizeof(ds_list_t));
+        if (dsbuf == NULL)
             goto out;
 
-        if(H5Aread(aid, ntid, dsbuf) < 0)
+        if (H5Aread(aid, ntid, dsbuf) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * create a new attribute
-        *-------------------------------------------------------------------------
-        */
+         * create a new attribute
+         *-------------------------------------------------------------------------
+         */
 
         /* the attribute must be deleted, in order to the new one can reflect the changes*/
-        if(H5Adelete(dsid, REFERENCE_LIST) < 0)
+        if (H5Adelete(dsid, REFERENCE_LIST) < 0)
             goto out;
 
         /* store the IDX information (index of the dataset that has the DS) */
-        dsl.dim_idx = idx;
+        dsl.dim_idx       = idx;
         dsbuf[nelmts - 1] = dsl;
 
         /* create a new data space for the new references array */
         dims[0] = (hsize_t)nelmts;
 
-        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
             goto out;
 
         /* create the attribute again with the changes of space */
-        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* write the attribute with the new references */
-        if(H5Awrite(aid, ntid, dsbuf) < 0)
+        if (H5Awrite(aid, ntid, dsbuf) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
         if (H5Tclose(ntid) < 0)
             goto out;
@@ -516,15 +508,15 @@ herr_t H5DSattach_scale(hid_t did,
     } /* has_reflist */
 
     /*-------------------------------------------------------------------------
-    * write the standard attributes for a Dimension Scale dataset
-    *-------------------------------------------------------------------------
-    */
+     * write the standard attributes for a Dimension Scale dataset
+     *-------------------------------------------------------------------------
+     */
 
-    if((is_ds = H5DSis_scale(dsid)) < 0)
+    if ((is_ds = H5DSis_scale(dsid)) < 0)
         return FAIL;
 
-    if(is_ds == 0) {
-        if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
+    if (is_ds == 0) {
+        if (H5LT_set_attribute_string(dsid, "CLASS", DIMENSION_SCALE_CLASS) < 0)
             return FAIL;
     }
 
@@ -532,117 +524,117 @@ herr_t H5DSattach_scale(hid_t did,
 
     /* error zone */
 out:
-    if(buf)
+    if (buf)
         HDfree(buf);
-    if(dsbuf)
+    if (dsbuf)
         HDfree(dsbuf);
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(ntid);
         H5Tclose(tid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSdetach_scale
-*
-* Purpose: If possible, deletes association of Dimension Scale DSID with
-*     dimension IDX of Dataset DID. This deletes the entries in the
-*     DIMENSION_LIST and REFERENCE_LIST attributes.
-*
-* Return:
-*   Success: SUCCEED
-*   Failure: FAIL
-*
-* Fails if: Bad arguments
-*           The dataset DID or DSID do not exist.
-*           The DSID is not a Dimension Scale
-*           DSID is not attached to DID.
-* Note that a scale may be associated with more than dimension of the same dataset.
-* If so, the detach operation only deletes one of the associations, for DID.
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: December 20, 2004
-*
-* Comments:
-*
-* Modifications: Function didn't delete DIMENSION_LIST attribute, when
-*                all dimension scales were detached from a dataset; added.
-*                                                           2010/05/13 EIP
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSdetach_scale(hid_t did,
-                        hid_t dsid,
-                        unsigned int idx)
+ * Function: H5DSdetach_scale
+ *
+ * Purpose: If possible, deletes association of Dimension Scale DSID with
+ *     dimension IDX of Dataset DID. This deletes the entries in the
+ *     DIMENSION_LIST and REFERENCE_LIST attributes.
+ *
+ * Return:
+ *   Success: SUCCEED
+ *   Failure: FAIL
+ *
+ * Fails if: Bad arguments
+ *           The dataset DID or DSID do not exist.
+ *           The DSID is not a Dimension Scale
+ *           DSID is not attached to DID.
+ * Note that a scale may be associated with more than dimension of the same dataset.
+ * If so, the detach operation only deletes one of the associations, for DID.
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: December 20, 2004
+ *
+ * Comments:
+ *
+ * Modifications: Function didn't delete DIMENSION_LIST attribute, when
+ *                all dimension scales were detached from a dataset; added.
+ *                                                           2010/05/13 EIP
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
-    int        has_dimlist;
-    int        has_reflist;
-    hssize_t   nelmts;
-    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
-    hid_t      did_i;        /* dataset ID in REFERENCE_LIST */
-    hid_t      sid;          /* space ID */
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      ntid = -1;    /* attribute native type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    int        rank;         /* rank of dataset */
-    ds_list_t  *dsbuf = NULL;  /* array of attribute data in the DS pointing to the dataset */
-    hsize_t    dims[1];      /* dimension of the "REFERENCE_LIST" array */
-    hobj_ref_t ref;          /* reference to the DS */
-    hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
-    int        i;
-    size_t     j;
-    hssize_t   ii;
+    int         has_dimlist;
+    int         has_reflist;
+    hssize_t    nelmts;
+    hid_t       dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    hid_t       did_i;        /* dataset ID in REFERENCE_LIST */
+    hid_t       sid;          /* space ID */
+    hid_t       tid  = -1;    /* attribute type ID */
+    hid_t       ntid = -1;    /* attribute native type ID */
+    hid_t       aid  = -1;    /* attribute ID */
+    int         rank;         /* rank of dataset */
+    ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
+    hsize_t     dims[1];      /* dimension of the "REFERENCE_LIST" array */
+    hobj_ref_t  ref;          /* reference to the DS */
+    hvl_t *     buf = NULL;   /* VL buffer to store in the attribute */
+    int         i;
+    size_t      j;
+    hssize_t    ii;
     H5O_info2_t did_oi, dsid_oi, tmp_oi;
-    int        found_dset = 0, found_ds = 0;
-    int        have_ds = 0;
-    htri_t     is_scale;
+    int         found_dset = 0, found_ds = 0;
+    int         have_ds = 0;
+    htri_t      is_scale;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
 
     /* check for valid types of identifiers */
 
-    if(H5I_DATASET != H5Iget_type(did) || H5I_DATASET != H5Iget_type(dsid))
+    if (H5I_DATASET != H5Iget_type(did) || H5I_DATASET != H5Iget_type(dsid))
         return FAIL;
 
-    if((is_scale = H5DSis_scale(did)) < 0)
+    if ((is_scale = H5DSis_scale(did)) < 0)
         return FAIL;
 
     /* the dataset cannot be a DS dataset */
-    if( is_scale == 1)
+    if (is_scale == 1)
         return FAIL;
 
     /* get info for the dataset in the parameter list */
-    if(H5Oget_info3(did, &did_oi, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(did, &did_oi, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* get info for the scale in the parameter list */
-    if(H5Oget_info3(dsid, &dsid_oi, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(dsid, &dsid_oi, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* same object, not valid */
-    if(did_oi.fileno == dsid_oi.fileno) {
+    if (did_oi.fileno == dsid_oi.fileno) {
         int token_cmp;
 
-        if(H5Otoken_cmp(did, &did_oi.token, &dsid_oi.token, &token_cmp) < 0)
+        if (H5Otoken_cmp(did, &did_oi.token, &dsid_oi.token, &token_cmp) < 0)
             return FAIL;
-        if(!token_cmp)
+        if (!token_cmp)
             return FAIL;
     } /* end if */
 
-
     /*-------------------------------------------------------------------------
-    * Find "DIMENSION_LIST"
-    *-------------------------------------------------------------------------
-    */
+     * Find "DIMENSION_LIST"
+     *-------------------------------------------------------------------------
+     */
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
     if ((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
         return FAIL;
@@ -663,58 +655,56 @@ herr_t H5DSdetach_scale(hid_t did,
         return FAIL;
 
     /* parameter range checking */
-    if (idx > (unsigned)rank-1)
+    if (idx > (unsigned)rank - 1)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * find "REFERENCE_LIST"
-    *-------------------------------------------------------------------------
-    */
+     * find "REFERENCE_LIST"
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
-    if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
+    if ((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
         return FAIL;
 
-    if(has_reflist == 0)
+    if (has_reflist == 0)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * open "DIMENSION_LIST", and delete the reference
-    *-------------------------------------------------------------------------
-    */
+     * open "DIMENSION_LIST", and delete the reference
+     *-------------------------------------------------------------------------
+     */
 
-    if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+    if ((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
         return FAIL;
 
-    if((tid = H5Aget_type(aid)) < 0)
+    if ((tid = H5Aget_type(aid)) < 0)
         goto out;
 
-    if((sid = H5Aget_space(aid)) < 0)
+    if ((sid = H5Aget_space(aid)) < 0)
         goto out;
 
     /* allocate and initialize the VL */
     buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
-    if(buf == NULL)
+    if (buf == NULL)
         goto out;
 
     /* read */
-    if(H5Aread(aid, tid, buf) < 0)
+    if (H5Aread(aid, tid, buf) < 0)
         goto out;
 
     /* reset */
-    if ( buf[idx].len > 0 )
-    {
-        for (j=0; j<buf[idx].len; j++)
-        {
+    if (buf[idx].len > 0) {
+        for (j = 0; j < buf[idx].len; j++) {
             /* get the reference */
             ref = ((hobj_ref_t *)buf[idx].p)[j];
 
             /* get the DS id */
-            if ((dsid_j = H5Rdereference2(did,H5P_DEFAULT,H5R_OBJECT,&ref)) < 0)
+            if ((dsid_j = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref)) < 0)
                 goto out;
 
             /* get info for this DS */
-            if(H5Oget_info3(dsid_j, &tmp_oi, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(dsid_j, &tmp_oi, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* Close the dereferenced dataset */
@@ -722,12 +712,12 @@ herr_t H5DSdetach_scale(hid_t did,
                 goto out;
 
             /* same object, reset */
-            if(dsid_oi.fileno == tmp_oi.fileno) {
+            if (dsid_oi.fileno == tmp_oi.fileno) {
                 int token_cmp;
 
-                if(H5Otoken_cmp(did, &dsid_oi.token, &tmp_oi.token, &token_cmp) < 0)
+                if (H5Otoken_cmp(did, &dsid_oi.token, &tmp_oi.token, &token_cmp) < 0)
                     goto out;
-                if(!token_cmp) {
+                if (!token_cmp) {
                     /* If there are more than one reference in the VL element
                        and the reference we found is not the last one,
                        copy the last one to replace the found one since the order
@@ -738,10 +728,10 @@ herr_t H5DSdetach_scale(hid_t did,
 
                     size_t len = buf[idx].len;
 
-                    if(j < len - 1)
-                        ((hobj_ref_t *)buf[idx].p)[j] = ((hobj_ref_t *)buf[idx].p)[len-1];
+                    if (j < len - 1)
+                        ((hobj_ref_t *)buf[idx].p)[j] = ((hobj_ref_t *)buf[idx].p)[len - 1];
                     len = --buf[idx].len;
-                    if(len == 0) {
+                    if (len == 0) {
                         HDfree(buf[idx].p);
                         buf[idx].p = NULL;
                     }
@@ -750,108 +740,107 @@ herr_t H5DSdetach_scale(hid_t did,
                     found_ds = 1;
                     break;
                 } /* end if */
-            } /* end if */
-        } /* j */
-    } /* if */
+            }     /* end if */
+        }         /* j */
+    }             /* if */
 
     /* the scale must be present to continue */
-    if(found_ds == 0)
+    if (found_ds == 0)
         goto out;
 
     /* Write the attribute, but check first, if we have any scales left,
        because if not, we should delete the attribute according to the spec */
-    for(i = 0; i < rank; i++) {
-        if(buf[i].len > 0)  {
+    for (i = 0; i < rank; i++) {
+        if (buf[i].len > 0) {
             have_ds = 1;
             break;
         }
     }
-    if(have_ds) {
-        if(H5Awrite(aid, tid, buf) < 0)
+    if (have_ds) {
+        if (H5Awrite(aid, tid, buf) < 0)
             goto out;
     }
     else {
-        if(H5Adelete(did, DIMENSION_LIST) < 0)
+        if (H5Adelete(did, DIMENSION_LIST) < 0)
             goto out;
     }
 
     /* close */
-    if(H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
-    if(H5Tclose(tid) < 0)
+    if (H5Tclose(tid) < 0)
         goto out;
-    if(H5Aclose(aid) < 0)
+    if (H5Aclose(aid) < 0)
         goto out;
 
     HDfree(buf);
     buf = NULL;
 
-
     /*-------------------------------------------------------------------------
-    * the "REFERENCE_LIST" array exists, update
-    *-------------------------------------------------------------------------
-    */
+     * the "REFERENCE_LIST" array exists, update
+     *-------------------------------------------------------------------------
+     */
 
-    if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+    if ((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
         goto out;
 
-    if((tid = H5Aget_type(aid)) < 0)
+    if ((tid = H5Aget_type(aid)) < 0)
         goto out;
 
     /* get native type to read attribute REFERENCE_LIST */
-    if((ntid = H5DS_get_REFLIST_type()) < 0)
+    if ((ntid = H5DS_get_REFLIST_type()) < 0)
         goto out;
 
     /* get and save the old reference(s) */
-    if((sid = H5Aget_space(aid)) < 0)
+    if ((sid = H5Aget_space(aid)) < 0)
         goto out;
 
-    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+    if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
         goto out;
 
-    dsbuf = (ds_list_t*) HDmalloc((size_t)nelmts * sizeof(ds_list_t));
-    if(dsbuf == NULL)
+    dsbuf = (ds_list_t *)HDmalloc((size_t)nelmts * sizeof(ds_list_t));
+    if (dsbuf == NULL)
         goto out;
 
-    if(H5Aread(aid, ntid, dsbuf) < 0)
+    if (H5Aread(aid, ntid, dsbuf) < 0)
         goto out;
 
-    for(ii = 0; ii < nelmts; ii++) {
+    for (ii = 0; ii < nelmts; ii++) {
         /* First check if we have the same dimension index */
-      if(idx == dsbuf[ii].dim_idx) {
+        if (idx == dsbuf[ii].dim_idx) {
             /* get the reference to the dataset */
             ref = dsbuf[ii].ref;
 
             /* get the dataset id */
-            if ((did_i = H5Rdereference2(did,H5P_DEFAULT,H5R_OBJECT,&ref)) < 0)
+            if ((did_i = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref)) < 0)
                 goto out;
 
             /* get info for this dataset */
-            if(H5Oget_info3(did_i, &tmp_oi, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(did_i, &tmp_oi, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* close the dereferenced dataset */
-            if(H5Dclose(did_i) < 0)
+            if (H5Dclose(did_i) < 0)
                 goto out;
 
             /* same object, reset. we want to detach only for this DIM */
-            if(did_oi.fileno == tmp_oi.fileno) {
+            if (did_oi.fileno == tmp_oi.fileno) {
                 int token_cmp;
 
-                if(H5Otoken_cmp(did, &did_oi.token, &tmp_oi.token, &token_cmp) < 0)
+                if (H5Otoken_cmp(did, &did_oi.token, &tmp_oi.token, &token_cmp) < 0)
                     goto out;
-                if(!token_cmp) {
+                if (!token_cmp) {
                     /* copy the last one to replace the one which is found */
-                    dsbuf[ii] = dsbuf[nelmts-1];
+                    dsbuf[ii] = dsbuf[nelmts - 1];
                     nelmts--;
-                    found_dset=1;
+                    found_dset = 1;
                     break;
                 } /* end if */
-            } /* end if */
-        } /* if we have the same dimension index */
-    } /* ii */
+            }     /* end if */
+        }         /* if we have the same dimension index */
+    }             /* ii */
 
     /* close space and attribute */
     if (H5Sclose(sid) < 0)
@@ -860,44 +849,43 @@ herr_t H5DSdetach_scale(hid_t did,
         goto out;
 
     /*-------------------------------------------------------------------------
-    * check if we found the pointed dataset
-    *-------------------------------------------------------------------------
-    */
+     * check if we found the pointed dataset
+     *-------------------------------------------------------------------------
+     */
 
     /* the pointed dataset must exist */
     if (found_dset == 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a new attribute
-    *-------------------------------------------------------------------------
-    */
+     * create a new attribute
+     *-------------------------------------------------------------------------
+     */
 
     /* the attribute must be deleted, in order to the new one can reflect the changes*/
     if (H5Adelete(dsid, REFERENCE_LIST) < 0)
         goto out;
 
     /* don't do anything for an empty array */
-    if(nelmts)
-    {
+    if (nelmts) {
         /* create a new data space for the new references array */
-      dims[0] = (hsize_t)nelmts;
+        dims[0] = (hsize_t)nelmts;
 
-        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
             goto out;
 
         /* create the attribute again with the changes of space */
-        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* write the new attribute with the new references */
-        if(H5Awrite(aid, ntid, dsbuf) < 0)
+        if (H5Awrite(aid, ntid, dsbuf) < 0)
             goto out;
 
         /* close space and attribute */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
     } /* nelmts */
 
@@ -914,108 +902,108 @@ herr_t H5DSdetach_scale(hid_t did,
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(ntid);
         H5Tclose(tid);
 
-        if(dsbuf) {
+        if (dsbuf) {
             HDfree(dsbuf);
             dsbuf = NULL;
         }
-        if(buf) {
+        if (buf) {
             /* Failure occured before H5Treclaim was called;
                free the pointers allocated when we read data in */
-            for(i = 0; i < rank; i++) {
-                if(buf[i].p)
+            for (i = 0; i < rank; i++) {
+                if (buf[i].p)
                     HDfree(buf[i].p);
             }
             HDfree(buf);
             buf = NULL;
         }
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_attached
-*
-* Purpose: Report if dimension scale DSID is currently attached to
-*  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
-*  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
-*
-* Return:
-*   1: both the DS and the dataset pointers match
-*   0: one of them or both do not match
-*   FAIL (-1): error
-*
-* Fails if: Bad arguments
-*           If DSID is not a Dimension Scale
-*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: February 18, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-htri_t H5DSis_attached(hid_t did,
-                       hid_t dsid,
-                       unsigned int idx)
+ * Function: H5DSis_attached
+ *
+ * Purpose: Report if dimension scale DSID is currently attached to
+ *  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
+ *  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
+ *
+ * Return:
+ *   1: both the DS and the dataset pointers match
+ *   0: one of them or both do not match
+ *   FAIL (-1): error
+ *
+ * Fails if: Bad arguments
+ *           If DSID is not a Dimension Scale
+ *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: February 18, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+htri_t
+H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
 {
-    int        has_dimlist;
-    int        has_reflist;
-    hssize_t   nelmts;
-    hid_t      sid;          /* space ID */
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      ntid = -1;    /* attribute native type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    int        rank;         /* rank of dataset */
-    ds_list_t  *dsbuf = NULL;   /* array of attribute data in the DS pointing to the dataset */
-    hobj_ref_t ref;          /* reference to the DS */
-    hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
-    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
-    hid_t      did_i;        /* dataset ID in REFERENCE_LIST */
+    int         has_dimlist;
+    int         has_reflist;
+    hssize_t    nelmts;
+    hid_t       sid;          /* space ID */
+    hid_t       tid  = -1;    /* attribute type ID */
+    hid_t       ntid = -1;    /* attribute native type ID */
+    hid_t       aid  = -1;    /* attribute ID */
+    int         rank;         /* rank of dataset */
+    ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
+    hobj_ref_t  ref;          /* reference to the DS */
+    hvl_t *     buf = NULL;   /* VL buffer to store in the attribute */
+    hid_t       dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    hid_t       did_i;        /* dataset ID in REFERENCE_LIST */
     H5O_info2_t oi1, oi2, oi3, oi4;
-    H5I_type_t it1, it2;
-    int        i;
-    int        found_dset=0, found_ds=0;
-    htri_t     is_scale;
+    H5I_type_t  it1, it2;
+    int         i;
+    int         found_dset = 0, found_ds = 0;
+    htri_t      is_scale;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
 
     if ((is_scale = H5DSis_scale(did)) < 0)
         return FAIL;
 
     /* the dataset cannot be a DS dataset */
-    if ( is_scale == 1)
+    if (is_scale == 1)
         return FAIL;
 
     /* get info for the dataset in the parameter list */
-    if(H5Oget_info3(did, &oi1, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(did, &oi1, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* get info for the scale in the parameter list */
-    if(H5Oget_info3(dsid, &oi2, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(dsid, &oi2, H5O_INFO_BASIC) < 0)
         return FAIL;
 
     /* same object, not valid */
-    if(oi1.fileno == oi2.fileno) {
+    if (oi1.fileno == oi2.fileno) {
         int token_cmp;
 
-        if(H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
+        if (H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
             return FAIL;
-        if(!token_cmp)
+        if (!token_cmp)
             return FAIL;
     } /* end if */
 
@@ -1029,16 +1017,16 @@ htri_t H5DSis_attached(hid_t did,
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * get space
-    *-------------------------------------------------------------------------
-    */
+     * get space
+     *-------------------------------------------------------------------------
+     */
 
     /* get dataset space */
     if ((sid = H5Dget_space(did)) < 0)
         return FAIL;
 
     /* get rank */
-    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* close dataset space */
@@ -1046,32 +1034,31 @@ htri_t H5DSis_attached(hid_t did,
         goto out;
 
     /* parameter range checking */
-    if(idx > ((unsigned)rank - 1))
+    if (idx > ((unsigned)rank - 1))
         return FAIL;
 
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
-    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+    if ((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * open "DIMENSION_LIST"
-    *-------------------------------------------------------------------------
-    */
+     * open "DIMENSION_LIST"
+     *-------------------------------------------------------------------------
+     */
 
-    if(has_dimlist == 1)
-    {
-        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+    if (has_dimlist == 1) {
+        if ((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
             goto out;
 
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
         /* allocate and initialize the VL */
-        buf = (hvl_t*)HDmalloc((size_t)rank * sizeof(hvl_t));
-        if(buf == NULL)
+        buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
+        if (buf == NULL)
             goto out;
 
         /* read */
@@ -1079,8 +1066,7 @@ htri_t H5DSis_attached(hid_t did,
             goto out;
 
         /* iterate all the REFs in this dimension IDX */
-        for (i=0; i<(int)buf[idx].len; i++)
-        {
+        for (i = 0; i < (int)buf[idx].len; i++) {
             /* get the reference */
             ref = ((hobj_ref_t *)buf[idx].p)[i];
 
@@ -1089,30 +1075,28 @@ htri_t H5DSis_attached(hid_t did,
                 goto out;
 
             /* get info for DS in the parameter list */
-            if(H5Oget_info3(dsid, &oi1, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(dsid, &oi1, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* get info for this DS */
-            if(H5Oget_info3(dsid_j, &oi2, H5O_INFO_BASIC) < 0)
+            if (H5Oget_info3(dsid_j, &oi2, H5O_INFO_BASIC) < 0)
                 goto out;
 
             /* same object */
-            if(oi1.fileno == oi2.fileno) {
+            if (oi1.fileno == oi2.fileno) {
                 int token_cmp;
 
-                if(H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
+                if (H5Otoken_cmp(did, &oi1.token, &oi2.token, &token_cmp) < 0)
                     goto out;
-                if(!token_cmp)
+                if (!token_cmp)
                     found_ds = 1;
             } /* end if */
 
             /* close the dereferenced dataset */
             if (H5Dclose(dsid_j) < 0)
                 goto out;
-
         }
 
-
         /* close */
         if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
             goto out;
@@ -1127,39 +1111,38 @@ htri_t H5DSis_attached(hid_t did,
     } /* has_dimlist */
 
     /*-------------------------------------------------------------------------
-    * info on the >>DS<< dataset
-    *-------------------------------------------------------------------------
-    */
+     * info on the >>DS<< dataset
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
-    if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
+    if ((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * open "REFERENCE_LIST"
-    *-------------------------------------------------------------------------
-    */
+     * open "REFERENCE_LIST"
+     *-------------------------------------------------------------------------
+     */
 
-    if(has_reflist ==  1)
-    {
-        if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+    if (has_reflist == 1) {
+        if ((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
             goto out;
 
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
 
         /* get native type to read REFERENCE_LIST attribute */
-        if((ntid = H5DS_get_REFLIST_type()) < 0)
+        if ((ntid = H5DS_get_REFLIST_type()) < 0)
             goto out;
 
         /* get and save the old reference(s) */
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
-        if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+        if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
             goto out;
 
-        dsbuf = (ds_list_t*) HDmalloc((size_t)nelmts * sizeof(ds_list_t));
+        dsbuf = (ds_list_t *)HDmalloc((size_t)nelmts * sizeof(ds_list_t));
 
         if (dsbuf == NULL)
             goto out;
@@ -1168,46 +1151,43 @@ htri_t H5DSis_attached(hid_t did,
             goto out;
 
         /*-------------------------------------------------------------------------
-        * iterate
-        *-------------------------------------------------------------------------
-        */
+         * iterate
+         *-------------------------------------------------------------------------
+         */
 
-        for(i = 0; i < nelmts; i++)
-        {
+        for (i = 0; i < nelmts; i++) {
             /* get the reference */
             ref = dsbuf[i].ref;
 
             /* the reference was not deleted  */
-            if (ref)
-            {
+            if (ref) {
                 /* get the dataset id */
                 if ((did_i = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref)) < 0)
                     goto out;
 
                 /* get info for dataset in the parameter list */
-                if(H5Oget_info3(did, &oi3, H5O_INFO_BASIC) < 0)
+                if (H5Oget_info3(did, &oi3, H5O_INFO_BASIC) < 0)
                     goto out;
 
                 /* get info for this dataset */
-                if(H5Oget_info3(did_i, &oi4, H5O_INFO_BASIC) < 0)
+                if (H5Oget_info3(did_i, &oi4, H5O_INFO_BASIC) < 0)
                     goto out;
 
                 /* same object */
-                if(oi3.fileno == oi4.fileno) {
+                if (oi3.fileno == oi4.fileno) {
                     int token_cmp;
 
-                    if(H5Otoken_cmp(did, &oi3.token, &oi4.token, &token_cmp) < 0)
+                    if (H5Otoken_cmp(did, &oi3.token, &oi4.token, &token_cmp) < 0)
                         goto out;
-                    if(!token_cmp && (idx == dsbuf[i].dim_idx))
-                        found_dset=1;
+                    if (!token_cmp && (idx == dsbuf[i].dim_idx))
+                        found_dset = 1;
                 } /* end if */
 
                 /* close the dereferenced dataset */
                 if (H5Dclose(did_i) < 0)
                     goto out;
             } /* if */
-        } /* i */
-
+        }     /* i */
 
         /* close */
         if (H5Sclose(sid) < 0)
@@ -1230,18 +1210,20 @@ htri_t H5DSis_attached(hid_t did,
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
         H5Tclose(ntid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     if (buf) {
         HDfree(buf);
         buf = NULL;
     }
-    if(dsbuf) {
+    if (dsbuf) {
         HDfree(dsbuf);
         dsbuf = NULL;
     }
@@ -1249,88 +1231,84 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSiterate_scales
-*
-* Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
-*  of dataset DID. For each scale in the list, the visitor_data and some
-*  additional information, specified below, are passed to the visitor function.
-*  The iteration begins with the IDX object in the group and the next element
-*  to be processed by the operator is returned in IDX. If IDX is NULL, then the
-*  iterator starts at zero.
-*
-* Parameters:
-*
-*  hid_t DID;               IN: the dataset
-*  unsigned int DIM;        IN: the dimension of the dataset
-*  int *DS_IDX;             IN/OUT: on input the dimension scale index to start iterating,
-*                               on output the next index to visit. If NULL, start at
-*                               the first position.
-*  H5DS_iterate_t VISITOR;  IN: the visitor function
-*  void *VISITOR_DATA;      IN: arbitrary data to pass to the visitor function.
-*
-*  Iterate over all scales of DIM, calling an application callback
-*   with the item, key and any operator data.
-*
-*   The operator callback receives a pointer to the item ,
-*   and the pointer to the operator data passed
-*   in to H5SL_iterate ('op_data').  The return values from an operator are:
-*       A. Zero causes the iterator to continue, returning zero when all
-*           nodes of that type have been processed.
-*       B. Positive causes the iterator to immediately return that positive
-*           value, indicating short-circuit success.
-*       C. Negative causes the iterator to immediately return that value,
-*           indicating failure.
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 31, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSiterate_scales(hid_t did,
-                          unsigned int dim,
-                          int *ds_idx,
-                          H5DS_iterate_t visitor,
-                          void *visitor_data )
+ * Function: H5DSiterate_scales
+ *
+ * Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
+ *  of dataset DID. For each scale in the list, the visitor_data and some
+ *  additional information, specified below, are passed to the visitor function.
+ *  The iteration begins with the IDX object in the group and the next element
+ *  to be processed by the operator is returned in IDX. If IDX is NULL, then the
+ *  iterator starts at zero.
+ *
+ * Parameters:
+ *
+ *  hid_t DID;               IN: the dataset
+ *  unsigned int DIM;        IN: the dimension of the dataset
+ *  int *DS_IDX;             IN/OUT: on input the dimension scale index to start iterating,
+ *                               on output the next index to visit. If NULL, start at
+ *                               the first position.
+ *  H5DS_iterate_t VISITOR;  IN: the visitor function
+ *  void *VISITOR_DATA;      IN: arbitrary data to pass to the visitor function.
+ *
+ *  Iterate over all scales of DIM, calling an application callback
+ *   with the item, key and any operator data.
+ *
+ *   The operator callback receives a pointer to the item ,
+ *   and the pointer to the operator data passed
+ *   in to H5SL_iterate ('op_data').  The return values from an operator are:
+ *       A. Zero causes the iterator to continue, returning zero when all
+ *           nodes of that type have been processed.
+ *       B. Positive causes the iterator to immediately return that positive
+ *           value, indicating short-circuit success.
+ *       C. Negative causes the iterator to immediately return that value,
+ *           indicating failure.
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 31, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visitor, void *visitor_data)
 {
-    hid_t        scale_id;
-    int          rank;
-    hobj_ref_t   ref;          /* reference to the DS */
-    hid_t        sid;          /* space ID */
-    hid_t        tid = -1;     /* attribute type ID */
-    hid_t        aid = -1;     /* attribute ID */
-    hvl_t        *buf = NULL;    /* VL buffer to store in the attribute */
-    H5I_type_t   it;           /* ID type */
-    herr_t       ret_value=0;
-    int          j_idx;
-    int          nscales;
-    int          has_dimlist;
-    int          i;
+    hid_t      scale_id;
+    int        rank;
+    hobj_ref_t ref;        /* reference to the DS */
+    hid_t      sid;        /* space ID */
+    hid_t      tid = -1;   /* attribute type ID */
+    hid_t      aid = -1;   /* attribute ID */
+    hvl_t *    buf = NULL; /* VL buffer to store in the attribute */
+    H5I_type_t it;         /* ID type */
+    herr_t     ret_value = 0;
+    int        j_idx;
+    int        nscales;
+    int        has_dimlist;
+    int        i;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
 
-    if (H5I_DATASET!=it)
+    if (H5I_DATASET != it)
         return FAIL;
 
     /* get the number of scales assotiated with this DIM */
-    if ((nscales = H5DSget_num_scales(did,dim)) < 0)
+    if ((nscales = H5DSget_num_scales(did, dim)) < 0)
         return FAIL;
 
     /* parameter range checking */
-    if (ds_idx!=NULL)
-    {
-        if (*ds_idx>=nscales)
+    if (ds_idx != NULL) {
+        if (*ds_idx >= nscales)
             return FAIL;
     }
 
@@ -1339,70 +1317,67 @@ herr_t H5DSiterate_scales(hid_t did,
         return FAIL;
 
     /* get rank */
-    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* close dataset space */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
-    if ( dim >= (unsigned)rank )
+    if (dim >= (unsigned)rank)
         return FAIL;
 
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
-    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+    if ((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
         return FAIL;
 
-    if(has_dimlist == 0)
+    if (has_dimlist == 0)
         return SUCCEED;
 
-    else if(has_dimlist == 1)
-    {
-        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+    else if (has_dimlist == 1) {
+        if ((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
             goto out;
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
         /* allocate and initialize the VL */
-        buf = (hvl_t*)HDmalloc((size_t)rank * sizeof(hvl_t));
+        buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
 
-        if(buf == NULL)
+        if (buf == NULL)
             goto out;
 
         /* read */
-        if(H5Aread(aid, tid, buf) < 0)
+        if (H5Aread(aid, tid, buf) < 0)
             goto out;
 
-        if ( buf[dim].len > 0 )
-        {
-            if (ds_idx!=NULL)
+        if (buf[dim].len > 0) {
+            if (ds_idx != NULL)
                 j_idx = *ds_idx;
             else
-                j_idx=0;
+                j_idx = 0;
 
             /* iterate */
-            for(i=j_idx; i<nscales; i++)
-            {
+            for (i = j_idx; i < nscales; i++) {
                 /* get the reference */
-                ref = ((hobj_ref_t *)buf[dim].p)[ i ];
+                ref = ((hobj_ref_t *)buf[dim].p)[i];
 
                 /* disable error reporting, the ID might refer to a deleted dataset */
-                H5E_BEGIN_TRY {
+                H5E_BEGIN_TRY
+                {
                     /* get the DS id */
-                    if ((scale_id = H5Rdereference2(did,H5P_DEFAULT,H5R_OBJECT,&ref)) < 0)
+                    if ((scale_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref)) < 0)
                         goto out;
-                } H5E_END_TRY;
+                }
+                H5E_END_TRY;
 
                 /* set the return IDX OUT value at current scale index */
-                if (ds_idx!=NULL)
-                {
+                if (ds_idx != NULL) {
                     *ds_idx = i;
                 }
 
-                if((ret_value=(visitor)(did,dim,scale_id,visitor_data))!=0)
-                {
+                if ((ret_value = (visitor)(did, dim, scale_id, visitor_data)) != 0) {
                     /* break */
 
                     /* close the DS id */
@@ -1417,10 +1392,10 @@ herr_t H5DSiterate_scales(hid_t did,
                     goto out;
 
             } /* i */
-        } /* if */
+        }     /* if */
 
         /* close */
-        if (H5Treclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+        if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
             goto out;
         if (H5Sclose(sid) < 0)
             goto out;
@@ -1436,55 +1411,58 @@ herr_t H5DSiterate_scales(hid_t did,
     return ret_value;
 
 out:
-    H5E_BEGIN_TRY {
-        if(buf) {
-            H5Treclaim(tid,sid,H5P_DEFAULT,buf);
+    H5E_BEGIN_TRY
+    {
+        if (buf) {
+            H5Treclaim(tid, sid, H5P_DEFAULT, buf);
             HDfree(buf);
         }
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSset_label
-*
-* Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
-*
-* Return: Success: SUCCEED, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 11, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
+ * Function: H5DSset_label
+ *
+ * Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
+ *
+ * Return: Success: SUCCEED, Failure: FAIL
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 11, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5DSset_label(hid_t did, unsigned int idx, const char *label)
 {
-    int        has_labels;
-    hid_t      sid = -1;      /* space ID */
-    hid_t      tid = -1;      /* attribute type ID */
-    hid_t      aid = -1;      /* attribute ID */
-    int        rank;          /* rank of dataset */
-    hsize_t    dims[1];       /* dimensions of dataset */
-    H5I_type_t it;            /* ID type */
-    unsigned   int i;
-    union {                    /* union is needed to eliminate compiler warnings about */
-      char  ** buf;            /* discarding the 'const' qualifier in the free */
-      char const ** const_buf; /* buf calls */
+    int          has_labels;
+    hid_t        sid = -1; /* space ID */
+    hid_t        tid = -1; /* attribute type ID */
+    hid_t        aid = -1; /* attribute ID */
+    int          rank;     /* rank of dataset */
+    hsize_t      dims[1];  /* dimensions of dataset */
+    H5I_type_t   it;       /* ID type */
+    unsigned int i;
+    union {                     /* union is needed to eliminate compiler warnings about */
+        char **      buf;       /* discarding the 'const' qualifier in the free */
+        char const **const_buf; /* buf calls */
     } u;
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
@@ -1495,7 +1473,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
     if (label == NULL)
         return FAIL;
 
-     /* get dataset space */
+    /* get dataset space */
     if ((sid = H5Dget_space(did)) < 0)
         return FAIL;
 
@@ -1507,25 +1485,24 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
     if (H5Sclose(sid) < 0)
         goto out;
 
-    if ( idx >= (unsigned)rank )
+    if (idx >= (unsigned)rank)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * attribute "DIMENSION_LABELS"
-    *-------------------------------------------------------------------------
-    */
+     * attribute "DIMENSION_LABELS"
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "DIMENSION_LABELS" on the >>data<< dataset */
     if ((has_labels = H5LT_find_attribute(did, DIMENSION_LABELS)) < 0)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * make the attribute and insert label
-    *-------------------------------------------------------------------------
-    */
+     * make the attribute and insert label
+     *-------------------------------------------------------------------------
+     */
 
-    if (has_labels == 0)
-    {
+    if (has_labels == 0) {
         dims[0] = (hsize_t)rank;
 
         /* space for the attribute */
@@ -1543,12 +1520,12 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
             goto out;
 
         /* allocate and initialize */
-        u.const_buf = (char const **) HDmalloc((size_t) rank * sizeof(char *));
+        u.const_buf = (char const **)HDmalloc((size_t)rank * sizeof(char *));
 
         if (u.const_buf == NULL)
             goto out;
 
-        for (i = 0; i < (unsigned int) rank; i++)
+        for (i = 0; i < (unsigned int)rank; i++)
             u.const_buf[i] = NULL;
 
         /* store the label information in the required index */
@@ -1565,20 +1542,18 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
             goto out;
         if (H5Aclose(aid) < 0)
             goto out;
-        if (u.const_buf)
-        {
+        if (u.const_buf) {
             HDfree(u.const_buf);
             u.const_buf = NULL;
         }
     }
 
     /*-------------------------------------------------------------------------
-    * just insert label
-    *-------------------------------------------------------------------------
-    */
+     * just insert label
+     *-------------------------------------------------------------------------
+     */
 
-    else
-    {
+    else {
 
         if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
             goto out;
@@ -1587,7 +1562,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
             goto out;
 
         /* allocate and initialize */
-        u.buf = (char **) HDmalloc((size_t) rank * sizeof(char *));
+        u.buf = (char **)HDmalloc((size_t)rank * sizeof(char *));
 
         if (u.buf == NULL)
             goto out;
@@ -1611,8 +1586,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
         u.buf[idx] = NULL;
 
         /* free all the ptr's from the H5Aread() */
-        for (i = 0; i < (unsigned int) rank; i++)
-        {
+        for (i = 0; i < (unsigned int)rank; i++) {
             if (u.buf[i])
                 HDfree(u.buf[i]);
         }
@@ -1622,8 +1596,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
             goto out;
         if (H5Aclose(aid) < 0)
             goto out;
-        if (u.buf)
-        {
+        if (u.buf) {
             HDfree(u.buf);
             u.buf = NULL;
         }
@@ -1634,13 +1607,11 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
     /* error zone */
 
 out:
-    if (u.buf)
-    {
-        if (u.buf[idx]) /* check if we errored during H5Awrite */
+    if (u.buf) {
+        if (u.buf[idx])        /* check if we errored during H5Awrite */
             u.buf[idx] = NULL; /* don't free label */
         /* free all the ptr's from the H5Aread() */
-        for (i = 0; i < (unsigned int) rank; i++)
-        {
+        for (i = 0; i < (unsigned int)rank; i++) {
             if (u.buf[i])
                 HDfree(u.buf[i]);
         }
@@ -1651,50 +1622,52 @@ out:
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    }H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_label
-*
-* Purpose: Read the label LABEL for dimension IDX of dataset DID
-*   Up to 'size' characters are stored in 'label' followed by a '\0' string
-*   terminator.  If the label is longer than 'size'-1,
-*   the string terminator is stored in the last position of the buffer to
-*   properly terminate the string.
-*
-* Return: 0 if no label found, size of label if found, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 11, 2005
-*
-* Comments:
-*
-* Modifications:
-*     JIRA HDFFV-7673: Added a check to see if the label name exists,
-*     if not then returns zero. July 30, 2011. MSB
-*
-*-------------------------------------------------------------------------
-*/
-ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
+ * Function: H5DSget_label
+ *
+ * Purpose: Read the label LABEL for dimension IDX of dataset DID
+ *   Up to 'size' characters are stored in 'label' followed by a '\0' string
+ *   terminator.  If the label is longer than 'size'-1,
+ *   the string terminator is stored in the last position of the buffer to
+ *   properly terminate the string.
+ *
+ * Return: 0 if no label found, size of label if found, Failure: FAIL
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 11, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *     JIRA HDFFV-7673: Added a check to see if the label name exists,
+ *     if not then returns zero. July 30, 2011. MSB
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
 {
     int        has_labels;
-    hid_t      sid = -1;     /* space ID */
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    int        rank;         /* rank of dataset */
-    char       **buf = NULL; /* buffer to store in the attribute */
-    H5I_type_t it;           /* ID type */
+    hid_t      sid = -1;   /* space ID */
+    hid_t      tid = -1;   /* attribute type ID */
+    hid_t      aid = -1;   /* attribute ID */
+    int        rank;       /* rank of dataset */
+    char **    buf = NULL; /* buffer to store in the attribute */
+    H5I_type_t it;         /* ID type */
     size_t     nbytes = 0;
     size_t     copy_len;
     int        i;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
@@ -1702,7 +1675,7 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
     if (H5I_DATASET != it)
         return FAIL;
 
-     /* get dataset space */
+    /* get dataset space */
     if ((sid = H5Dget_space(did)) < 0)
         return FAIL;
 
@@ -1714,41 +1687,39 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
     if (H5Sclose(sid) < 0)
         goto out;
 
-    if ( idx >= (unsigned)rank )
+    if (idx >= (unsigned)rank)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * attribute "DIMENSION_LABELS"
-    *-------------------------------------------------------------------------
-    */
+     * attribute "DIMENSION_LABELS"
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "DIMENSION_LABELS" on the >>data<< dataset */
     if ((has_labels = H5LT_find_attribute(did, DIMENSION_LABELS)) < 0)
         return FAIL;
 
     /* return 0 and NULL for label if no label found */
-    if (has_labels == 0)
-    {
+    if (has_labels == 0) {
         if (label)
             label[0] = 0;
         return 0;
     }
 
     /*-------------------------------------------------------------------------
-    * open the attribute and read label
-    *-------------------------------------------------------------------------
-    */
+     * open the attribute and read label
+     *-------------------------------------------------------------------------
+     */
 
-    assert (has_labels == 1);
+    assert(has_labels == 1);
     if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
         goto out;
 
-
     if ((tid = H5Aget_type(aid)) < 0)
         goto out;
 
     /* allocate and initialize */
-    buf = (char **) HDmalloc((size_t) rank * sizeof(char *));
+    buf = (char **)HDmalloc((size_t)rank * sizeof(char *));
 
     if (buf == NULL)
         goto out;
@@ -1758,27 +1729,23 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
         goto out;
 
     /* do only if the label name exists for the dimension */
-    if (buf[idx] != NULL)
-    {
+    if (buf[idx] != NULL) {
         /* get the real string length */
         nbytes = HDstrlen(buf[idx]);
 
         /* compute the string length which will fit into the user's buffer */
-        copy_len = MIN(size-1, nbytes);
+        copy_len = MIN(size - 1, nbytes);
 
         /* copy all/some of the name */
-        if (label)
-        {
+        if (label) {
             HDmemcpy(label, buf[idx], copy_len);
 
             /* terminate the string */
             label[copy_len] = '\0';
         }
-
     }
     /* free all the ptr's from the H5Aread() */
-    for (i = 0; i < rank; i++)
-    {
+    for (i = 0; i < rank; i++) {
         if (buf[i])
             HDfree(buf[i]);
     }
@@ -1788,21 +1755,18 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
         goto out;
     if (H5Aclose(aid) < 0)
         goto out;
-    if (buf)
-    {
+    if (buf) {
         HDfree(buf);
         buf = NULL;
     }
 
-    return (ssize_t) nbytes;
+    return (ssize_t)nbytes;
 
     /* error zone */
 out:
-    if (buf)
-    {
+    if (buf) {
         /* free all the ptr's from the H5Aread() */
-        for (i = 0; i < rank; i++)
-        {
+        for (i = 0; i < rank; i++) {
             if (buf[i])
                 HDfree(buf[i]);
         }
@@ -1813,37 +1777,37 @@ out:
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    }H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_scale_name
-*
-* Purpose: Read the name of dataset scale DID into buffer NAME
-*   Up to 'size' characters are stored in 'name' followed by a '\0' string
-*   terminator.  If the name is longer than 'size'-1,
-*   the string terminator is stored in the last position of the buffer to
-*   properly terminate the string.
-*
-* Return: size of name if found, zero if not found,  Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*  The size of the name returned should not include the NULL termination
-*  in its value so as to be consistent with other HDF5 APIs.
-*
-*-------------------------------------------------------------------------
-*/
-
-ssize_t H5DSget_scale_name(hid_t did,
-                           char *name,
-                           size_t size)
+ * Function: H5DSget_scale_name
+ *
+ * Purpose: Read the name of dataset scale DID into buffer NAME
+ *   Up to 'size' characters are stored in 'name' followed by a '\0' string
+ *   terminator.  If the name is longer than 'size'-1,
+ *   the string terminator is stored in the last position of the buffer to
+ *   properly terminate the string.
+ *
+ * Return: size of name if found, zero if not found,  Failure: FAIL
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 04, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *  The size of the name returned should not include the NULL termination
+ *  in its value so as to be consistent with other HDF5 APIs.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+ssize_t
+H5DSget_scale_name(hid_t did, char *name, size_t size)
 {
     hid_t      aid;      /* attribute ID  */
     hid_t      tid = -1; /* attribute type ID */
@@ -1852,26 +1816,26 @@ ssize_t H5DSget_scale_name(hid_t did,
     size_t     nbytes;
     size_t     copy_len;
     int        has_name;
-    char       *buf=NULL;
+    char *     buf = NULL;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
 
-    if (H5I_DATASET!=it)
+    if (H5I_DATASET != it)
         return FAIL;
 
-    if ((H5DSis_scale(did))<=0)
+    if ((H5DSis_scale(did)) <= 0)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * check if the DS has a name
-    *-------------------------------------------------------------------------
-    */
+     * check if the DS has a name
+     *-------------------------------------------------------------------------
+     */
 
     /* try to find the attribute "NAME" on the >>DS<< dataset */
     if ((has_name = H5LT_find_attribute(did, "NAME")) < 0)
@@ -1881,43 +1845,43 @@ ssize_t H5DSget_scale_name(hid_t did,
         return 0;
 
     /*-------------------------------------------------------------------------
-    * open the attribute
-    *-------------------------------------------------------------------------
-    */
+     * open the attribute
+     *-------------------------------------------------------------------------
+     */
 
-    if((aid = H5Aopen(did, "NAME", H5P_DEFAULT)) < 0)
+    if ((aid = H5Aopen(did, "NAME", H5P_DEFAULT)) < 0)
         return FAIL;
 
     /* get space */
-    if((sid = H5Aget_space(aid)) < 0)
+    if ((sid = H5Aget_space(aid)) < 0)
         goto out;
 
     /* get type */
-    if((tid = H5Aget_type(aid)) < 0)
+    if ((tid = H5Aget_type(aid)) < 0)
         goto out;
 
     /* get the size */
-    if((nbytes = H5Tget_size(tid)) == 0)
+    if ((nbytes = H5Tget_size(tid)) == 0)
         goto out;
 
     /* allocate a temporary buffer */
-    buf = (char*)HDmalloc(nbytes * sizeof(char));
+    buf = (char *)HDmalloc(nbytes * sizeof(char));
     if (buf == NULL)
         goto out;
 
     /* read */
-    if (H5Aread(aid,tid,buf) < 0)
+    if (H5Aread(aid, tid, buf) < 0)
         goto out;
 
     /* compute the string length which will fit into the user's buffer */
-    copy_len = MIN(size-1, nbytes);
+    copy_len = MIN(size - 1, nbytes);
 
     /* copy all/some of the name */
     if (name) {
         HDmemcpy(name, buf, copy_len);
 
         /* terminate the string */
-        name[copy_len]='\0';
+        name[copy_len] = '\0';
     }
 
     /* close */
@@ -1934,221 +1898,222 @@ ssize_t H5DSget_scale_name(hid_t did,
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Aclose(aid);
         H5Tclose(tid);
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     if (buf)
         HDfree(buf);
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_scale
-*
-* Purpose: check if the dataset DID is a dimension scale
-*
-* Return: 1, is, 0, not, FAIL, error
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-htri_t H5DSis_scale(hid_t did)
+ * Function: H5DSis_scale
+ *
+ * Purpose: check if the dataset DID is a dimension scale
+ *
+ * Return: 1, is, 0, not, FAIL, error
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 04, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+htri_t
+H5DSis_scale(hid_t did)
 {
-    hid_t      tid = -1;   /* attribute type ID */
-    hid_t      aid = -1;   /* attribute ID */
-    herr_t     has_class;  /* has the "CLASS" attribute */
-    htri_t     is_ds;      /* boolean return value */
+    hid_t      tid = -1;     /* attribute type ID */
+    hid_t      aid = -1;     /* attribute ID */
+    herr_t     has_class;    /* has the "CLASS" attribute */
+    htri_t     is_ds;        /* boolean return value */
     H5I_type_t it;           /* ID type */
-    char       *buf;         /* Name of attribute */
+    char *     buf;          /* Name of attribute */
     hsize_t    storage_size; /* Size of storage for attribute */
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
 
-    if(H5I_DATASET != it)
+    if (H5I_DATASET != it)
         return FAIL;
 
     /* try to find the attribute "CLASS" on the dataset */
-    if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
+    if ((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
         return FAIL;
 
-    if(has_class == 0)
+    if (has_class == 0)
         is_ds = 0;
 
-    else
-    {
-        if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+    else {
+        if ((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
 
         /* check to make sure attribute is a string */
-        if(H5T_STRING != H5Tget_class(tid))
+        if (H5T_STRING != H5Tget_class(tid))
             goto out;
 
         /* check to make sure string is null-terminated */
-        if(H5T_STR_NULLTERM != H5Tget_strpad(tid))
+        if (H5T_STR_NULLTERM != H5Tget_strpad(tid))
             goto out;
 
         /* allocate buffer large enough to hold string */
-        if((storage_size = H5Aget_storage_size(aid)) == 0)
+        if ((storage_size = H5Aget_storage_size(aid)) == 0)
             goto out;
 
-        buf = (char*)HDmalloc( (size_t)storage_size * sizeof(char) + 1);
-        if(buf == NULL)
+        buf = (char *)HDmalloc((size_t)storage_size * sizeof(char) + 1);
+        if (buf == NULL)
             goto out;
 
         /* Read the attribute */
-        if(H5Aread(aid, tid, buf) < 0)
+        if (H5Aread(aid, tid, buf) < 0)
             goto out;
 
         /* compare strings */
-        if(HDstrncmp(buf, DIMENSION_SCALE_CLASS, MIN(HDstrlen(DIMENSION_SCALE_CLASS),HDstrlen(buf)))==0)
+        if (HDstrncmp(buf, DIMENSION_SCALE_CLASS, MIN(HDstrlen(DIMENSION_SCALE_CLASS), HDstrlen(buf))) == 0)
             is_ds = 1;
         else
             is_ds = 0;
 
         HDfree(buf);
 
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
 
         if (H5Aclose(aid) < 0)
             goto out;
-
-
     }
 
     return is_ds;
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Aclose(aid);
         H5Tclose(tid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_num_scales
-*
-* Purpose: get the number of scales linked to the IDX dimension of dataset DID
-*
-* Return:
-*   Success: number of scales
-*   Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 13, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-int H5DSget_num_scales(hid_t did,
-                       unsigned int idx)
+ * Function: H5DSget_num_scales
+ *
+ * Purpose: get the number of scales linked to the IDX dimension of dataset DID
+ *
+ * Return:
+ *   Success: number of scales
+ *   Failure: FAIL
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 13, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int
+H5DSget_num_scales(hid_t did, unsigned int idx)
 {
     int        has_dimlist;
-    hid_t      sid;          /* space ID */
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    int        rank;         /* rank of dataset */
-    hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
-    H5I_type_t it;           /* ID type */
+    hid_t      sid;        /* space ID */
+    hid_t      tid = -1;   /* attribute type ID */
+    hid_t      aid = -1;   /* attribute ID */
+    int        rank;       /* rank of dataset */
+    hvl_t *    buf = NULL; /* VL buffer to store in the attribute */
+    H5I_type_t it;         /* ID type */
     int        nscales;
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
-    if((it = H5Iget_type(did)) < 0)
+    if ((it = H5Iget_type(did)) < 0)
         return FAIL;
 
-    if(H5I_DATASET != it)
+    if (H5I_DATASET != it)
         return FAIL;
 
     /*-------------------------------------------------------------------------
-    * the attribute "DIMENSION_LIST" on the >>data<< dataset must exist
-    *-------------------------------------------------------------------------
-    */
+     * the attribute "DIMENSION_LIST" on the >>data<< dataset must exist
+     *-------------------------------------------------------------------------
+     */
     /* get dataset space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         return FAIL;
 
     /* get rank */
-    if((rank = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* close dataset space */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* dimemsion index IDX range checking */
-    if(idx >= (unsigned int )rank)
+    if (idx >= (unsigned int)rank)
         return FAIL;
 
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
-    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+    if ((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
         return FAIL;
 
     /* it does not exist */
-    if(has_dimlist == 0)
+    if (has_dimlist == 0)
         return 0;
 
     /*-------------------------------------------------------------------------
-    * the attribute exists, open it
-    *-------------------------------------------------------------------------
-    */
+     * the attribute exists, open it
+     *-------------------------------------------------------------------------
+     */
     else {
-        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
             goto out;
-        if((tid = H5Aget_type(aid)) < 0)
+        if ((tid = H5Aget_type(aid)) < 0)
             goto out;
-        if((sid = H5Aget_space(aid)) < 0)
+        if ((sid = H5Aget_space(aid)) < 0)
             goto out;
 
         /* allocate and initialize the VL */
         buf = (hvl_t *)HDmalloc((size_t)rank * sizeof(hvl_t));
-        if(buf == NULL)
+        if (buf == NULL)
             goto out;
 
         /* read */
-        if(H5Aread(aid, tid, buf) < 0)
+        if (H5Aread(aid, tid, buf) < 0)
             goto out;
 
         nscales = (int)buf[idx].len;
 
         /* close */
-        if(H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
+        if (H5Treclaim(tid, sid, H5P_DEFAULT, buf) < 0)
             goto out;
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
         HDfree(buf);
         buf = NULL;
@@ -2158,84 +2123,85 @@ int H5DSget_num_scales(hid_t did,
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
-    if(buf)
+    if (buf)
         HDfree(buf);
 
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DS_is_reserved
-*
-* Purpose: Verify that a dataset's CLASS is either an image, palette or table
-*
-* Return: true, false, fail
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: March 19, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-static
-herr_t H5DS_is_reserved(hid_t did)
+ * Function: H5DS_is_reserved
+ *
+ * Purpose: Verify that a dataset's CLASS is either an image, palette or table
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: March 19, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static herr_t
+H5DS_is_reserved(hid_t did)
 {
-    int    has_class;
-    hid_t  tid = -1;
-    hid_t  aid = -1;
-    char *buf;            /* Name of attribute */
+    int     has_class;
+    hid_t   tid = -1;
+    hid_t   aid = -1;
+    char *  buf;          /* Name of attribute */
     hsize_t storage_size; /* Size of storage for attribute */
-    herr_t ret;
+    herr_t  ret;
 
     /* try to find the attribute "CLASS" on the dataset */
-    if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
+    if ((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
         return -1;
 
-    if(has_class ==  0)
+    if (has_class == 0)
         return 0;
 
-    assert(has_class ==  1);
-    if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+    assert(has_class == 1);
+    if ((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
         goto out;
 
-    if((tid = H5Aget_type(aid)) < 0)
+    if ((tid = H5Aget_type(aid)) < 0)
         goto out;
 
     /* check to make sure attribute is a string */
-    if(H5T_STRING != H5Tget_class(tid))
-      goto out;
+    if (H5T_STRING != H5Tget_class(tid))
+        goto out;
 
     /* check to make sure string is null-terminated */
-    if(H5T_STR_NULLTERM != H5Tget_strpad(tid))
-      goto out;
+    if (H5T_STR_NULLTERM != H5Tget_strpad(tid))
+        goto out;
 
     /* allocate buffer large enough to hold string */
-    if((storage_size = H5Aget_storage_size(aid)) == 0)
-      goto out;
+    if ((storage_size = H5Aget_storage_size(aid)) == 0)
+        goto out;
 
-    buf = (char*)HDmalloc( (size_t)storage_size * sizeof(char) + 1);
-    if(buf == NULL)
-      goto out;
+    buf = (char *)HDmalloc((size_t)storage_size * sizeof(char) + 1);
+    if (buf == NULL)
+        goto out;
 
     /* Read the attribute */
-    if(H5Aread(aid, tid, buf) < 0)
-      goto out;
-
+    if (H5Aread(aid, tid, buf) < 0)
+        goto out;
 
-    if(HDstrncmp(buf, IMAGE_CLASS, MIN(HDstrlen(IMAGE_CLASS),HDstrlen(buf))) == 0 ||
-       HDstrncmp(buf, PALETTE_CLASS, MIN(HDstrlen(PALETTE_CLASS),HDstrlen(buf))) == 0 ||
-       HDstrncmp(buf, TABLE_CLASS, MIN(HDstrlen(TABLE_CLASS),HDstrlen(buf))) == 0 )
+    if (HDstrncmp(buf, IMAGE_CLASS, MIN(HDstrlen(IMAGE_CLASS), HDstrlen(buf))) == 0 ||
+        HDstrncmp(buf, PALETTE_CLASS, MIN(HDstrlen(PALETTE_CLASS), HDstrlen(buf))) == 0 ||
+        HDstrncmp(buf, TABLE_CLASS, MIN(HDstrlen(TABLE_CLASS), HDstrlen(buf))) == 0)
         ret = 1;
     else
         ret = 0;
@@ -2248,7 +2214,6 @@ herr_t H5DS_is_reserved(hid_t did)
     if (H5Aclose(aid) < 0)
         goto out;
 
-
     return ret;
 
     /* error zone */
@@ -2257,31 +2222,32 @@ out:
     {
         H5Tclose(tid);
         H5Aclose(aid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DS_get_REFLIST_type
-*
-* Purpose: This is a helper function to return a native type for
-*          the REFERENCE_LIST attribute.
-*
-* Return: Type identifier on success and negative on failure
-*
-* Programmer: epourmal@hdfgroup.org
-*
-* Date: May 22, 2010
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-static
-hid_t H5DS_get_REFLIST_type(void)
+ * Function: H5DS_get_REFLIST_type
+ *
+ * Purpose: This is a helper function to return a native type for
+ *          the REFERENCE_LIST attribute.
+ *
+ * Return: Type identifier on success and negative on failure
+ *
+ * Programmer: epourmal@hdfgroup.org
+ *
+ * Date: May 22, 2010
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static hid_t
+H5DS_get_REFLIST_type(void)
 {
     hid_t ntid_t = -1;
 
@@ -2289,20 +2255,21 @@ hid_t H5DS_get_REFLIST_type(void)
        used to store ds_list_t structure in the REFERENCE_LIST
        attribute */
 
-    if((ntid_t = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
+    if ((ntid_t = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
         goto out;
 
-    if(H5Tinsert(ntid_t, "dataset", HOFFSET(ds_list_t,ref), H5T_STD_REF_OBJ) < 0)
+    if (H5Tinsert(ntid_t, "dataset", HOFFSET(ds_list_t, ref), H5T_STD_REF_OBJ) < 0)
         goto out;
 
-    if(H5Tinsert(ntid_t, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(ntid_t, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
         goto out;
 
     return ntid_t;
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(ntid_t);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
-
diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h
index 9d20d48..58bb82e 100644
--- a/hl/src/H5DSprivate.h
+++ b/hl/src/H5DSprivate.h
@@ -20,21 +20,15 @@
 /* public LT prototypes			*/
 #include "H5DSpublic.h"
 
-
-
-
 /* attribute type of a DS dataset */
 typedef struct ds_list_t {
- hobj_ref_t ref;     /* object reference  */
- unsigned int dim_idx; /* dimension index of the dataset */
+    hobj_ref_t   ref;     /* object reference  */
+    unsigned int dim_idx; /* dimension index of the dataset */
 } ds_list_t;
 
-
 /*-------------------------------------------------------------------------
  * private functions
  *-------------------------------------------------------------------------
  */
 
-
 #endif
-
diff --git a/hl/src/H5DSpublic.h b/hl/src/H5DSpublic.h
index 615122c..0c29a36 100644
--- a/hl/src/H5DSpublic.h
+++ b/hl/src/H5DSpublic.h
@@ -14,61 +14,37 @@
 #ifndef _H5DSpublic_H
 #define _H5DSpublic_H
 
-
-
 #define DIMENSION_SCALE_CLASS "DIMENSION_SCALE"
 #define DIMENSION_LIST        "DIMENSION_LIST"
 #define REFERENCE_LIST        "REFERENCE_LIST"
 #define DIMENSION_LABELS      "DIMENSION_LABELS"
 
-
-typedef herr_t  (*H5DS_iterate_t)(hid_t dset, unsigned dim, hid_t scale, void *visitor_data);
-
+typedef herr_t (*H5DS_iterate_t)(hid_t dset, unsigned dim, hid_t scale, void *visitor_data);
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_HLDLL herr_t  H5DSattach_scale( hid_t did,
-                        hid_t dsid,
-                        unsigned int idx);
-
-H5_HLDLL herr_t  H5DSdetach_scale( hid_t did,
-                        hid_t dsid,
-                        unsigned int idx);
-
-H5_HLDLL herr_t  H5DSset_scale( hid_t dsid,
-                     const char *dimname);
+H5_HLDLL herr_t H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx);
 
-H5_HLDLL int H5DSget_num_scales( hid_t did,
-                       unsigned int dim);
+H5_HLDLL herr_t H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx);
 
-H5_HLDLL herr_t  H5DSset_label( hid_t did,
-                     unsigned int idx,
-                     const char *label);
+H5_HLDLL herr_t H5DSset_scale(hid_t dsid, const char *dimname);
 
-H5_HLDLL ssize_t H5DSget_label( hid_t did,
-                      unsigned int idx,
-                      char *label,
-                      size_t size);
+H5_HLDLL int H5DSget_num_scales(hid_t did, unsigned int dim);
 
-H5_HLDLL ssize_t H5DSget_scale_name( hid_t did,
-                           char *name,
-                           size_t size);
+H5_HLDLL herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label);
 
-H5_HLDLL htri_t H5DSis_scale( hid_t did);
+H5_HLDLL ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size);
 
-H5_HLDLL herr_t  H5DSiterate_scales( hid_t did,
-                          unsigned int dim,
-                          int *idx,
-                          H5DS_iterate_t visitor,
-                          void *visitor_data);
+H5_HLDLL ssize_t H5DSget_scale_name(hid_t did, char *name, size_t size);
 
-H5_HLDLL htri_t H5DSis_attached( hid_t did,
-                       hid_t dsid,
-                       unsigned int idx);
+H5_HLDLL htri_t H5DSis_scale(hid_t did);
 
+H5_HLDLL herr_t H5DSiterate_scales(hid_t did, unsigned int dim, int *idx, H5DS_iterate_t visitor,
+                                   void *visitor_data);
 
+H5_HLDLL htri_t H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx);
 
 #ifdef __cplusplus
 }
diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h
index 45591e8..989c799 100644
--- a/hl/src/H5HLprivate2.h
+++ b/hl/src/H5HLprivate2.h
@@ -24,4 +24,3 @@
 #include "H5private.h"
 
 #endif /* _H5HLprivate2_H */
-
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index a4818b8..fdb0632 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "H5IMprivate.h"
 #include "H5LTprivate.h"
@@ -17,34 +17,32 @@
 #include <stdlib.h>
 
 /*-------------------------------------------------------------------------
-* Function: H5IMmake_image_8bit
-*
-* Purpose: Creates and writes an image an 8 bit image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: June 13, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMmake_image_8bit( hid_t loc_id,
-                           const char *dset_name,
-                           hsize_t width,
-                           hsize_t height,
-                           const unsigned char *buf )
+ * Function: H5IMmake_image_8bit
+ *
+ * Purpose: Creates and writes an image an 8 bit image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 13, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMmake_image_8bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                    const unsigned char *buf)
 {
-    hsize_t  dims[IMAGE8_RANK];
+    hsize_t dims[IMAGE8_RANK];
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         return -1;
 
     /* Initialize the image dimensions */
@@ -52,283 +50,266 @@ herr_t H5IMmake_image_8bit( hid_t loc_id,
     dims[1] = width;
 
     /* Make the dataset */
-    if ( H5LTmake_dataset( loc_id, dset_name, IMAGE8_RANK, dims, H5T_NATIVE_UCHAR, buf ) < 0)
+    if (H5LTmake_dataset(loc_id, dset_name, IMAGE8_RANK, dims, H5T_NATIVE_UCHAR, buf) < 0)
         return -1;
 
     /* Attach the CLASS attribute */
-    if ( H5LTset_attribute_string( loc_id, dset_name, "CLASS", IMAGE_CLASS ) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
         return -1;
 
     /* Attach the VERSION attribute */
-    if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION ) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
         return -1;
 
     /* Attach the IMAGE_SUBCLASS attribute */
-    if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED" ) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5IMmake_image_24bit
-*
-* Purpose:
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: June 13, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Interlace Mode Dimensions in the Dataspace
-* INTERLACE_PIXEL [height][width][pixel components]
-* INTERLACE_PLANE [pixel components][height][width]
-*
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMmake_image_24bit( hid_t loc_id,
-                            const char *dset_name,
-                            hsize_t width,
-                            hsize_t height,
-                            const char *interlace,
-                            const unsigned char *buf )
+ * Function: H5IMmake_image_24bit
+ *
+ * Purpose:
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 13, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Interlace Mode Dimensions in the Dataspace
+ * INTERLACE_PIXEL [height][width][pixel components]
+ * INTERLACE_PLANE [pixel components][height][width]
+ *
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMmake_image_24bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                     const char *interlace, const unsigned char *buf)
 {
-    hsize_t  dims[IMAGE24_RANK];
+    hsize_t dims[IMAGE24_RANK];
 
     /* check the arguments */
-    if (interlace == NULL) 
+    if (interlace == NULL)
         return -1;
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         return -1;
 
-
     /* Initialize the image dimensions */
 
-    if ( HDstrncmp( interlace, "INTERLACE_PIXEL",15 ) == 0 )
-    {
+    if (HDstrncmp(interlace, "INTERLACE_PIXEL", 15) == 0) {
         /* Number of color planes is defined as the third dimension */
         dims[0] = height;
         dims[1] = width;
         dims[2] = IMAGE24_RANK;
     }
+    else if (HDstrncmp(interlace, "INTERLACE_PLANE", 15) == 0) {
+        /* Number of color planes is defined as the first dimension */
+        dims[0] = IMAGE24_RANK;
+        dims[1] = height;
+        dims[2] = width;
+    }
     else
-      if ( HDstrncmp( interlace, "INTERLACE_PLANE",15 ) == 0 )
-        {
-            /* Number of color planes is defined as the first dimension */
-            dims[0] = IMAGE24_RANK;
-            dims[1] = height;
-            dims[2] = width;
-        }
-        else return -1;
-
-        /* Make the dataset */
-        if ( H5LTmake_dataset( loc_id, dset_name, IMAGE24_RANK, dims, H5T_NATIVE_UCHAR, buf ) < 0)
-            return -1;
+        return -1;
 
-        /* Attach the CLASS attribute */
-        if ( H5LTset_attribute_string( loc_id, dset_name, "CLASS", IMAGE_CLASS ) < 0)
-            return -1;
+    /* Make the dataset */
+    if (H5LTmake_dataset(loc_id, dset_name, IMAGE24_RANK, dims, H5T_NATIVE_UCHAR, buf) < 0)
+        return -1;
 
-        /* Attach the VERSION attribute */
-        if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION ) < 0)
-            return -1;
+    /* Attach the CLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
+        return -1;
 
-        /* Attach the IMAGE_SUBCLASS attribute */
-        if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR" ) < 0)
-            return -1;
+    /* Attach the VERSION attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
+        return -1;
 
-        /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
-        if ( H5LTset_attribute_string( loc_id, dset_name, "INTERLACE_MODE", interlace ) < 0)
-            return -1;
+    /* Attach the IMAGE_SUBCLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
+        return -1;
 
-        return 0;
+    /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
+    if (H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
+        return -1;
 
+    return 0;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: find_palette
-*
-* Purpose: operator function used by H5LT_find_palette
-*
-* Return:
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: May 28, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-static herr_t find_palette(hid_t loc_id,
-                           const char *name,
-                           const H5A_info_t *ainfo,
-                           void *op_data)
+ * Function: find_palette
+ *
+ * Purpose: operator function used by H5LT_find_palette
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 28, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+find_palette(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data)
 {
     int ret = H5_ITER_CONT;
 
     /* check the arguments */
-    if (name == NULL) 
+    if (name == NULL)
         return -1;
 
     /* Shut compiler up */
-    loc_id = loc_id; ainfo = ainfo; op_data = op_data;
+    loc_id  = loc_id;
+    ainfo   = ainfo;
+    op_data = op_data;
 
     /* Define a positive value for return value if the attribute was found. This will
-    * cause the iterator to immediately return that positive value,
-    * indicating short-circuit success
-    */
-    if(HDstrncmp(name, "PALETTE",7) == 0)
+     * cause the iterator to immediately return that positive value,
+     * indicating short-circuit success
+     */
+    if (HDstrncmp(name, "PALETTE", 7) == 0)
         ret = H5_ITER_STOP;
 
     return ret;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IM_find_palette
-*
-* Purpose: Private function. Find the attribute "PALETTE" in the image dataset
-*
-* Return: Success: 1, Failure: 0
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: May 11, 2001
-*
-* Comments:
-*  The function uses H5Aiterate2 with the operator function find_palette
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IM_find_palette( hid_t loc_id )
+ * Function: H5IM_find_palette
+ *
+ * Purpose: Private function. Find the attribute "PALETTE" in the image dataset
+ *
+ * Return: Success: 1, Failure: 0
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 11, 2001
+ *
+ * Comments:
+ *  The function uses H5Aiterate2 with the operator function find_palette
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IM_find_palette(hid_t loc_id)
 {
     return H5Aiterate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, find_palette, NULL);
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMget_image_info
-*
-* Purpose: Gets information about an image dataset (dimensions, interlace mode
-*          and number of associated palettes).
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: July 25, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMget_image_info( hid_t loc_id,
-                          const char *dset_name,
-                          hsize_t *width,
-                          hsize_t *height,
-                          hsize_t *planes,
-                          char *interlace,
-                          hssize_t *npals )
+ * Function: H5IMget_image_info
+ *
+ * Purpose: Gets information about an image dataset (dimensions, interlace mode
+ *          and number of associated palettes).
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 25, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMget_image_info(hid_t loc_id, const char *dset_name, hsize_t *width, hsize_t *height, hsize_t *planes,
+                   char *interlace, hssize_t *npals)
 {
-    hid_t       did                     = -1;
-    hid_t       sid                     = -1;
+    hid_t       did = -1;
+    hid_t       sid = -1;
     hsize_t     dims[IMAGE24_RANK];
-    hid_t       aid                     = -1;
-    hid_t       asid                    = -1;
-    hid_t       atid                    = -1;
+    hid_t       aid  = -1;
+    hid_t       asid = -1;
+    hid_t       atid = -1;
     H5T_class_t aclass;
     int         has_pal;
     int         has_attr;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
-    if (interlace == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
+    if (interlace == NULL)
+        return -1;
 
     /*assume initially we have no palettes attached*/
     *npals = 0;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "INTERLACE_MODE" on the >>image<< dataset */
     has_attr = H5LT_find_attribute(did, "INTERLACE_MODE");
 
     /* It exists, get it */
-    if(has_attr == 1)
-    {
+    if (has_attr == 1) {
 
-        if((aid = H5Aopen(did, "INTERLACE_MODE", H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, "INTERLACE_MODE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if(H5Aread(aid, atid, interlace) < 0)
+        if (H5Aread(aid, atid, interlace) < 0)
             goto out;
 
-        if(H5Tclose(atid) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
     }
 
     /* Get the dataspace handle */
-    if ( (sid = H5Dget_space( did )) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* Get dimensions */
-    if ( H5Sget_simple_extent_dims( sid, dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
 
     /* Initialize the image dimensions */
 
-    if ( has_attr == 1 )
-        /* This is a 24 bit image */
+    if (has_attr == 1)
+    /* This is a 24 bit image */
     {
 
-      if ( HDstrncmp( interlace, "INTERLACE_PIXEL", 15 ) == 0 )
-        {
+        if (HDstrncmp(interlace, "INTERLACE_PIXEL", 15) == 0) {
             /* Number of color planes is defined as the third dimension */
             *height = dims[0];
             *width  = dims[1];
             *planes = dims[2];
         }
+        else if (HDstrncmp(interlace, "INTERLACE_PLANE", 15) == 0) {
+            /* Number of color planes is defined as the first dimension */
+            *planes = dims[0];
+            *height = dims[1];
+            *width  = dims[2];
+        }
         else
-	  if ( HDstrncmp( interlace, "INTERLACE_PLANE", 15 ) == 0 )
-            {
-                /* Number of color planes is defined as the first dimension */
-                *planes = dims[0];
-                *height = dims[1];
-                *width  = dims[2];
-            }
-	  else return -1;
+            return -1;
     }
     else
-        /* This is a 8 bit image */
+    /* This is a 8 bit image */
     {
         *height = dims[0];
         *width  = dims[1];
@@ -336,379 +317,357 @@ herr_t H5IMget_image_info( hid_t loc_id,
     }
 
     /* Close */
-    if ( H5Sclose( sid ) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
-
     /* Get number of palettes */
 
-
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
     has_pal = H5IM_find_palette(did);
 
-    if(has_pal ==  1)
-    {
+    if (has_pal == 1) {
 
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if((aclass = H5Tget_class(atid)) < 0)
+        if ((aclass = H5Tget_class(atid)) < 0)
             goto out;
 
         /* Check if it is really a reference */
 
-        if(aclass == H5T_REFERENCE)
-        {
+        if (aclass == H5T_REFERENCE) {
 
             /* Get the reference(s) */
 
-            if ( (asid = H5Aget_space( aid )) < 0)
+            if ((asid = H5Aget_space(aid)) < 0)
                 goto out;
 
-            *npals = H5Sget_simple_extent_npoints( asid );
+            *npals = H5Sget_simple_extent_npoints(asid);
 
-            if ( H5Sclose( asid ) < 0)
+            if (H5Sclose(asid) < 0)
                 goto out;
 
         } /* H5T_REFERENCE */
 
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
         /* Close the attribute. */
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-
     }
 
     /* End access to the dataset and release resources used by it. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     return 0;
 
 out:
-    if(did > 0)
-        H5Dclose( did );
-    if(aid > 0)
-        H5Aclose( aid );
-    if(asid > 0)
-        H5Sclose( asid );
-    if(atid > 0)
-        H5Tclose( atid );
+    if (did > 0)
+        H5Dclose(did);
+    if (aid > 0)
+        H5Aclose(aid);
+    if (asid > 0)
+        H5Sclose(asid);
+    if (atid > 0)
+        H5Tclose(atid);
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMread_image
-*
-* Purpose: Reads image data from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: June 13, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMread_image( hid_t loc_id,
-                       const char *dset_name,
-                       unsigned char *buf )
+ * Function: H5IMread_image
+ *
+ * Purpose: Reads image data from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 13, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMread_image(hid_t loc_id, const char *dset_name, unsigned char *buf)
 {
-    hid_t   did;
+    hid_t did;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Read */
-    if ( H5Dread( did, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf ) < 0)
+    if (H5Dread(did, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
 
     /* End access to the dataset and release resources used by it. */
-    if ( H5Dclose( did ) )
+    if (H5Dclose(did))
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
+    H5Dclose(did);
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMmake_palette
-*
-* Purpose: Creates and writes a palette.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: May 01, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMmake_palette( hid_t loc_id,
-                        const char *pal_name,
-                        const hsize_t *pal_dims,
-                        const unsigned char *pal_data )
+ * Function: H5IMmake_palette
+ *
+ * Purpose: Creates and writes a palette.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 01, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMmake_palette(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, const unsigned char *pal_data)
 
 {
 
     int has_pal;
 
     /* check the arguments */
-    if (pal_name == NULL) 
-      return -1;
+    if (pal_name == NULL)
+        return -1;
 
     /* Check if the dataset already exists */
-    has_pal = H5LTfind_dataset( loc_id, pal_name );
+    has_pal = H5LTfind_dataset(loc_id, pal_name);
 
     /* It exists. Return */
-    if ( has_pal == 1 )
+    if (has_pal == 1)
         return 0;
 
     /* Make the palette dataset. */
-    if ( H5LTmake_dataset( loc_id, pal_name, 2, pal_dims, H5T_NATIVE_UCHAR, pal_data ) <  0 )
+    if (H5LTmake_dataset(loc_id, pal_name, 2, pal_dims, H5T_NATIVE_UCHAR, pal_data) < 0)
         return -1;
 
     /* Attach the attribute "CLASS" to the >>palette<< dataset*/
-    if ( H5LTset_attribute_string( loc_id, pal_name, "CLASS", PALETTE_CLASS ) < 0)
+    if (H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
         return -1;
 
     /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
-    if ( H5LTset_attribute_string( loc_id, pal_name, "PAL_VERSION", "1.2" ) < 0)
+    if (H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
         return -1;
 
     return 0;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMlink_palette
-*
-* Purpose: This function attaches a palette to an existing image dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: May 01, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-*  An image (dataset) within an HDF5 file may optionally specify an array of
-*  palettes to be viewed with. The dataset will have an attribute
-*  which contains an array of object reference pointers which refer to palettes in the file.
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMlink_palette( hid_t loc_id,
-                        const char *image_name,
-                        const char *pal_name )
+ * Function: H5IMlink_palette
+ *
+ * Purpose: This function attaches a palette to an existing image dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 01, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ *  An image (dataset) within an HDF5 file may optionally specify an array of
+ *  palettes to be viewed with. The dataset will have an attribute
+ *  which contains an array of object reference pointers which refer to palettes in the file.
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMlink_palette(hid_t loc_id, const char *image_name, const char *pal_name)
 
 {
     hid_t       did;
-    hid_t       atid=-1;
-    hid_t       aid=-1;
-    hid_t       asid=-1;
-    hobj_ref_t  ref;         /* write a new reference */
-    hobj_ref_t  *refbuf;     /* buffer to read references */
+    hid_t       atid = -1;
+    hid_t       aid  = -1;
+    hid_t       asid = -1;
+    hobj_ref_t  ref;    /* write a new reference */
+    hobj_ref_t *refbuf; /* buffer to read references */
     hssize_t    n_refs;
     hsize_t     dim_ref;
     int         ok_pal;
 
-    
     /* check the arguments */
-    if (image_name == NULL) 
-      return -1;
-    if (pal_name == NULL) 
-      return -1;
+    if (image_name == NULL)
+        return -1;
+    if (pal_name == NULL)
+        return -1;
 
     /* The image dataset may or may not have the attribute "PALETTE"
-    * First we try to open to see if it is already there; if not, it is created.
-    * If it exists, the array of references is extended to hold the reference
-    * to the new palette
-    */
+     * First we try to open to see if it is already there; if not, it is created.
+     * If it exists, the array of references is extended to hold the reference
+     * to the new palette
+     */
 
     /* First we get the image id */
-    if((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
-    ok_pal = H5LT_find_attribute( did, "PALETTE" );
+    ok_pal = H5LT_find_attribute(did, "PALETTE");
 
     /*-------------------------------------------------------------------------
-    * It does not exist. We create the attribute and one reference
-    *-------------------------------------------------------------------------
-    */
-    if(ok_pal == 0 )
-    {
-        if((asid = H5Screate(H5S_SCALAR)) < 0)
+     * It does not exist. We create the attribute and one reference
+     *-------------------------------------------------------------------------
+     */
+    if (ok_pal == 0) {
+        if ((asid = H5Screate(H5S_SCALAR)) < 0)
             goto out;
 
         /* Create the attribute type for the reference */
-        if((atid = H5Tcopy(H5T_STD_REF_OBJ)) < 0)
+        if ((atid = H5Tcopy(H5T_STD_REF_OBJ)) < 0)
             goto out;
 
         /* Create the attribute "PALETTE" to be attached to the image*/
-        if((aid = H5Acreate2(did, "PALETTE", atid, asid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(did, "PALETTE", atid, asid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* Create a reference. The reference is created on the local id.  */
-        if(H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1) < 0)
+        if (H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1) < 0)
             goto out;
 
         /* Write the attribute with the reference */
-        if(H5Awrite(aid, atid, &ref) < 0)
+        if (H5Awrite(aid, atid, &ref) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(asid) < 0)
+        if (H5Sclose(asid) < 0)
             goto out;
-        if(H5Tclose(atid) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-
     }
 
     /*-------------------------------------------------------------------------
-    * The attribute already exists, open it
-    *-------------------------------------------------------------------------
-    */
-    else if(ok_pal ==  1)
-    {
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+     * The attribute already exists, open it
+     *-------------------------------------------------------------------------
+     */
+    else if (ok_pal == 1) {
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if(H5Tget_class(atid) < 0)
+        if (H5Tget_class(atid) < 0)
             goto out;
 
         /* Get and save the old reference(s) */
-        if((asid = H5Aget_space(aid)) < 0)
+        if ((asid = H5Aget_space(aid)) < 0)
             goto out;
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
         dim_ref = (hsize_t)n_refs + 1;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
+        refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * (size_t)dim_ref);
 
-        if ( H5Aread( aid, atid, refbuf ) < 0)
+        if (H5Aread(aid, atid, refbuf) < 0)
             goto out;
 
         /* The attribute must be deleted, in order to the new one can reflect the changes*/
-        if(H5Adelete(did, "PALETTE") < 0)
+        if (H5Adelete(did, "PALETTE") < 0)
             goto out;
 
         /* Create a new reference for this palette. */
-        if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1 ) < 0)
+        if (H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1) < 0)
             goto out;
 
         refbuf[n_refs] = ref;
 
         /* Create the data space for the new references */
-        if(H5Sclose(asid) < 0)
+        if (H5Sclose(asid) < 0)
             goto out;
 
-        if((asid = H5Screate_simple(1, &dim_ref, NULL)) < 0)
+        if ((asid = H5Screate_simple(1, &dim_ref, NULL)) < 0)
             goto out;
 
         /* Create the attribute again with the changes of space */
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
 
-        if((aid = H5Acreate2(did, "PALETTE", atid, asid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((aid = H5Acreate2(did, "PALETTE", atid, asid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* Write the attribute with the new references */
-        if(H5Awrite(aid, atid, refbuf) < 0)
+        if (H5Awrite(aid, atid, refbuf) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(asid) < 0)
+        if (H5Sclose(asid) < 0)
             goto out;
-        if(H5Tclose(atid) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
 
-        HDfree( refbuf );
+        HDfree(refbuf);
 
     } /* ok_pal ==  1 */
 
     /* Close the image dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
-    H5Sclose( asid );
-    H5Tclose( atid );
-    H5Aclose( aid );
+    H5Dclose(did);
+    H5Sclose(asid);
+    H5Tclose(atid);
+    H5Aclose(aid);
     return -1;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5IMunlink_palette
-*
-* Purpose: This function dettaches a palette from an existing image dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: September 10, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMunlink_palette( hid_t loc_id,
-                          const char *image_name,
-                          const char *pal_name )
+ * Function: H5IMunlink_palette
+ *
+ * Purpose: This function dettaches a palette from an existing image dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 10, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMunlink_palette(hid_t loc_id, const char *image_name, const char *pal_name)
 {
     hid_t       did;
     hid_t       atid;
@@ -717,98 +676,94 @@ herr_t H5IMunlink_palette( hid_t loc_id,
     int         ok_pal, has_pal;
 
     /* check the arguments */
-    if(image_name == NULL) 
-      return -1;
-    if(pal_name == NULL) 
-      return -1;
+    if (image_name == NULL)
+        return -1;
+    if (pal_name == NULL)
+        return -1;
 
     /* Try to find the palette dataset */
-    has_pal = H5LTfind_dataset( loc_id, pal_name );
+    has_pal = H5LTfind_dataset(loc_id, pal_name);
 
     /* It does not exist. Return */
-    if ( has_pal == 0 )
+    if (has_pal == 0)
         return -1;
 
     /* The image dataset may or not have the attribute "PALETTE"
-    * First we try to open to see if it is already there; if not, it is created.
-    * If it exists, the array of references is extended to hold the reference
-    * to the new palette
-    */
+     * First we try to open to see if it is already there; if not, it is created.
+     * If it exists, the array of references is extended to hold the reference
+     * to the new palette
+     */
 
     /* First we get the image id */
-    if((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
     ok_pal = H5LT_find_attribute(did, "PALETTE");
 
     /* It does not exist. Nothing to do */
-    if(ok_pal == 0)
+    if (ok_pal == 0)
         return -1;
 
     /* The attribute exists, open it */
-    else if(ok_pal ==  1)
-    {
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+    else if (ok_pal == 1) {
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if((aclass = H5Tget_class(atid)) < 0)
+        if ((aclass = H5Tget_class(atid)) < 0)
             goto out;
 
         /* Check if it is really a reference */
-        if(aclass == H5T_REFERENCE)
-        {
+        if (aclass == H5T_REFERENCE) {
             /* Delete the attribute */
-            if(H5Adelete(did, "PALETTE") < 0)
+            if (H5Adelete(did, "PALETTE") < 0)
                 goto out;
 
-        }  /* H5T_REFERENCE */
+        } /* H5T_REFERENCE */
 
-        if(H5Tclose(atid) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
         /* Close the attribute. */
-        if(H5Aclose(aid) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
 
     } /* ok_pal */
 
     /* Close the image dataset. */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
+    H5Dclose(did);
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMget_npalettes
-*
-* Purpose: Gets the number of palettes associated to an image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: July 22, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMget_npalettes( hid_t loc_id,
-                         const char *image_name,
-                         hssize_t *npals )
+ * Function: H5IMget_npalettes
+ *
+ * Purpose: Gets the number of palettes associated to an image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 22, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMget_npalettes(hid_t loc_id, const char *image_name, hssize_t *npals)
 {
     hid_t       did;
     hid_t       atid;
@@ -818,495 +773,469 @@ herr_t H5IMget_npalettes( hid_t loc_id,
     int         has_pal;
 
     /* check the arguments */
-    if(image_name == NULL) 
-      return -1;
+    if (image_name == NULL)
+        return -1;
 
     /*assume initially we have no palettes attached*/
     *npals = 0;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
     has_pal = H5IM_find_palette(did);
 
-    if(has_pal ==  1 )
-    {
+    if (has_pal == 1) {
 
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if((aclass = H5Tget_class(atid)) < 0)
+        if ((aclass = H5Tget_class(atid)) < 0)
             goto out;
 
         /* Check if it is really a reference */
 
-        if(aclass == H5T_REFERENCE)
-        {
-            if((asid = H5Aget_space(aid)) < 0)
+        if (aclass == H5T_REFERENCE) {
+            if ((asid = H5Aget_space(aid)) < 0)
                 goto out;
 
-            *npals = H5Sget_simple_extent_npoints( asid );
+            *npals = H5Sget_simple_extent_npoints(asid);
 
-            if ( H5Sclose( asid ) < 0)
+            if (H5Sclose(asid) < 0)
                 goto out;
 
         } /* H5T_REFERENCE */
 
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
         /* Close the attribute. */
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-
     }
 
     /* Close the image dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
+    H5Dclose(did);
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMget_palette_info
-*
-* Purpose: Get palette information
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: July 22, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMget_palette_info( hid_t loc_id,
-                            const char *image_name,
-                            int pal_number,
-                            hsize_t *pal_dims )
+ * Function: H5IMget_palette_info
+ *
+ * Purpose: Get palette information
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 22, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMget_palette_info(hid_t loc_id, const char *image_name, int pal_number, hsize_t *pal_dims)
 {
-    hid_t      did;
-    int        has_pal;
-    hid_t      atid=-1;
-    hid_t      aid;
-    hid_t      asid=-1;
-    hssize_t   n_refs;
-    hsize_t    dim_ref;
-    hobj_ref_t *refbuf;     /* buffer to read references */
-    hid_t      pal_id;
-    hid_t      pal_space_id;
-    hsize_t    pal_maxdims[2];
+    hid_t       did;
+    int         has_pal;
+    hid_t       atid = -1;
+    hid_t       aid;
+    hid_t       asid = -1;
+    hssize_t    n_refs;
+    hsize_t     dim_ref;
+    hobj_ref_t *refbuf; /* buffer to read references */
+    hid_t       pal_id;
+    hid_t       pal_space_id;
+    hsize_t     pal_maxdims[2];
 
     /* check the arguments */
-    if (image_name == NULL) 
-      return -1;
+    if (image_name == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
     has_pal = H5IM_find_palette(did);
 
-    if(has_pal ==  1)
-    {
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+    if (has_pal == 1) {
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if(H5Tget_class(atid) < 0)
+        if (H5Tget_class(atid) < 0)
             goto out;
 
         /* Get the reference(s) */
-        if((asid = H5Aget_space(aid)) < 0)
+        if ((asid = H5Aget_space(aid)) < 0)
             goto out;
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
         dim_ref = (hsize_t)n_refs;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
+        refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * (size_t)dim_ref);
 
-        if ( H5Aread( aid, atid, refbuf ) < 0)
+        if (H5Aread(aid, atid, refbuf) < 0)
             goto out;
 
         /* Get the actual palette */
-        if ( (pal_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
+        if ((pal_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
             goto out;
 
-        if ( (pal_space_id = H5Dget_space( pal_id )) < 0)
+        if ((pal_space_id = H5Dget_space(pal_id)) < 0)
             goto out;
 
-        if ( H5Sget_simple_extent_ndims( pal_space_id ) < 0)
+        if (H5Sget_simple_extent_ndims(pal_space_id) < 0)
             goto out;
 
-        if ( H5Sget_simple_extent_dims( pal_space_id, pal_dims, pal_maxdims ) < 0)
+        if (H5Sget_simple_extent_dims(pal_space_id, pal_dims, pal_maxdims) < 0)
             goto out;
 
         /* close */
-        if (H5Dclose(pal_id)<0)
+        if (H5Dclose(pal_id) < 0)
             goto out;
-        if ( H5Sclose( pal_space_id ) < 0)
+        if (H5Sclose(pal_space_id) < 0)
             goto out;
-        if ( H5Sclose( asid ) < 0)
+        if (H5Sclose(asid) < 0)
             goto out;
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-        HDfree( refbuf );
-
-
+        HDfree(refbuf);
     }
 
     /* Close the image dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
-    H5Sclose( asid );
-    H5Tclose( atid );
-    H5Aclose( aid );
+    H5Dclose(did);
+    H5Sclose(asid);
+    H5Tclose(atid);
+    H5Aclose(aid);
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5IMget_palette
-*
-* Purpose: Read palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: August 30, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMget_palette( hid_t loc_id,
-                       const char *image_name,
-                       int pal_number,
-                       unsigned char *pal_data )
+ * Function: H5IMget_palette
+ *
+ * Purpose: Read palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: August 30, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMget_palette(hid_t loc_id, const char *image_name, int pal_number, unsigned char *pal_data)
 {
-    hid_t      did;
-    int        has_pal;
-    hid_t      atid=-1;
-    hid_t      aid;
-    hid_t      asid=-1;
-    hssize_t   n_refs;
-    hsize_t    dim_ref;
-    hobj_ref_t *refbuf;     /* buffer to read references */
-    hid_t      pal_id;
+    hid_t       did;
+    int         has_pal;
+    hid_t       atid = -1;
+    hid_t       aid;
+    hid_t       asid = -1;
+    hssize_t    n_refs;
+    hsize_t     dim_ref;
+    hobj_ref_t *refbuf; /* buffer to read references */
+    hid_t       pal_id;
 
     /* check the arguments */
-    if (image_name == NULL) 
-      return -1;
-    if (pal_data == NULL) 
-      return -1;
-
+    if (image_name == NULL)
+        return -1;
+    if (pal_data == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "PALETTE" on the >>image<< dataset */
     has_pal = H5IM_find_palette(did);
 
-    if(has_pal ==  1 )
-    {
-        if((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
+    if (has_pal == 1) {
+        if ((aid = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-        if(H5Tget_class(atid) < 0)
+        if (H5Tget_class(atid) < 0)
             goto out;
 
         /* Get the reference(s) */
-        if((asid = H5Aget_space(aid)) < 0)
+        if ((asid = H5Aget_space(aid)) < 0)
             goto out;
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
         dim_ref = (hsize_t)n_refs;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
+        refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * (size_t)dim_ref);
 
-        if ( H5Aread( aid, atid, refbuf ) < 0)
+        if (H5Aread(aid, atid, refbuf) < 0)
             goto out;
 
         /* Get the palette id */
-        if ( (pal_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
+        if ((pal_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
             goto out;
 
         /* Read the palette dataset */
-        if ( H5Dread( pal_id, H5Dget_type(pal_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data ) < 0)
+        if (H5Dread(pal_id, H5Dget_type(pal_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
             goto out;
 
         /* close */
-        if (H5Dclose(pal_id)<0)
+        if (H5Dclose(pal_id) < 0)
             goto out;
-        if ( H5Sclose( asid ) < 0)
+        if (H5Sclose(asid) < 0)
             goto out;
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-        HDfree( refbuf );
+        HDfree(refbuf);
     }
 
     /* Close the image dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Dclose( did );
-    H5Sclose( asid );
-    H5Tclose( atid );
-    H5Aclose( aid );
+    H5Dclose(did);
+    H5Sclose(asid);
+    H5Tclose(atid);
+    H5Aclose(aid);
     return -1;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5IMis_image
-*
-* Purpose:
-*
-* Return: true, false, fail
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: August 30, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMis_image( hid_t loc_id,
-                    const char *dset_name )
+ * Function: H5IMis_image
+ *
+ * Purpose:
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: August 30, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMis_image(hid_t loc_id, const char *dset_name)
 {
-    hid_t      did;
-    int        has_class;
-    hid_t      atid;
-    hid_t      aid = -1;
-    char*      attr_data;    /* Name of attribute */
-    hsize_t    storage_size; /* Size of storage for attribute */
-    herr_t     ret;
+    hid_t   did;
+    int     has_class;
+    hid_t   atid;
+    hid_t   aid = -1;
+    char *  attr_data;    /* Name of attribute */
+    hsize_t storage_size; /* Size of storage for attribute */
+    herr_t  ret;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Assume initially fail condition */
     ret = -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "CLASS" on the dataset */
     has_class = H5LT_find_attribute(did, "CLASS");
 
-    if(has_class == 0)
-    {
+    if (has_class == 0) {
         H5Dclose(did);
         return 0;
     }
-    else if(has_class ==  1)
-    {
+    else if (has_class == 1) {
 
-        if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-	/* check to make sure attribute is a string */
-	if(H5T_STRING != H5Tget_class(atid))
-	    goto out;
+        /* check to make sure attribute is a string */
+        if (H5T_STRING != H5Tget_class(atid))
+            goto out;
 
-	/* check to make sure string is null-terminated */
-	if(H5T_STR_NULLTERM != H5Tget_strpad(atid))
-	    goto out;
+        /* check to make sure string is null-terminated */
+        if (H5T_STR_NULLTERM != H5Tget_strpad(atid))
+            goto out;
 
-	/* allocate buffer large enough to hold string */
-	if((storage_size = H5Aget_storage_size(aid)) == 0)
-	    goto out;
+        /* allocate buffer large enough to hold string */
+        if ((storage_size = H5Aget_storage_size(aid)) == 0)
+            goto out;
 
-	attr_data = (char*)HDmalloc( (size_t)storage_size * sizeof(char) + 1);
-	if(attr_data == NULL)
-	    goto out;
+        attr_data = (char *)HDmalloc((size_t)storage_size * sizeof(char) + 1);
+        if (attr_data == NULL)
+            goto out;
 
-        if(H5Aread(aid, atid, attr_data) < 0)
+        if (H5Aread(aid, atid, attr_data) < 0)
             goto out;
 
-        if(HDstrncmp(attr_data, IMAGE_CLASS, MIN(HDstrlen(IMAGE_CLASS),HDstrlen(attr_data))) == 0)
+        if (HDstrncmp(attr_data, IMAGE_CLASS, MIN(HDstrlen(IMAGE_CLASS), HDstrlen(attr_data))) == 0)
             ret = 1;
         else
             ret = 0;
 
-	HDfree(attr_data);
+        HDfree(attr_data);
 
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-
     }
 
     /* Close the dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return ret;
 
 out:
-    H5Dclose( did );
+    H5Dclose(did);
     return -1;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5IMis_palette
-*
-* Purpose:
-*
-* Return: true, false, fail
-*
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
-*
-* Date: August 30, 2001
-*
-* Comments:
-*  based on HDF5 Image and Palette Specification
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5IMis_palette( hid_t loc_id,
-                      const char *dset_name )
+ * Function: H5IMis_palette
+ *
+ * Purpose:
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ *
+ * Date: August 30, 2001
+ *
+ * Comments:
+ *  based on HDF5 Image and Palette Specification
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+herr_t
+H5IMis_palette(hid_t loc_id, const char *dset_name)
 {
-    hid_t      did;
-    int        has_class;
-    hid_t      atid;
-    hid_t      aid = -1;
-    char*      attr_data;    /* Name of attribute */
-    hsize_t    storage_size; /* Size of storage for attribute */
-    herr_t     ret;
+    hid_t   did;
+    int     has_class;
+    hid_t   atid;
+    hid_t   aid = -1;
+    char *  attr_data;    /* Name of attribute */
+    hsize_t storage_size; /* Size of storage for attribute */
+    herr_t  ret;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Assume initially fail condition */
     ret = -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Try to find the attribute "CLASS" on the dataset */
     has_class = H5LT_find_attribute(did, "CLASS");
 
-    if(has_class ==  0)
-    {
-        H5Dclose( did );
+    if (has_class == 0) {
+        H5Dclose(did);
         return 0;
     }
-    else if(has_class ==  1)
-    {
+    else if (has_class == 1) {
 
-        if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+        if ((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
             goto out;
 
-        if((atid = H5Aget_type(aid)) < 0)
+        if ((atid = H5Aget_type(aid)) < 0)
             goto out;
 
-	/* check to make sure attribute is a string */
-	if(H5T_STRING != H5Tget_class(atid))
-	    goto out;
+        /* check to make sure attribute is a string */
+        if (H5T_STRING != H5Tget_class(atid))
+            goto out;
 
-	/* check to make sure string is null-terminated */
-	if(H5T_STR_NULLTERM != H5Tget_strpad(atid))
-	    goto out;
+        /* check to make sure string is null-terminated */
+        if (H5T_STR_NULLTERM != H5Tget_strpad(atid))
+            goto out;
 
-	/* allocate buffer large enough to hold string */
-	if((storage_size = H5Aget_storage_size(aid)) == 0)
-	    goto out;
+        /* allocate buffer large enough to hold string */
+        if ((storage_size = H5Aget_storage_size(aid)) == 0)
+            goto out;
 
-	attr_data = (char*)HDmalloc( (size_t)storage_size * sizeof(char) + 1);
-	if(attr_data == NULL)
-	    goto out;
+        attr_data = (char *)HDmalloc((size_t)storage_size * sizeof(char) + 1);
+        if (attr_data == NULL)
+            goto out;
 
-        if(H5Aread(aid, atid, attr_data) < 0)
+        if (H5Aread(aid, atid, attr_data) < 0)
             goto out;
 
-        if(HDstrncmp(attr_data, PALETTE_CLASS, MIN(HDstrlen(PALETTE_CLASS),HDstrlen(attr_data))) == 0)
+        if (HDstrncmp(attr_data, PALETTE_CLASS, MIN(HDstrlen(PALETTE_CLASS), HDstrlen(attr_data))) == 0)
             ret = 1;
         else
             ret = 0;
 
-	HDfree(attr_data);
+        HDfree(attr_data);
 
-        if ( H5Tclose( atid ) < 0)
+        if (H5Tclose(atid) < 0)
             goto out;
 
-        if ( H5Aclose( aid ) < 0)
+        if (H5Aclose(aid) < 0)
             goto out;
-
     }
 
     /* Close the dataset. */
-    if ( H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     return ret;
 
 out:
-    H5Dclose( did );
+    H5Dclose(did);
     return -1;
-
 }
-
diff --git a/hl/src/H5IMprivate.h b/hl/src/H5IMprivate.h
index 6776c9d..0e47509 100644
--- a/hl/src/H5IMprivate.h
+++ b/hl/src/H5IMprivate.h
@@ -20,20 +20,16 @@
 /* public IM prototypes			*/
 #include "H5IMpublic.h"
 
-
 #define IMAGE_CLASS   "IMAGE"
 #define PALETTE_CLASS "PALETTE"
 #define IMAGE_VERSION "1.2"
-#define IMAGE8_RANK    2
-#define IMAGE24_RANK   3
-
+#define IMAGE8_RANK   2
+#define IMAGE24_RANK  3
 
 /*-------------------------------------------------------------------------
  * Private functions
  *-------------------------------------------------------------------------
  */
-H5_HLDLL herr_t  H5IM_find_palette(hid_t loc_id );
-
+H5_HLDLL herr_t H5IM_find_palette(hid_t loc_id);
 
 #endif
-
diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h
index a95e439..745eade 100644
--- a/hl/src/H5IMpublic.h
+++ b/hl/src/H5IMpublic.h
@@ -14,69 +14,38 @@
 #ifndef _H5IMpublic_H
 #define _H5IMpublic_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+H5_HLDLL herr_t H5IMmake_image_8bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                                    const unsigned char *buffer);
+
+H5_HLDLL herr_t H5IMmake_image_24bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                                     const char *interlace, const unsigned char *buffer);
+
+H5_HLDLL herr_t H5IMget_image_info(hid_t loc_id, const char *dset_name, hsize_t *width, hsize_t *height,
+                                   hsize_t *planes, char *interlace, hssize_t *npals);
+
+H5_HLDLL herr_t H5IMread_image(hid_t loc_id, const char *dset_name, unsigned char *buffer);
+
+H5_HLDLL herr_t H5IMmake_palette(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims,
+                                 const unsigned char *pal_data);
+
+H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const char *pal_name);
+
+H5_HLDLL herr_t H5IMunlink_palette(hid_t loc_id, const char *image_name, const char *pal_name);
+
+H5_HLDLL herr_t H5IMget_npalettes(hid_t loc_id, const char *image_name, hssize_t *npals);
+
+H5_HLDLL herr_t H5IMget_palette_info(hid_t loc_id, const char *image_name, int pal_number, hsize_t *pal_dims);
+
+H5_HLDLL herr_t H5IMget_palette(hid_t loc_id, const char *image_name, int pal_number,
+                                unsigned char *pal_data);
+
+H5_HLDLL herr_t H5IMis_image(hid_t loc_id, const char *dset_name);
 
-H5_HLDLL herr_t  H5IMmake_image_8bit( hid_t loc_id,
-                            const char *dset_name,
-                            hsize_t width,
-                            hsize_t height,
-                            const unsigned char *buffer );
-
-H5_HLDLL herr_t  H5IMmake_image_24bit( hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t width,
-                             hsize_t height,
-                             const char *interlace,
-                             const unsigned char *buffer );
-
-H5_HLDLL herr_t  H5IMget_image_info( hid_t loc_id,
-                     const char *dset_name,
-                     hsize_t *width,
-                     hsize_t *height,
-                     hsize_t *planes,
-                     char    *interlace,
-                     hssize_t *npals );
-
-H5_HLDLL herr_t  H5IMread_image( hid_t loc_id,
-                       const char *dset_name,
-                       unsigned char *buffer );
-
-H5_HLDLL herr_t  H5IMmake_palette( hid_t loc_id,
-                         const char *pal_name,
-                         const hsize_t *pal_dims,
-                         const unsigned char *pal_data );
-
-H5_HLDLL herr_t  H5IMlink_palette( hid_t loc_id,
-                        const char *image_name,
-                        const char *pal_name );
-
-H5_HLDLL herr_t  H5IMunlink_palette( hid_t loc_id,
-                           const char *image_name,
-                           const char *pal_name );
-
-H5_HLDLL herr_t  H5IMget_npalettes( hid_t loc_id,
-                          const char *image_name,
-                          hssize_t *npals );
-
-H5_HLDLL herr_t  H5IMget_palette_info( hid_t loc_id,
-                        const char *image_name,
-                        int pal_number,
-                        hsize_t *pal_dims );
-
-H5_HLDLL herr_t  H5IMget_palette( hid_t loc_id,
-                        const char *image_name,
-                        int pal_number,
-                        unsigned char *pal_data );
-
-H5_HLDLL herr_t  H5IMis_image( hid_t loc_id,
-                     const char *dset_name );
-
-H5_HLDLL herr_t  H5IMis_palette( hid_t loc_id,
-                     const char *dset_name );
+H5_HLDLL herr_t H5IMis_palette(hid_t loc_id, const char *dset_name);
 
 #ifdef __cplusplus
 }
diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c
index 1669a30..7e8dc30 100644
--- a/hl/src/H5LD.c
+++ b/hl/src/H5LD.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string.h>
 #include <stdlib.h>
@@ -26,10 +26,9 @@
 static herr_t H5LD_construct_info(H5LD_memb_t *memb, hid_t par_tid);
 static herr_t H5LD_get_dset_dims(hid_t did, hsize_t *cur_dims);
 static size_t H5LD_get_dset_type_size(hid_t did, const char *fields);
-static herr_t H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims,
-    const hsize_t *cur_dims, const char *fields, void *buf);
+static herr_t H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims,
+                                  const char *fields, void *buf);
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_clean_vector
  *
@@ -47,30 +46,29 @@ static herr_t H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims,
 void
 H5LD_clean_vector(H5LD_memb_t *listv[])
 {
-    unsigned n;		/* Local index variable */
+    unsigned n; /* Local index variable */
 
     HDassert(listv);
 
     /* Go through info for each field stored in listv[] */
-    for(n = 0; listv[n] != NULL; n++) {
-	if(listv[n]->names) {
-	    HDfree(listv[n]->names);
-	    listv[n]->names = NULL;
-	} /* end if */
-
-	/* Close the type id of the last member in the field */
-	if(!(listv[n]->last_tid < 0)) {
-	    H5Tclose(listv[n]->last_tid);
-	    listv[n]->last_tid = -1;
-	} /* end if */
-
-	/* Free the H5LD_memb_t structure for the field */
-	HDfree(listv[n]);
-	listv[n] = NULL;
+    for (n = 0; listv[n] != NULL; n++) {
+        if (listv[n]->names) {
+            HDfree(listv[n]->names);
+            listv[n]->names = NULL;
+        } /* end if */
+
+        /* Close the type id of the last member in the field */
+        if (!(listv[n]->last_tid < 0)) {
+            H5Tclose(listv[n]->last_tid);
+            listv[n]->last_tid = -1;
+        } /* end if */
+
+        /* Free the H5LD_memb_t structure for the field */
+        HDfree(listv[n]);
+        listv[n] = NULL;
     } /* end for */
 } /* H5LD_clean_vector() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_construct_info()
  *
@@ -89,27 +87,27 @@ H5LD_clean_vector(H5LD_memb_t *listv[])
 static herr_t
 H5LD_construct_info(H5LD_memb_t *memb, hid_t par_tid)
 {
-    hid_t tmp_tid = -1;	/* Dataset type id */
-    unsigned i;		/* Local index variable */
-    herr_t ret_value = FAIL;	/* Return value */
+    hid_t    tmp_tid = -1;     /* Dataset type id */
+    unsigned i;                /* Local index variable */
+    herr_t   ret_value = FAIL; /* Return value */
 
     /* Make a copy of the incoming datatype */
     tmp_tid = H5Tcopy(par_tid);
 
     /* Validate all the members in a field */
-    for(i = 0; memb->names[i] != NULL; i++) {
-        hid_t memb_tid;         /* Type id for a member in a field */
-        int idx;		/* Index # of a member in a compound datatype */
+    for (i = 0; memb->names[i] != NULL; i++) {
+        hid_t memb_tid; /* Type id for a member in a field */
+        int   idx;      /* Index # of a member in a compound datatype */
 
         /* Get the member index and member type id */
-        if((idx = H5Tget_member_index(tmp_tid, memb->names[i])) < 0)
+        if ((idx = H5Tget_member_index(tmp_tid, memb->names[i])) < 0)
             goto done;
-        if((memb_tid = H5Tget_member_type(tmp_tid, (unsigned)idx)) < 0)
+        if ((memb_tid = H5Tget_member_type(tmp_tid, (unsigned)idx)) < 0)
             goto done;
 
-	/* Sum up the offset of all the members in the field */
+        /* Sum up the offset of all the members in the field */
         memb->tot_offset += H5Tget_member_offset(tmp_tid, (unsigned)idx);
-        if(H5Tclose(tmp_tid) < 0)
+        if (H5Tclose(tmp_tid) < 0)
             goto done;
         tmp_tid = memb_tid;
     } /* end for */
@@ -125,13 +123,12 @@ H5LD_construct_info(H5LD_memb_t *memb, hid_t par_tid)
 
 done:
     H5E_BEGIN_TRY
-	H5Tclose(tmp_tid);
+    H5Tclose(tmp_tid);
     H5E_END_TRY
 
-    return(ret_value);
+    return (ret_value);
 } /* H5LD_construct_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_construct_vector
  *
@@ -157,122 +154,124 @@ done:
  *
  * Programmer:  Vailin Choi; Aug 2010
  *
-*-------------------------------------------------------------------------
-*/
+ *-------------------------------------------------------------------------
+ */
 int
-H5LD_construct_vector(char *fields, H5LD_memb_t *listv[]/*OUT*/, hid_t par_tid)
+H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
 {
-    int nfields;	                /* The # of comma-separated fields in "fields" */
-    hbool_t end_of_fields = FALSE;	/* end of "fields" */
-    char *fields_ptr;	                /* Pointer to "fields" */
-    int ret_value = FAIL;		/* Return value */
+    int     nfields;               /* The # of comma-separated fields in "fields" */
+    hbool_t end_of_fields = FALSE; /* end of "fields" */
+    char *  fields_ptr;            /* Pointer to "fields" */
+    int     ret_value = FAIL;      /* Return value */
 
     HDassert(listv);
     HDassert(fields);
 
     fields_ptr = fields;
-    nfields = 0;
+    nfields    = 0;
 
     /* Process till end of "fields" */
-    while(!end_of_fields) {
-	H5LD_memb_t *memb = NULL; 	/* Pointer to structure for storing a field's info */
-        char *cur;	                /* Pointer to a member in a field */
-	size_t len;			/* Estimated # of members in a field */
-	hbool_t gotcomma = FALSE;	/* A comma encountered */
-	hbool_t gotmember = FALSE;	/* Getting member in a field */
-        hbool_t valid = TRUE;           /* Whether a field being processed is valid or not */
-	int j = 0;			/* The # of members in a field */
-
-	len = (HDstrlen(fields_ptr) / 2) + 2;
-
-	/* Allocate memory for an H5LD_memb_t for storing a field's info */
-	if(NULL == (memb = (H5LD_memb_t *)HDcalloc((size_t)1, sizeof(H5LD_memb_t))))
-	    goto done;
-
-	/* Allocate memory for an array of pointers to member names */
-	if(NULL == (memb->names = (char **)HDcalloc(len, sizeof(char *))))
-	    goto done;
-
-	memb->names[j] = fields_ptr;
-	memb->last_tid = -1;
-	cur = fields_ptr;
-
-	/* Continue processing till: not valid or comma encountered or "fields" ended */
-	while(valid && !gotcomma && !end_of_fields) {
-	    switch(*fields_ptr) {
-                case '\0':	/* end of list */
-                    if(gotmember) { /* getting something and end of "fields" */
-                        *cur++ = '\0';;
+    while (!end_of_fields) {
+        H5LD_memb_t *memb = NULL;       /* Pointer to structure for storing a field's info */
+        char *       cur;               /* Pointer to a member in a field */
+        size_t       len;               /* Estimated # of members in a field */
+        hbool_t      gotcomma  = FALSE; /* A comma encountered */
+        hbool_t      gotmember = FALSE; /* Getting member in a field */
+        hbool_t      valid     = TRUE;  /* Whether a field being processed is valid or not */
+        int          j         = 0;     /* The # of members in a field */
+
+        len = (HDstrlen(fields_ptr) / 2) + 2;
+
+        /* Allocate memory for an H5LD_memb_t for storing a field's info */
+        if (NULL == (memb = (H5LD_memb_t *)HDcalloc((size_t)1, sizeof(H5LD_memb_t))))
+            goto done;
+
+        /* Allocate memory for an array of pointers to member names */
+        if (NULL == (memb->names = (char **)HDcalloc(len, sizeof(char *))))
+            goto done;
+
+        memb->names[j] = fields_ptr;
+        memb->last_tid = -1;
+        cur            = fields_ptr;
+
+        /* Continue processing till: not valid or comma encountered or "fields" ended */
+        while (valid && !gotcomma && !end_of_fields) {
+            switch (*fields_ptr) {
+                case '\0':           /* end of list */
+                    if (gotmember) { /* getting something and end of "fields" */
+                        *cur++ = '\0';
+                        ;
                         memb->names[++j] = NULL;
-                    } /* end if */
+                    }    /* end if */
                     else /* getting nothing but end of list */
                         valid = FALSE;
                     end_of_fields = TRUE;
                     break;
-	
-                case '\\': /* escape character */
+
+                case '\\':        /* escape character */
                     ++fields_ptr; /* skip it */
-                    if(*fields_ptr == '\0')
+                    if (*fields_ptr == '\0')
                         valid = FALSE;
                     else {
-                        *cur++ = *fields_ptr++;
+                        *cur++    = *fields_ptr++;
                         gotmember = TRUE;
                     } /* end else */
                     break;
 
                 case '.': /* nested field separator */
-                    *fields_ptr++ = *cur++ = '\0';;
-                    if(gotmember) {
+                    *fields_ptr++ = *cur++ = '\0';
+                    ;
+                    if (gotmember) {
                         memb->names[++j] = cur;
-                        gotmember = FALSE;
+                        gotmember        = FALSE;
                     } /* end if */
                     else
                         valid = FALSE;
                     break;
 
                 case ',': /* field separator */
-                    *fields_ptr++ = *cur++ = '\0';;
-                    if(gotmember) {
+                    *fields_ptr++ = *cur++ = '\0';
+                    ;
+                    if (gotmember) {
                         memb->names[++j] = NULL;
-                        gotmember = FALSE;
+                        gotmember        = FALSE;
                     } /* end if */
                     else
                         valid = FALSE;
                     gotcomma = TRUE;
                     break;
 
-                default: 
-                    *cur++ = *fields_ptr++;
+                default:
+                    *cur++    = *fields_ptr++;
                     gotmember = TRUE;
                     break;
-	    } /* end switch */
-	} /* while (valid && !gotcomma && !end_of_fields) */
-
-	/* If valid, put into listv and continue processing further info */
-	if(valid) {
-	    listv[nfields++] = memb;
-	    if(H5LD_construct_info(memb, par_tid) < 0)
-		goto done;
-	} /* end if */
+            } /* end switch */
+        }     /* while (valid && !gotcomma && !end_of_fields) */
+
+        /* If valid, put into listv and continue processing further info */
+        if (valid) {
+            listv[nfields++] = memb;
+            if (H5LD_construct_info(memb, par_tid) < 0)
+                goto done;
+        } /* end if */
         else {
-	    if(memb)
+            if (memb)
                 HDfree(memb);
-	    goto done;
-	} /* end else */
-    } /* while !end_of_fields */
+            goto done;
+        } /* end else */
+    }     /* while !end_of_fields */
 
     /* Indicate success */
     ret_value = nfields;
 
 done:
     listv[nfields] = NULL;
-    if(ret_value == FAIL)
-	H5LD_clean_vector(listv);
+    if (ret_value == FAIL)
+        H5LD_clean_vector(listv);
 
-    return(ret_value);
-}  /* H5LD_construct_vector() */
+    return (ret_value);
+} /* H5LD_construct_vector() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_get_dset_dims
  *
@@ -284,38 +283,39 @@ done:
  *
  * Programmer:  Vailin Choi; March 2010
  *
-*-------------------------------------------------------------------------
-*/
+ *-------------------------------------------------------------------------
+ */
 static herr_t
 H5LD_get_dset_dims(hid_t did, hsize_t *cur_dims)
 {
-    hid_t sid = -1;             /* Dataspace ID */
-    herr_t ret_value = FAIL;    /* Return Value */
+    hid_t  sid       = -1;   /* Dataspace ID */
+    herr_t ret_value = FAIL; /* Return Value */
 
     /* Verify parameter */
-    if(cur_dims == NULL)
+    if (cur_dims == NULL)
         goto done;
 
     /* Get the dataset's dataspace */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto done;
 
     /* Get the current dimension size */
-    if(H5Sget_simple_extent_dims(sid, cur_dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, cur_dims, NULL) < 0)
         goto done;
 
     /* Indicate success */
     ret_value = SUCCEED;
 
 done:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
-    return(ret_value);
+    return (ret_value);
 } /* H5LD_get_dset_dims() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_get_dset_type_size
  *
@@ -334,73 +334,72 @@ done:
 static size_t
 H5LD_get_dset_type_size(hid_t did, const char *fields)
 {
-    hid_t dset_tid = -1;	/* Dataset's type identifier */
-    hid_t tid = -1;		/* Native Type identifier */
-    H5LD_memb_t **listv = NULL;	/* Vector for storing information in "fields" */
-    char *dup_fields = NULL;	/* A copy of "fields" */
-    size_t ret_value = 0;       /* Return value */
+    hid_t         dset_tid   = -1;   /* Dataset's type identifier */
+    hid_t         tid        = -1;   /* Native Type identifier */
+    H5LD_memb_t **listv      = NULL; /* Vector for storing information in "fields" */
+    char *        dup_fields = NULL; /* A copy of "fields" */
+    size_t        ret_value  = 0;    /* Return value */
 
     /* Get the datatype of the dataset */
-    if((dset_tid = H5Dget_type(did)) < 0)
+    if ((dset_tid = H5Dget_type(did)) < 0)
         goto done;
-    if((tid = H5Tget_native_type(dset_tid, H5T_DIR_DEFAULT)) < 0)
+    if ((tid = H5Tget_native_type(dset_tid, H5T_DIR_DEFAULT)) < 0)
         goto done;
 
-    if(fields == NULL) /* If no "fields" is specified */
+    if (fields == NULL) /* If no "fields" is specified */
         ret_value = H5Tget_size(tid);
-    else { /* "fields" are specified */
-        size_t len;			/* Estimate the number of comma-separated fields in "fields" */
-        size_t tot = 0;			/* Data type size of all the fields in "fields" */
-        int n = 0, num = 0;		/* Local index variables */
+    else {                     /* "fields" are specified */
+        size_t len;            /* Estimate the number of comma-separated fields in "fields" */
+        size_t tot = 0;        /* Data type size of all the fields in "fields" */
+        int    n = 0, num = 0; /* Local index variables */
 
         HDassert(fields && *fields);
 
         /* Should be a compound datatype if "fields" exists */
-        if(H5Tget_class(dset_tid) != H5T_COMPOUND)
+        if (H5Tget_class(dset_tid) != H5T_COMPOUND)
             goto done;
 
-	/* Get a copy of "fields" */
-        if(NULL == (dup_fields = HDstrdup(fields)))
+        /* Get a copy of "fields" */
+        if (NULL == (dup_fields = HDstrdup(fields)))
             goto done;
 
-	/* Allocate memory for a list of H5LD_memb_t pointers to store "fields" info */
-	len = (HDstrlen(fields) / 2) + 2;
-	if(NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))))
+        /* Allocate memory for a list of H5LD_memb_t pointers to store "fields" info */
+        len = (HDstrlen(fields) / 2) + 2;
+        if (NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))))
             goto done;
 
-	/* Process and store info for "fields" */
-	if((num = H5LD_construct_vector(dup_fields, listv/*OUT*/, tid)) < 0)
+        /* Process and store info for "fields" */
+        if ((num = H5LD_construct_vector(dup_fields, listv /*OUT*/, tid)) < 0)
             goto done;
 
-	/* Sum up the size of all the datatypes in "fields" */
-	for(n = 0; n < num; n++)
-	    tot += listv[n]->last_tsize;
+        /* Sum up the size of all the datatypes in "fields" */
+        for (n = 0; n < num; n++)
+            tot += listv[n]->last_tsize;
 
-	/* Clean up the vector of H5LD_memb_t structures */
-	H5LD_clean_vector(listv);
+        /* Clean up the vector of H5LD_memb_t structures */
+        H5LD_clean_vector(listv);
 
-	/* Return the total size */
-	ret_value = tot;
+        /* Return the total size */
+        ret_value = tot;
     } /* end else */
 
 done:
     H5E_BEGIN_TRY
-        H5Tclose(tid);
-        H5Tclose(dset_tid);
+    H5Tclose(tid);
+    H5Tclose(dset_tid);
     H5E_END_TRY
 
     /* Free the array of H5LD_memb_t pointers */
-    if(listv)
+    if (listv)
         HDfree(listv);
 
     /* Free memory */
-    if(dup_fields)
+    if (dup_fields)
         HDfree(dup_fields);
 
-    return(ret_value);
+    return (ret_value);
 } /* H5LD_get_dset_type_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_get_dset_elmts
  *
@@ -414,136 +413,136 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims,
-    const char *fields, void *buf)
+H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims, const char *fields,
+                    void *buf)
 {
-    hid_t dtid = -1, tid = -1;	/* Dataset type id */
-    hid_t sid = -1, mid = -1;	/* Dataspace and memory space id */
-    hssize_t snum_elmts;        /* Number of dataset elements in the selection (signed) */
-    hsize_t num_elmts;          /* Number of dataset elements in the selection */
-    hsize_t start[H5S_MAX_RANK];/* Starting offset */
-    hsize_t count[H5S_MAX_RANK];/* ??offset */
-    H5LD_memb_t **listv = NULL;	/* Vector for storing information in "fields" */
-    char *dup_fields = NULL;	/* A copy of "fields" */
-    char *sav_buf = NULL;	/* Saved pointer temporary buffer */
-    unsigned ctr;	        /* Counter for # of curr_dims > prev_dims */
-    int ndims;		        /* Number of dimensions for the dataset */
-    int i; 		        /* Local index variable */
-    herr_t ret_value = FAIL;	/* Return value */
+    hid_t         dtid = -1, tid = -1; /* Dataset type id */
+    hid_t         sid = -1, mid = -1;  /* Dataspace and memory space id */
+    hssize_t      snum_elmts;          /* Number of dataset elements in the selection (signed) */
+    hsize_t       num_elmts;           /* Number of dataset elements in the selection */
+    hsize_t       start[H5S_MAX_RANK]; /* Starting offset */
+    hsize_t       count[H5S_MAX_RANK]; /* ??offset */
+    H5LD_memb_t **listv      = NULL;   /* Vector for storing information in "fields" */
+    char *        dup_fields = NULL;   /* A copy of "fields" */
+    char *        sav_buf    = NULL;   /* Saved pointer temporary buffer */
+    unsigned      ctr;                 /* Counter for # of curr_dims > prev_dims */
+    int           ndims;               /* Number of dimensions for the dataset */
+    int           i;                   /* Local index variable */
+    herr_t        ret_value = FAIL;    /* Return value */
 
     /* Verify parameters */
-    if(prev_dims == NULL || cur_dims == NULL || buf == NULL)
-	goto done;
+    if (prev_dims == NULL || cur_dims == NULL || buf == NULL)
+        goto done;
 
     /* Get dataset's dataspace */
-    if((sid = H5Dget_space(did)) < 0)
-	goto done;
-    
+    if ((sid = H5Dget_space(did)) < 0)
+        goto done;
+
     /* Get the number of dimensions */
-    if((ndims = H5Sget_simple_extent_ndims(sid)) < 0)
-	goto done;
+    if ((ndims = H5Sget_simple_extent_ndims(sid)) < 0)
+        goto done;
 
     /* Verify that cur_dims must have one dimension whose size is greater than prev_dims */
     HDmemset(start, 0, sizeof start);
     HDmemset(count, 0, sizeof count);
     ctr = 0;
-    for(i = 0; i < ndims; i++)
-	if(cur_dims[i] > prev_dims[i]) {
-	    ++ctr;
-	    count[i] = cur_dims[i] - prev_dims[i];
-	    start[i] = prev_dims[i];
-	} /* end if */
+    for (i = 0; i < ndims; i++)
+        if (cur_dims[i] > prev_dims[i]) {
+            ++ctr;
+            count[i] = cur_dims[i] - prev_dims[i];
+            start[i] = prev_dims[i];
+        }      /* end if */
         else { /* < or = */
-	    start[i] = 0;
-	    count[i] = MIN(prev_dims[i], cur_dims[i]);
-	} /* end else */
-    if(!ctr)
-	goto done;
-
-    if(ctr == 1) { /* changes for only one dimension */
-	/* Make the selection in the dataset based on "cur_dims" and "prev_dims" */
-	if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-	    goto done;
-    } /* end if */
+            start[i] = 0;
+            count[i] = MIN(prev_dims[i], cur_dims[i]);
+        } /* end else */
+    if (!ctr)
+        goto done;
+
+    if (ctr == 1) { /* changes for only one dimension */
+        /* Make the selection in the dataset based on "cur_dims" and "prev_dims" */
+        if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
+            goto done;
+    }      /* end if */
     else { /* changes for more than one dimensions */
-	HDmemset(start, 0, sizeof start);
+        HDmemset(start, 0, sizeof start);
 
-	/* Make the selection in the dataset based on "cur_dims" and "prev_dims" */
-	if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, cur_dims, NULL) < 0)
-	    goto done;
-	if(H5Sselect_hyperslab(sid, H5S_SELECT_NOTB, start, NULL, prev_dims, NULL) < 0)
-	    goto done;
+        /* Make the selection in the dataset based on "cur_dims" and "prev_dims" */
+        if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, cur_dims, NULL) < 0)
+            goto done;
+        if (H5Sselect_hyperslab(sid, H5S_SELECT_NOTB, start, NULL, prev_dims, NULL) < 0)
+            goto done;
     } /* end else */
 
     /* Get the number of elements in the selection */
-    if(0 == (snum_elmts = H5Sget_select_npoints(sid)))
+    if (0 == (snum_elmts = H5Sget_select_npoints(sid)))
         goto done;
     num_elmts = (hsize_t)snum_elmts;
 
     /* Create the memory space for the selection */
-    if((mid = H5Screate_simple(1, &num_elmts, NULL)) < 0)
-	goto done;
+    if ((mid = H5Screate_simple(1, &num_elmts, NULL)) < 0)
+        goto done;
 
     /* Get the native datatype size */
-    if((dtid = H5Dget_type(did)) < 0)
+    if ((dtid = H5Dget_type(did)) < 0)
         goto done;
-    if((tid = H5Tget_native_type(dtid, H5T_DIR_DEFAULT)) < 0)
+    if ((tid = H5Tget_native_type(dtid, H5T_DIR_DEFAULT)) < 0)
         goto done;
 
-    if(fields == NULL) { /* nothing in "fields" */
-	/* Read and store all the elements in "buf" */
-	if(H5Dread(did, tid, mid, sid, H5P_DEFAULT, buf) < 0)
-	    goto done;
-    } /* end if */
-    else { /* "fields" is specified */
-	unsigned char *buf_p = (unsigned char *)buf;   /* Pointer to the destination buffer */
-        char *tmp_buf;          /* Temporary buffer for data read */
-        size_t tot_tsize;	/* Total datatype size */
-        size_t len;		/* Estimate the number of comma-separated fields in "fields" */
-
-	/* should be a compound datatype if "fields" exists */
-	if(H5Tget_class(tid) != H5T_COMPOUND)
-	    goto done;
-
-	/* Get the total size of the dataset's datatypes */
-	if(0 == (tot_tsize = H5LD_get_dset_type_size(did, NULL)))
-	    goto done;
-	
-	/* Allocate memory for reading in the elements in the dataset selection */
-	if(NULL == (sav_buf = tmp_buf = (char *)HDcalloc((size_t)num_elmts, tot_tsize)))
-	    goto done;
-
-	/* Read the dataset elements in the selection */
-	if(H5Dread(did, tid, mid, sid, H5P_DEFAULT, tmp_buf) < 0)
-	    goto done;
-
-	/* Make a copy of "fields" */
-	if(NULL == (dup_fields = HDstrdup(fields)))
-	    goto done;
-
-	/* Allocate memory for the vector of H5LD_memb_t pointers */
-	len = (HDstrlen(fields) / 2) + 2;
-        if(NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))))
-	    goto done;
-
-	/* Process and store information for "fields" */
-        if(H5LD_construct_vector(dup_fields, listv, tid) < 0)
+    if (fields == NULL) { /* nothing in "fields" */
+        /* Read and store all the elements in "buf" */
+        if (H5Dread(did, tid, mid, sid, H5P_DEFAULT, buf) < 0)
+            goto done;
+    }                                                /* end if */
+    else {                                           /* "fields" is specified */
+        unsigned char *buf_p = (unsigned char *)buf; /* Pointer to the destination buffer */
+        char *         tmp_buf;                      /* Temporary buffer for data read */
+        size_t         tot_tsize;                    /* Total datatype size */
+        size_t         len; /* Estimate the number of comma-separated fields in "fields" */
+
+        /* should be a compound datatype if "fields" exists */
+        if (H5Tget_class(tid) != H5T_COMPOUND)
+            goto done;
+
+        /* Get the total size of the dataset's datatypes */
+        if (0 == (tot_tsize = H5LD_get_dset_type_size(did, NULL)))
+            goto done;
+
+        /* Allocate memory for reading in the elements in the dataset selection */
+        if (NULL == (sav_buf = tmp_buf = (char *)HDcalloc((size_t)num_elmts, tot_tsize)))
+            goto done;
+
+        /* Read the dataset elements in the selection */
+        if (H5Dread(did, tid, mid, sid, H5P_DEFAULT, tmp_buf) < 0)
             goto done;
 
-	/* Copy data for each dataset element in the selection */
-	for(i = 0; i < (int)num_elmts; i++) {
-            int j; 		/* Local index variable */
+        /* Make a copy of "fields" */
+        if (NULL == (dup_fields = HDstrdup(fields)))
+            goto done;
 
-	    /* Copy data for "fields" to the input buffer */
-	    for(j = 0; listv[j] != NULL; j++) {
-		HDmemcpy(buf_p, tmp_buf + listv[j]->tot_offset, listv[j]->last_tsize);
-		buf_p += listv[j]->last_tsize;
-	    } /* end for */
-	    tmp_buf += tot_tsize;
-	} /* end for */
+        /* Allocate memory for the vector of H5LD_memb_t pointers */
+        len = (HDstrlen(fields) / 2) + 2;
+        if (NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))))
+            goto done;
+
+        /* Process and store information for "fields" */
+        if (H5LD_construct_vector(dup_fields, listv, tid) < 0)
+            goto done;
 
-	/* Clean up the vector of H5LD_memb_t structures */
-	H5LD_clean_vector(listv);
+        /* Copy data for each dataset element in the selection */
+        for (i = 0; i < (int)num_elmts; i++) {
+            int j; /* Local index variable */
+
+            /* Copy data for "fields" to the input buffer */
+            for (j = 0; listv[j] != NULL; j++) {
+                HDmemcpy(buf_p, tmp_buf + listv[j]->tot_offset, listv[j]->last_tsize);
+                buf_p += listv[j]->last_tsize;
+            } /* end for */
+            tmp_buf += tot_tsize;
+        } /* end for */
+
+        /* Clean up the vector of H5LD_memb_t structures */
+        H5LD_clean_vector(listv);
     } /* end else */
 
     /* Indicate success */
@@ -551,23 +550,23 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims
 
 done:
     H5E_BEGIN_TRY
-	H5Tclose(dtid);
-	H5Tclose(tid);
-	H5Sclose(sid);
-	H5Sclose(mid);
+    H5Tclose(dtid);
+    H5Tclose(tid);
+    H5Sclose(sid);
+    H5Sclose(mid);
     H5E_END_TRY
 
     /* Free the array of H5LD_memb_t pointers */
-    if(listv)
+    if (listv)
         HDfree(listv);
 
     /* Free memory */
-    if(dup_fields)
+    if (dup_fields)
         HDfree(dup_fields);
-    if(sav_buf)
+    if (sav_buf)
         HDfree(sav_buf);
 
-    return(ret_value);
+    return (ret_value);
 } /* H5LD_get_dset_elmts() */
 
 /*-------------------------------------------------------------------------
@@ -577,7 +576,6 @@ done:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LDget_dset_dims
  *
@@ -593,11 +591,9 @@ done:
 herr_t
 H5LDget_dset_dims(hid_t did, hsize_t *cur_dims)
 {
-    return(H5LD_get_dset_dims(did, cur_dims));
+    return (H5LD_get_dset_dims(did, cur_dims));
 } /* H5LDget_dset_dims() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function: H5LDget_dset_type_size
  *
@@ -613,10 +609,9 @@ H5LDget_dset_dims(hid_t did, hsize_t *cur_dims)
 size_t
 H5LDget_dset_type_size(hid_t did, const char *fields)
 {
-    return(H5LD_get_dset_type_size(did, fields));
+    return (H5LD_get_dset_type_size(did, fields));
 } /* H5LDget_dset_type_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LDget_dset_elmts
  *
@@ -630,8 +625,8 @@ H5LDget_dset_type_size(hid_t did, const char *fields)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5LDget_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims, const char *fields, void *buf)
+H5LDget_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims, const char *fields,
+                   void *buf)
 {
-    return(H5LD_get_dset_elmts(did, prev_dims, cur_dims, fields, buf) );
+    return (H5LD_get_dset_elmts(did, prev_dims, cur_dims, fields, buf));
 } /* H5LDget_dset_elmts() */
-
diff --git a/hl/src/H5LDprivate.h b/hl/src/H5LDprivate.h
index 203bcea..f499adc 100644
--- a/hl/src/H5LDprivate.h
+++ b/hl/src/H5LDprivate.h
@@ -26,7 +26,7 @@
 typedef struct H5LD_memb_t {
     size_t tot_offset;
     size_t last_tsize;
-    hid_t last_tid;
+    hid_t  last_tid;
     char **names;
 } H5LD_memb_t;
 
@@ -44,11 +44,10 @@ extern "C" {
  * Decide to do #3 at this point of time after some discussion.
  */
 H5_HLDLL void H5LD_clean_vector(H5LD_memb_t *listv[]);
-H5_HLDLL int H5LD_construct_vector(char *fields, H5LD_memb_t *listv[], hid_t par_tid);
+H5_HLDLL int  H5LD_construct_vector(char *fields, H5LD_memb_t *listv[], hid_t par_tid);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* end _H5LDprivate_H */
-
diff --git a/hl/src/H5LDpublic.h b/hl/src/H5LDpublic.h
index e2bb745..43ea97b 100644
--- a/hl/src/H5LDpublic.h
+++ b/hl/src/H5LDpublic.h
@@ -20,12 +20,11 @@ extern "C" {
 
 H5_HLDLL herr_t H5LDget_dset_dims(hid_t did, hsize_t *cur_dims);
 H5_HLDLL size_t H5LDget_dset_type_size(hid_t did, const char *fields);
-H5_HLDLL herr_t H5LDget_dset_elmts(hid_t did, const hsize_t *prev_dims,
-    const hsize_t *cur_dims, const char *fields, void *buf);
+H5_HLDLL herr_t H5LDget_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims,
+                                   const char *fields, void *buf);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _H5LDpublic_H */
-
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 3f6c538..c5d22c6 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <assert.h>
 #include <stdio.h>
@@ -19,29 +19,28 @@
 #include "H5LTprivate.h"
 
 /* For Lex and Yacc */
-#define         COL             3
-#define         LIMIT           512
-#define         INCREMENT       1024
-#define         TMP_LEN         256
-#define         MAX(a,b)        (((a)>(b)) ? (a) : (b))
-size_t  input_len;
-char *myinput;
-size_t  indent = 0;
-
-
-/* File Image operations					
-	
-   A file image is a representation of an HDF5 file in a memory	 
-   buffer. In order to perform operations on an image in a similar way	
+#define COL       3
+#define LIMIT     512
+#define INCREMENT 1024
+#define TMP_LEN   256
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+size_t input_len;
+char * myinput;
+size_t indent = 0;
+
+/* File Image operations
+
+   A file image is a representation of an HDF5 file in a memory
+   buffer. In order to perform operations on an image in a similar way
    to a  file, the application buffer is copied to a FAPL buffer, which
-   in turn is copied to a VFD buffer. Buffer copying can decrease	
-   performance, especially when using large file images. A solution to	
-   this issue is to simulate the copying of the application buffer,	
-   when actually the same buffer is used for the FAPL and the VFD.	
-   This is implemented by using callbacks that simulate the standard	
-   functions for memory management (additional callbacks are used for	
-   the management of associated data structures). From the application	
-   standpoint, a file handle can be obtained from a file image by using	
+   in turn is copied to a VFD buffer. Buffer copying can decrease
+   performance, especially when using large file images. A solution to
+   this issue is to simulate the copying of the application buffer,
+   when actually the same buffer is used for the FAPL and the VFD.
+   This is implemented by using callbacks that simulate the standard
+   functions for memory management (additional callbacks are used for
+   the management of associated data structures). From the application
+   standpoint, a file handle can be obtained from a file image by using
    the API routine H5LTopen_file_image(). This function takes a flag
    argument that indicates the HDF5 library how to handle the given image;
    several flag values can be combined by using the bitwise OR operator.
@@ -61,180 +60,178 @@ size_t  indent = 0;
    well. The application is responsible to release the image buffer.
 */
 
-/* Data structure to pass application data to callbacks. */ 
+/* Data structure to pass application data to callbacks. */
 typedef struct {
-    void *app_image_ptr;	/* Pointer to application buffer */ 
-    size_t app_image_size;	/* Size of application buffer */
-    void *fapl_image_ptr;	/* Pointer to FAPL buffer */
-    size_t fapl_image_size;	/* Size of FAPL buffer */
-    int fapl_ref_count;		/* Reference counter for FAPL buffer */
-    void *vfd_image_ptr;	/* Pointer to VFD buffer */
-    size_t vfd_image_size;	/* Size of VFD buffer */
-    int vfd_ref_count;		/* Reference counter for VFD buffer */
-    unsigned flags;		/* Flags indicate how the file image will */
-                                /* be open */
-    int ref_count;		/* Reference counter on udata struct */
+    void *   app_image_ptr;   /* Pointer to application buffer */
+    size_t   app_image_size;  /* Size of application buffer */
+    void *   fapl_image_ptr;  /* Pointer to FAPL buffer */
+    size_t   fapl_image_size; /* Size of FAPL buffer */
+    int      fapl_ref_count;  /* Reference counter for FAPL buffer */
+    void *   vfd_image_ptr;   /* Pointer to VFD buffer */
+    size_t   vfd_image_size;  /* Size of VFD buffer */
+    int      vfd_ref_count;   /* Reference counter for VFD buffer */
+    unsigned flags;           /* Flags indicate how the file image will */
+                              /* be open */
+    int ref_count;            /* Reference counter on udata struct */
 } H5LT_file_image_ud_t;
 
 /* callbacks prototypes for file image ops */
-static void *image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata);
-static void *image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
-static void *image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
+static void * image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata);
+static void * image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op,
+                           void *udata);
+static void * image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
 static herr_t image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *udata);
-static void *udata_copy(void *udata);
+static void * udata_copy(void *udata);
 static herr_t udata_free(void *udata);
 
 /* Definition of callbacks for file image operations. */
 
-
-/*-------------------------------------------------------------------------
-* Function: image_malloc 
-*
-* Purpose: Simulates malloc() function to avoid copying file images.
-*          The application buffer is set to the buffer on only one FAPL.
-*          Then the FAPL buffer can be copied to other FAPL buffers or
-*          to only one VFD buffer. 
-*
-* Return: Address of "allocated" buffer, if successful. Otherwise, it returns
-*         NULL.
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+/*-------------------------------------------------------------------------
+ * Function: image_malloc
+ *
+ * Purpose: Simulates malloc() function to avoid copying file images.
+ *          The application buffer is set to the buffer on only one FAPL.
+ *          Then the FAPL buffer can be copied to other FAPL buffers or
+ *          to only one VFD buffer.
+ *
+ * Return: Address of "allocated" buffer, if successful. Otherwise, it returns
+ *         NULL.
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static void *
 image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
 {
-    H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
-    void * return_value = NULL;
-    
+    H5LT_file_image_ud_t *udata        = (H5LT_file_image_ud_t *)_udata;
+    void *                return_value = NULL;
+
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
 
-    switch ( file_image_op ) {
+    switch (file_image_op) {
         /* the app buffer is "copied" to only one FAPL. Afterwards, FAPLs can be "copied" */
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
-            if (udata->app_image_ptr == NULL) 
+            if (udata->app_image_ptr == NULL)
                 goto out;
-            if (udata->app_image_size != size) 
+            if (udata->app_image_size != size)
                 goto out;
-            if (udata->fapl_image_ptr != NULL) 
+            if (udata->fapl_image_ptr != NULL)
                 goto out;
-            if (udata->fapl_image_size != 0) 
+            if (udata->fapl_image_size != 0)
                 goto out;
-            if (udata->fapl_ref_count != 0) 
+            if (udata->fapl_ref_count != 0)
                 goto out;
 
-            udata->fapl_image_ptr = udata->app_image_ptr;
+            udata->fapl_image_ptr  = udata->app_image_ptr;
             udata->fapl_image_size = udata->app_image_size;
-            return_value = udata->fapl_image_ptr;
+            return_value           = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-	    break;
+            break;
 
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
-            if (udata->fapl_image_ptr == NULL) 
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+            if (udata->fapl_image_ptr == NULL)
                 goto out;
-            if (udata->fapl_image_size != size) 
+            if (udata->fapl_image_size != size)
                 goto out;
-            if (udata->fapl_ref_count == 0) 
+            if (udata->fapl_ref_count == 0)
                 goto out;
 
             return_value = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-	    break;
+            break;
 
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
             goto out;
 
         case H5FD_FILE_IMAGE_OP_FILE_OPEN:
             /* FAPL buffer is "copied" to only one VFD buffer */
-            if (udata->vfd_image_ptr != NULL) 
+            if (udata->vfd_image_ptr != NULL)
                 goto out;
-            if (udata->vfd_image_size != 0) 
+            if (udata->vfd_image_size != 0)
                 goto out;
-            if (udata->vfd_ref_count != 0) 
+            if (udata->vfd_ref_count != 0)
                 goto out;
-            if (udata->fapl_image_ptr == NULL) 
+            if (udata->fapl_image_ptr == NULL)
                 goto out;
-            if (udata->fapl_image_size != size) 
+            if (udata->fapl_image_size != size)
                 goto out;
-            if (udata->fapl_ref_count == 0) 
+            if (udata->fapl_ref_count == 0)
                 goto out;
 
-            udata->vfd_image_ptr = udata->fapl_image_ptr;
- 	    udata->vfd_image_size = size;
+            udata->vfd_image_ptr  = udata->fapl_image_ptr;
+            udata->vfd_image_size = size;
             udata->vfd_ref_count++;
             return_value = udata->vfd_image_ptr;
             break;
 
-	/* added unused labels to shut the compiler up */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
 
-    return(return_value);
+    return (return_value);
 
 out:
     return NULL;
 } /* end image_malloc() */
 
-
-/*-------------------------------------------------------------------------
-* Function: image_memcpy
-*
-* Purpose:  Simulates memcpy() function to avoid copying file images. 
-*           The image buffer can be set to only one FAPL buffer, and
-*           "copied" to only one VFD buffer. The FAPL buffer can be
-*           "copied" to other FAPLs buffers. 
-*
-* Return: The address of the destination buffer, if successful. Otherwise, it
-*         returns NULL.
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+/*-------------------------------------------------------------------------
+ * Function: image_memcpy
+ *
+ * Purpose:  Simulates memcpy() function to avoid copying file images.
+ *           The image buffer can be set to only one FAPL buffer, and
+ *           "copied" to only one VFD buffer. The FAPL buffer can be
+ *           "copied" to other FAPLs buffers.
+ *
+ * Return: The address of the destination buffer, if successful. Otherwise, it
+ *         returns NULL.
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static void *
-image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op,
-    void *_udata)
+image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
 {
     H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
 
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
 
-    switch(file_image_op) {
+    switch (file_image_op) {
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
-            if (dest != udata->fapl_image_ptr) 
+            if (dest != udata->fapl_image_ptr)
                 goto out;
-            if (src != udata->app_image_ptr) 
+            if (src != udata->app_image_ptr)
                 goto out;
-            if (size != udata->fapl_image_size) 
+            if (size != udata->fapl_image_size)
                 goto out;
-            if (size != udata->app_image_size) 
+            if (size != udata->app_image_size)
                 goto out;
-            if (udata->fapl_ref_count == 0) 
+            if (udata->fapl_ref_count == 0)
                 goto out;
             break;
 
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
-            if (dest != udata->fapl_image_ptr) 
+            if (dest != udata->fapl_image_ptr)
                 goto out;
-            if (src != udata->fapl_image_ptr) 
+            if (src != udata->fapl_image_ptr)
                 goto out;
-            if (size != udata->fapl_image_size) 
+            if (size != udata->fapl_image_size)
                 goto out;
-            if (udata->fapl_ref_count < 2) 
+            if (udata->fapl_ref_count < 2)
                 goto out;
             break;
 
@@ -242,651 +239,610 @@ image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file
             goto out;
 
         case H5FD_FILE_IMAGE_OP_FILE_OPEN:
-            if (dest != udata->vfd_image_ptr) 
+            if (dest != udata->vfd_image_ptr)
                 goto out;
-            if (src != udata->fapl_image_ptr) 
+            if (src != udata->fapl_image_ptr)
                 goto out;
-            if (size != udata->vfd_image_size) 
+            if (size != udata->vfd_image_size)
                 goto out;
-            if (size != udata->fapl_image_size) 
+            if (size != udata->fapl_image_size)
                 goto out;
-            if (udata->fapl_ref_count == 0) 
+            if (udata->fapl_ref_count == 0)
                 goto out;
-            if (udata->vfd_ref_count != 1) 
+            if (udata->vfd_ref_count != 1)
                 goto out;
             break;
 
-	/* added unused labels to shut the compiler up */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
 
-    return(dest);
+    return (dest);
 
 out:
     return NULL;
 } /* end image_memcpy() */
 
-
-/*-------------------------------------------------------------------------
-* Function: image_realloc 
-*
-* Purpose: Reallocates the shared application image buffer and updates data
-*          structures that manage buffer "copying". 
-*           
-* Return: Address of reallocated buffer, if successful. Otherwise, it returns
-*         NULL.  
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+/*-------------------------------------------------------------------------
+ * Function: image_realloc
+ *
+ * Purpose: Reallocates the shared application image buffer and updates data
+ *          structures that manage buffer "copying".
+ *
+ * Return: Address of reallocated buffer, if successful. Otherwise, it returns
+ *         NULL.
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static void *
 image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
 {
-    H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
-    void * return_value = NULL;
+    H5LT_file_image_ud_t *udata        = (H5LT_file_image_ud_t *)_udata;
+    void *                return_value = NULL;
 
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
 
-    /* realloc() is not allowed when the HDF5 library won't release the image 
+    /* realloc() is not allowed when the HDF5 library won't release the image
        buffer because reallocation may change the address of the buffer. The
        new address cannot be communicated to the application to release it. */
-    if (udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE) 
-        goto out; 
+    if (udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE)
+        goto out;
 
     /* realloc() is not allowed if the image is open in read-only mode */
-    if (!(udata->flags & H5LT_FILE_IMAGE_OPEN_RW)) 
-        goto out; 
+    if (!(udata->flags & H5LT_FILE_IMAGE_OPEN_RW))
+        goto out;
 
     if (file_image_op == H5FD_FILE_IMAGE_OP_FILE_RESIZE) {
-        if (udata->vfd_image_ptr != ptr) 
-            goto out; 
+        if (udata->vfd_image_ptr != ptr)
+            goto out;
 
-        if (udata->vfd_ref_count != 1) 
+        if (udata->vfd_ref_count != 1)
             goto out;
 
         if (NULL == (udata->vfd_image_ptr = HDrealloc(ptr, size)))
-            goto out; 
-            
+            goto out;
+
         udata->vfd_image_size = size;
-        return_value = udata->vfd_image_ptr;
+        return_value          = udata->vfd_image_ptr;
     } /* end if */
     else
         goto out;
 
-    return(return_value);
+    return (return_value);
 
 out:
     return NULL;
 } /* end image_realloc() */
 
-
 /*-------------------------------------------------------------------------
-* Function: image_free
-*
-* Purpose: Simulates deallocation of FAPL and VFD buffers by decreasing
-*          reference counters. Shared application buffer is actually
-*          deallocated if there are no outstanding references.
-*
-* Return: SUCCEED or FAIL 
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: image_free
+ *
+ * Purpose: Simulates deallocation of FAPL and VFD buffers by decreasing
+ *          reference counters. Shared application buffer is actually
+ *          deallocated if there are no outstanding references.
+ *
+ * Return: SUCCEED or FAIL
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static herr_t
 image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
 {
     H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
 
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
 
-    switch(file_image_op) {
+    switch (file_image_op) {
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	    if (udata->fapl_image_ptr != ptr) 
+            if (udata->fapl_image_ptr != ptr)
                 goto out;
-            if (udata->fapl_ref_count == 0) 
+            if (udata->fapl_ref_count == 0)
                 goto out;
 
             udata->fapl_ref_count--;
 
-            /* release the shared buffer only if indicated by the respective flag and there are no outstanding references */ 
+            /* release the shared buffer only if indicated by the respective flag and there are no outstanding
+             * references */
             if (udata->fapl_ref_count == 0 && udata->vfd_ref_count == 0 &&
-                    !(udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE)) {
+                !(udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE)) {
                 HDfree(udata->fapl_image_ptr);
-                udata->app_image_ptr = NULL;
+                udata->app_image_ptr  = NULL;
                 udata->fapl_image_ptr = NULL;
-                udata->vfd_image_ptr = NULL;
+                udata->vfd_image_ptr  = NULL;
             } /* end if */
             break;
 
         case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
-            if (udata->vfd_image_ptr != ptr) 
+            if (udata->vfd_image_ptr != ptr)
                 goto out;
-            if (udata->vfd_ref_count != 1) 
+            if (udata->vfd_ref_count != 1)
                 goto out;
 
             udata->vfd_ref_count--;
 
-            /* release the shared buffer only if indicated by the respective flag and there are no outstanding references */ 
+            /* release the shared buffer only if indicated by the respective flag and there are no outstanding
+             * references */
             if (udata->fapl_ref_count == 0 && udata->vfd_ref_count == 0 &&
-                    !(udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE)) {
+                !(udata->flags & H5LT_FILE_IMAGE_DONT_RELEASE)) {
                 HDfree(udata->vfd_image_ptr);
-                udata->app_image_ptr = NULL;
+                udata->app_image_ptr  = NULL;
                 udata->fapl_image_ptr = NULL;
-                udata->vfd_image_ptr = NULL;
+                udata->vfd_image_ptr  = NULL;
             } /* end if */
             break;
 
-	/* added unused labels to keep the compiler quite */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
-	case H5FD_FILE_IMAGE_OP_FILE_OPEN:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	default:
+        /* added unused labels to keep the compiler quite */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
+        case H5FD_FILE_IMAGE_OP_FILE_OPEN:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        default:
             goto out;
     } /* end switch */
 
-    return(SUCCEED);
+    return (SUCCEED);
 
 out:
-    return(FAIL);
+    return (FAIL);
 } /* end image_free() */
 
-
-/*-------------------------------------------------------------------------
-* Function: udata_copy 
-*
-* Purpose: Simulates the copying of the user data structure utilized in the
-*          management of the "copying" of file images.
-*
-* Return: Address of "newly allocated" structure, if successful. Otherwise, it
-*         returns NULL.
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+/*-------------------------------------------------------------------------
+ * Function: udata_copy
+ *
+ * Purpose: Simulates the copying of the user data structure utilized in the
+ *          management of the "copying" of file images.
+ *
+ * Return: Address of "newly allocated" structure, if successful. Otherwise, it
+ *         returns NULL.
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static void *
 udata_copy(void *_udata)
 {
     H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
 
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
-    if (udata->ref_count == 0) 
+    if (udata->ref_count == 0)
         goto out;
 
     udata->ref_count++;
 
-    return(udata);
+    return (udata);
 
 out:
     return NULL;
 } /* end udata_copy */
 
-
 /*-------------------------------------------------------------------------
-* Function: udata_free
-*
-* Purpose: Simulates deallocation of the user data structure utilized in the
-*          management of the "copying" of file images. The data structure is
-*          actually deallocated when there are no outstanding references. 
-*
-* Return: SUCCEED or FAIL 
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: udata_free
+ *
+ * Purpose: Simulates deallocation of the user data structure utilized in the
+ *          management of the "copying" of file images. The data structure is
+ *          actually deallocated when there are no outstanding references.
+ *
+ * Return: SUCCEED or FAIL
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static herr_t
 udata_free(void *_udata)
 {
     H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
 
     /* callback is only used if the application buffer is not actually copied */
-    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) 
+    if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
         goto out;
-    if (udata->ref_count == 0) 
+    if (udata->ref_count == 0)
         goto out;
 
     udata->ref_count--;
 
     /* checks that there are no references outstanding before deallocating udata */
-    if (udata->ref_count == 0 && udata->fapl_ref_count == 0 &&
-            udata->vfd_ref_count == 0)
+    if (udata->ref_count == 0 && udata->fapl_ref_count == 0 && udata->vfd_ref_count == 0)
         HDfree(udata);
 
-    return(SUCCEED);
+    return (SUCCEED);
 
-out:        
-    return(FAIL);
+out:
+    return (FAIL);
 } /* end udata_free */
 
 /* End of callbacks definitions for file image operations */
 
 /*-------------------------------------------------------------------------
-*
-* internal functions
-*
-*-------------------------------------------------------------------------
-*/
-static herr_t H5LT_get_attribute_mem(hid_t loc_id,
-                                     const char *obj_name,
-                                     const char *attr_name,
-                                     hid_t mem_type_id,
-                                     void *data);
-
-/*-------------------------------------------------------------------------
-* Function: H5LT_make_dataset
-*
-* Purpose: Creates and writes a dataset of a type tid
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Quincey Koziol, koziol@hdfgroup.org
-*
-* Date: October 10, 2007
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * internal functions
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t H5LT_get_attribute_mem(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                     hid_t mem_type_id, void *data);
+
+/*-------------------------------------------------------------------------
+ * Function: H5LT_make_dataset
+ *
+ * Purpose: Creates and writes a dataset of a type tid
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Quincey Koziol, koziol@hdfgroup.org
+ *
+ * Date: October 10, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static herr_t
-H5LT_make_dataset_numerical( hid_t loc_id,
-                            const char *dset_name,
-                            int rank,
-                            const hsize_t *dims,
-                            hid_t tid,
-                            const void *data )
+H5LT_make_dataset_numerical(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, hid_t tid,
+                            const void *data)
 {
-    hid_t   did = -1, sid = -1;
+    hid_t did = -1, sid = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Create the data space for the dataset. */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         return -1;
 
     /* Create the dataset. */
-    if((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* Write the dataset only if there is data to write */
-    if(data)
-        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+    if (data)
+        if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
             goto out;
 
     /* End access to the dataset and release resources used by it. */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
 
     /* Terminate access to the data space. */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Public functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Public functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Function: H5LTmake_dataset
+ *
+ * Purpose: Creates and writes a dataset of a type tid
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 19, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-/*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset
-*
-* Purpose: Creates and writes a dataset of a type tid
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 19, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5LTmake_dataset( hid_t loc_id,
-                        const char *dset_name,
-                        int rank,
-                        const hsize_t *dims,
-                        hid_t tid,
-                        const void *data )
+herr_t
+H5LTmake_dataset(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, hid_t tid,
+                 const void *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, tid, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, tid, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_char
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_CHAR type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTmake_dataset_char
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_CHAR type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTmake_dataset_char( hid_t loc_id,
-                             const char *dset_name,
-                             int rank,
-                             const hsize_t *dims,
-                             const char *data )
+herr_t
+H5LTmake_dataset_char(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, const char *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_CHAR, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_CHAR, data));
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_short
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_SHORT type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTmake_dataset_short
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_SHORT type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-herr_t H5LTmake_dataset_short( hid_t loc_id,
-                              const char *dset_name,
-                              int rank,
-                              const hsize_t *dims,
-                              const short *data )
+herr_t
+H5LTmake_dataset_short(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, const short *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_SHORT, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_SHORT, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_int
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTmake_dataset_int
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTmake_dataset_int( hid_t loc_id,
-                            const char *dset_name,
-                            int rank,
-                            const hsize_t *dims,
-                            const int *data )
+herr_t
+H5LTmake_dataset_int(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, const int *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_INT, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_INT, data));
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_long
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_LONG type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTmake_dataset_long
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_LONG type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTmake_dataset_long( hid_t loc_id,
-                             const char *dset_name,
-                             int rank,
-                             const hsize_t *dims,
-                             const long *data )
+herr_t
+H5LTmake_dataset_long(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, const long *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_LONG, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_LONG, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_float
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTmake_dataset_float
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-herr_t H5LTmake_dataset_float( hid_t loc_id,
-                              const char *dset_name,
-                              int rank,
-                              const hsize_t *dims,
-                              const float *data )
+herr_t
+H5LTmake_dataset_float(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, const float *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_FLOAT, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_FLOAT, data));
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_double
-*
-* Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 14, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTmake_dataset_double
+ *
+ * Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 14, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTmake_dataset_double( hid_t loc_id,
-                               const char *dset_name,
-                               int rank,
-                               const hsize_t *dims,
-                               const double *data )
+herr_t
+H5LTmake_dataset_double(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                        const double *data)
 {
-    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_DOUBLE, data));
+    return (H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_DOUBLE, data));
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_string
-*
-* Purpose: Creates and writes a dataset of H5T_C_S1 type
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTmake_dataset_string
+ *
+ * Purpose: Creates and writes a dataset of H5T_C_S1 type
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTmake_dataset_string(hid_t loc_id,
-                               const char *dset_name,
-                               const char *buf )
+herr_t
+H5LTmake_dataset_string(hid_t loc_id, const char *dset_name, const char *buf)
 {
-    hid_t   did = -1;
-    hid_t   sid = -1;
-    hid_t   tid = -1;
-    size_t  size;
+    hid_t  did = -1;
+    hid_t  sid = -1;
+    hid_t  tid = -1;
+    size_t size;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* create a string data type */
-    if((tid = H5Tcopy(H5T_C_S1)) < 0 )
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
         goto out;
 
     size = HDstrlen(buf) + 1; /* extra null term */
 
-    if(H5Tset_size(tid, size) < 0)
+    if (H5Tset_size(tid, size) < 0)
         goto out;
 
-    if(H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0)
+    if (H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0)
         goto out;
 
     /* Create the data space for the dataset. */
-    if((sid = H5Screate(H5S_SCALAR)) < 0)
+    if ((sid = H5Screate(H5S_SCALAR)) < 0)
         goto out;
 
     /* Create the dataset. */
-    if((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* Write the dataset only if there is data to write */
-    if(buf)
-        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (buf)
+        if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
 
     /* close*/
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         return -1;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         return -1;
-    if(H5Tclose(tid) < 0)
+    if (H5Tclose(tid) < 0)
         goto out;
 
     return 0;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Tclose(tid);
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
 }
 
-
-/*-------------------------------------------------------------------------
-* Function: H5LTopen_file_image
-*
-* Purpose: Open a user supplied file image using the core file driver. 
-*
-* Return: File identifier, Failure: -1
-*
-* Programmer: Christian Chilan 
-*
-* Date: October 3, 2011
-*
-*-------------------------------------------------------------------------
-*/
-hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
-{
-    hid_t		        fapl=-1, file_id=-1;    /* HDF5 identifiers */
-    unsigned            file_open_flags;        /* Flags for image open */
-    char                file_name[64];	        /* Filename buffer */
-    size_t              alloc_incr;             /* Buffer allocation increment */
-    size_t              min_incr = 65536;       /* Minimum buffer increment */
-    double              buf_prcnt = 0.1f;       /* Percentage of buffer size to set
-                                                    as increment */
-    static long         file_name_counter; 
-    H5FD_file_image_callbacks_t callbacks = {&image_malloc, &image_memcpy, 
-                                           &image_realloc, &image_free, 
-                                           &udata_copy, &udata_free, 
-                                           (void *)NULL};
+/*-------------------------------------------------------------------------
+ * Function: H5LTopen_file_image
+ *
+ * Purpose: Open a user supplied file image using the core file driver.
+ *
+ * Return: File identifier, Failure: -1
+ *
+ * Programmer: Christian Chilan
+ *
+ * Date: October 3, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
+{
+    hid_t    fapl = -1, file_id = -1; /* HDF5 identifiers */
+    unsigned file_open_flags;         /* Flags for image open */
+    char     file_name[64];           /* Filename buffer */
+    size_t   alloc_incr;              /* Buffer allocation increment */
+    size_t   min_incr  = 65536;       /* Minimum buffer increment */
+    double   buf_prcnt = 0.1f;        /* Percentage of buffer size to set
+                                          as increment */
+    static long                 file_name_counter;
+    H5FD_file_image_callbacks_t callbacks = {&image_malloc, &image_memcpy, &image_realloc, &image_free,
+                                             &udata_copy,   &udata_free,   (void *)NULL};
 
     /* check arguments */
-    if (buf_ptr == NULL) 
+    if (buf_ptr == NULL)
         goto out;
-    if (buf_size == 0) 
+    if (buf_size == 0)
         goto out;
     if (flags & (unsigned)~(H5LT_FILE_IMAGE_ALL))
         goto out;
 
     /* Create FAPL to transmit file image */
-    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) 
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto out;
 
     /* set allocation increment to a percentage of the supplied buffer size, or
@@ -898,44 +854,44 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
         alloc_incr = min_incr;
 
     /* Configure FAPL to use the core file driver */
-    if (H5Pset_fapl_core(fapl, alloc_incr, FALSE) < 0) 
+    if (H5Pset_fapl_core(fapl, alloc_incr, FALSE) < 0)
         goto out;
 
     /* Set callbacks for file image ops ONLY if the file image is NOT copied */
     if (flags & H5LT_FILE_IMAGE_DONT_COPY) {
-        H5LT_file_image_ud_t *udata;	/* Pointer to udata structure */
+        H5LT_file_image_ud_t *udata; /* Pointer to udata structure */
 
         /* Allocate buffer to communicate user data to callbacks */
         if (NULL == (udata = (H5LT_file_image_ud_t *)HDmalloc(sizeof(H5LT_file_image_ud_t))))
             goto out;
 
         /* Initialize udata with info about app buffer containing file image  and flags */
-        udata->app_image_ptr = buf_ptr;
-        udata->app_image_size = buf_size;
-        udata->fapl_image_ptr = NULL;
+        udata->app_image_ptr   = buf_ptr;
+        udata->app_image_size  = buf_size;
+        udata->fapl_image_ptr  = NULL;
         udata->fapl_image_size = 0;
-        udata->fapl_ref_count = 0;
-        udata->vfd_image_ptr = NULL;
-        udata->vfd_image_size = 0;
-        udata->vfd_ref_count = 0;
-        udata->flags = flags;
-        udata->ref_count = 1; /* corresponding to the first FAPL */
+        udata->fapl_ref_count  = 0;
+        udata->vfd_image_ptr   = NULL;
+        udata->vfd_image_size  = 0;
+        udata->vfd_ref_count   = 0;
+        udata->flags           = flags;
+        udata->ref_count       = 1; /* corresponding to the first FAPL */
 
         /* copy address of udata into callbacks */
         callbacks.udata = (void *)udata;
 
         /* Set file image callbacks */
-        if (H5Pset_file_image_callbacks(fapl, &callbacks) < 0)  {
+        if (H5Pset_file_image_callbacks(fapl, &callbacks) < 0) {
             HDfree(udata);
             goto out;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Assign file image in user buffer to FAPL */
-    if (H5Pset_file_image(fapl, buf_ptr, buf_size) < 0) 
+    if (H5Pset_file_image(fapl, buf_ptr, buf_size) < 0)
         goto out;
 
-    /* set file open flags */  
+    /* set file open flags */
     if (flags & H5LT_FILE_IMAGE_OPEN_RW)
         file_open_flags = H5F_ACC_RDWR;
     else
@@ -943,59 +899,60 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
 
     /* define a unique file name */
     HDsnprintf(file_name, (sizeof(file_name) - 1), "file_image_%ld", file_name_counter++);
-   
-    /* Assign file image in FAPL to the core file driver */ 
-    if ((file_id = H5Fopen(file_name, file_open_flags, fapl)) < 0) 
+
+    /* Assign file image in FAPL to the core file driver */
+    if ((file_id = H5Fopen(file_name, file_open_flags, fapl)) < 0)
         goto out;
 
     /* Close FAPL */
-    if (H5Pclose(fapl) < 0) 
+    if (H5Pclose(fapl) < 0)
         goto out;
 
-    /* Return file identifier */ 
-    return file_id; 
+    /* Return file identifier */
+    return file_id;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(fapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
 } /* end H5LTopen_file_image() */
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LT_read_dataset
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Quincey Koziol, koziol@hdfgroup.org
-*
-* Date: October 8, 2007
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LT_read_dataset
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Quincey Koziol, koziol@hdfgroup.org
+ *
+ * Date: October 8, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static herr_t
 H5LT_read_dataset_numerical(hid_t loc_id, const char *dset_name, hid_t tid, void *data)
 {
-    hid_t   did;
+    hid_t did;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Read */
-    if(H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+    if (H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
         goto out;
 
     /* End access to the dataset and release resources used by it. */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         return -1;
 
     return 0;
@@ -1006,508 +963,491 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: June 13, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 13, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset(hid_t loc_id,
-                        const char *dset_name,
-                        hid_t tid,
-                        void *data)
+herr_t
+H5LTread_dataset(hid_t loc_id, const char *dset_name, hid_t tid, void *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, tid, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, tid, data));
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_char
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_char
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_char( hid_t loc_id,
-                             const char *dset_name,
-                             char *data )
+herr_t
+H5LTread_dataset_char(hid_t loc_id, const char *dset_name, char *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_CHAR, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_CHAR, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_short
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_short
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_short( hid_t loc_id,
-                              const char *dset_name,
-                              short *data )
+herr_t
+H5LTread_dataset_short(hid_t loc_id, const char *dset_name, short *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_SHORT, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_SHORT, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_int
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_int
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_int( hid_t loc_id,
-                            const char *dset_name,
-                            int *data )
+herr_t
+H5LTread_dataset_int(hid_t loc_id, const char *dset_name, int *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_INT, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_INT, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_long
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_long
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_long( hid_t loc_id,
-                             const char *dset_name,
-                             long *data )
+herr_t
+H5LTread_dataset_long(hid_t loc_id, const char *dset_name, long *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_LONG, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_LONG, data));
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_float
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_float
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_float( hid_t loc_id,
-                              const char *dset_name,
-                              float *data )
+herr_t
+H5LTread_dataset_float(hid_t loc_id, const char *dset_name, float *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_FLOAT, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_FLOAT, data));
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_double
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_double
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 5, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_double( hid_t loc_id,
-                               const char *dset_name,
-                               double *data )
+herr_t
+H5LTread_dataset_double(hid_t loc_id, const char *dset_name, double *data)
 {
-    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_DOUBLE, data));
+    return (H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_DOUBLE, data));
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_string
-*
-* Purpose: Reads a dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_string
+ *
+ * Purpose: Reads a dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: October 05, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTread_dataset_string( hid_t loc_id,
-                               const char *dset_name,
-                               char *buf )
+herr_t
+H5LTread_dataset_string(hid_t loc_id, const char *dset_name, char *buf)
 {
-    hid_t   did = -1;
-    hid_t   tid = -1;
+    hid_t did = -1;
+    hid_t tid = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* Read */
-    if(H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         goto out;
-    if(H5Tclose(tid))
+    if (H5Tclose(tid))
         return -1;
 
     return 0;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Tclose(tid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_dataset_ndims
-*
-* Purpose: Gets the dimensionality of a dataset.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_dataset_ndims
+ *
+ * Purpose: Gets the dimensionality of a dataset.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 4, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTget_dataset_ndims( hid_t loc_id,
-                             const char *dset_name,
-                             int *rank )
+herr_t
+H5LTget_dataset_ndims(hid_t loc_id, const char *dset_name, int *rank)
 {
-    hid_t       did = -1;
-    hid_t       sid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* Open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* Get rank */
-    if((*rank = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((*rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* Terminate access to the dataspace */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* End access to the dataset */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         return -1;
 
     return 0;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_dataset_info
-*
-* Purpose: Gets information about a dataset.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 4, 2001
-*  Modified: February 28, 2006: checked for NULL parameters
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_dataset_info
+ *
+ * Purpose: Gets information about a dataset.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 4, 2001
+ *  Modified: February 28, 2006: checked for NULL parameters
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTget_dataset_info( hid_t loc_id,
-                            const char *dset_name,
-                            hsize_t *dims,
-                            H5T_class_t *type_class,
-                            size_t *type_size )
+herr_t
+H5LTget_dataset_info(hid_t loc_id, const char *dset_name, hsize_t *dims, H5T_class_t *type_class,
+                     size_t *type_size)
 {
-    hid_t       did = -1;
-    hid_t       tid = -1;
-    hid_t       sid = -1;
+    hid_t did = -1;
+    hid_t tid = -1;
+    hid_t sid = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
-      return -1;
+    if (dset_name == NULL)
+        return -1;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* get an identifier for the datatype. */
     tid = H5Dget_type(did);
 
     /* get the class. */
-    if(type_class != NULL)
+    if (type_class != NULL)
         *type_class = H5Tget_class(tid);
 
     /* get the size. */
-    if(type_size!=NULL)
+    if (type_size != NULL)
         *type_size = H5Tget_size(tid);
 
-    if(dims != NULL) {
+    if (dims != NULL) {
         /* get the dataspace handle */
-        if((sid = H5Dget_space(did)) < 0)
+        if ((sid = H5Dget_space(did)) < 0)
             goto out;
 
         /* get dimensions */
-        if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+        if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
             goto out;
 
         /* terminate access to the dataspace */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
     } /* end if */
 
     /* release the datatype. */
-    if(H5Tclose(tid))
+    if (H5Tclose(tid))
         return -1;
 
     /* end access to the dataset */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         return -1;
 
     return 0;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(tid);
         H5Sclose(sid);
         H5Dclose(did);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return -1;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: find_dataset
-*
-* Purpose: operator function used by H5LTfind_dataset
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: June 21, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: find_dataset
+ *
+ * Purpose: operator function used by H5LTfind_dataset
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 21, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static herr_t
 find_dataset(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *op_data)
 {
     /* Define a default zero value for return. This will cause the iterator to continue if
-    * the dataset is not found yet.
-    */
+     * the dataset is not found yet.
+     */
     int ret = 0;
 
     /* check the arguments */
-    if (name == NULL) 
-      return ret;
-    
+    if (name == NULL)
+        return ret;
+
     /* Shut the compiler up */
     loc_id = loc_id;
-    linfo = linfo;
+    linfo  = linfo;
 
     /* Define a positive value for return value if the dataset was found. This will
-    * cause the iterator to immediately return that positive value,
-    * indicating short-circuit success
-    */
-    if(HDstrncmp(name, (char *)op_data, HDstrlen((char *)op_data)) == 0)
+     * cause the iterator to immediately return that positive value,
+     * indicating short-circuit success
+     */
+    if (HDstrncmp(name, (char *)op_data, HDstrlen((char *)op_data)) == 0)
         ret = 1;
 
     return ret;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTfind_dataset
-*
-* Purpose:  Inquires if a dataset named dset_name exists attached
-*           to the object loc_id.
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: July 15, 2001
-*
-* Return:
-*     Success: The return value of the first operator that
-*              returns non-zero, or zero if all members were
-*              processed with no operator returning non-zero.
-*
-*      Failure:    Negative if something goes wrong within the
-*              library, or the negative value returned by one
-*              of the operators.
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTfind_dataset
+ *
+ * Purpose:  Inquires if a dataset named dset_name exists attached
+ *           to the object loc_id.
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 15, 2001
+ *
+ * Return:
+ *     Success: The return value of the first operator that
+ *              returns non-zero, or zero if all members were
+ *              processed with no operator returning non-zero.
+ *
+ *      Failure:    Negative if something goes wrong within the
+ *              library, or the negative value returned by one
+ *              of the operators.
+ *
+ *-------------------------------------------------------------------------
+ */
 
 herr_t
-H5LTfind_dataset( hid_t loc_id, const char *dset_name )
+H5LTfind_dataset(hid_t loc_id, const char *dset_name)
 {
     return H5Literate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, 0, find_dataset, (void *)dset_name);
 }
 
-
 /*-------------------------------------------------------------------------
-*
-* Set attribute functions
-*
-*-------------------------------------------------------------------------
-*/
-
+ *
+ * Set attribute functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Function: H5LTset_attribute_string
+ *
+ * Purpose: Creates and writes a string attribute named attr_name and attaches
+ *          it to the object specified by the name obj_name.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 23, 2001
+ *
+ * Comments: If the attribute already exists, it is overwritten
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-/*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_string
-*
-* Purpose: Creates and writes a string attribute named attr_name and attaches
-*          it to the object specified by the name obj_name.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: July 23, 2001
-*
-* Comments: If the attribute already exists, it is overwritten
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5LTset_attribute_string( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                const char *attr_data )
+herr_t
+H5LTset_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name, const char *attr_data)
 {
-    hid_t      attr_type;
-    hid_t      attr_space_id;
-    hid_t      attr_id;
-    hid_t      obj_id;
-    int        has_attr;
-    size_t     attr_size;
+    hid_t  attr_type;
+    hid_t  attr_space_id;
+    hid_t  attr_id;
+    hid_t  obj_id;
+    int    has_attr;
+    size_t attr_size;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
-    if (attr_data == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
+    if (attr_data == NULL)
+        return -1;
 
     /* Open the object */
     if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create the attribute */
-    if ( (attr_type = H5Tcopy( H5T_C_S1 )) < 0 )
+    if ((attr_type = H5Tcopy(H5T_C_S1)) < 0)
         goto out;
 
-    attr_size = HDstrlen( attr_data ) + 1; /* extra null term */
+    attr_size = HDstrlen(attr_data) + 1; /* extra null term */
 
-    if ( H5Tset_size( attr_type, (size_t)attr_size) < 0 )
+    if (H5Tset_size(attr_type, (size_t)attr_size) < 0)
         goto out;
 
-    if ( H5Tset_strpad( attr_type, H5T_STR_NULLTERM ) < 0 )
+    if (H5Tset_strpad(attr_type, H5T_STR_NULLTERM) < 0)
         goto out;
 
-    if ( (attr_space_id = H5Screate( H5S_SCALAR )) < 0 )
+    if ((attr_space_id = H5Screate(H5S_SCALAR)) < 0)
         goto out;
 
     /* Verify if the attribute already exists */
     has_attr = H5LT_find_attribute(obj_id, attr_name);
 
     /* The attribute already exists, delete it */
-    if(has_attr == 1)
-        if(H5Adelete(obj_id, attr_name) < 0)
+    if (has_attr == 1)
+        if (H5Adelete(obj_id, attr_name) < 0)
             goto out;
 
     /* Create and write the attribute */
 
-    if((attr_id = H5Acreate2(obj_id, attr_name, attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((attr_id = H5Acreate2(obj_id, attr_name, attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
-    if(H5Awrite(attr_id, attr_type, attr_data) < 0)
+    if (H5Awrite(attr_id, attr_type, attr_data) < 0)
         goto out;
 
-    if(H5Aclose(attr_id) < 0)
+    if (H5Aclose(attr_id) < 0)
         goto out;
 
-    if(H5Sclose(attr_space_id) < 0)
+    if (H5Sclose(attr_space_id) < 0)
         goto out;
 
-    if(H5Tclose(attr_type) < 0)
+    if (H5Tclose(attr_type) < 0)
         goto out;
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0)
+    if (H5Oclose(obj_id) < 0)
         return -1;
 
     return 0;
@@ -1518,79 +1458,71 @@ out:
     return -1;
 }
 
-
-
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LT_set_attribute_numerical
-*
-* Purpose: Private function used by H5LTset_attribute_int and H5LTset_attribute_float
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: July 25, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LT_set_attribute_numerical
+ *
+ * Purpose: Private function used by H5LTset_attribute_int and H5LTset_attribute_float
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 25, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-herr_t H5LT_set_attribute_numerical( hid_t loc_id,
-                                    const char *obj_name,
-                                    const char *attr_name,
-                                    size_t size,
-                                    hid_t tid,
-                                    const void *data )
+herr_t
+H5LT_set_attribute_numerical(hid_t loc_id, const char *obj_name, const char *attr_name, size_t size,
+                             hid_t tid, const void *data)
 {
 
-    hid_t      obj_id, sid, attr_id;
-    hsize_t    dim_size=size;
-    int        has_attr;
+    hid_t   obj_id, sid, attr_id;
+    hsize_t dim_size = size;
+    int     has_attr;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
 
     /* Open the object */
     if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create the data space for the attribute. */
-    if ( (sid = H5Screate_simple( 1, &dim_size, NULL )) < 0 )
+    if ((sid = H5Screate_simple(1, &dim_size, NULL)) < 0)
         goto out;
 
     /* Verify if the attribute already exists */
     has_attr = H5LT_find_attribute(obj_id, attr_name);
 
     /* The attribute already exists, delete it */
-    if(has_attr == 1)
-        if(H5Adelete(obj_id, attr_name) < 0)
+    if (has_attr == 1)
+        if (H5Adelete(obj_id, attr_name) < 0)
             goto out;
 
     /* Create the attribute. */
-    if((attr_id = H5Acreate2(obj_id, attr_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((attr_id = H5Acreate2(obj_id, attr_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* Write the attribute data. */
-    if(H5Awrite(attr_id, tid, data) < 0)
+    if (H5Awrite(attr_id, tid, data) < 0)
         goto out;
 
     /* Close the attribute. */
-    if(H5Aclose(attr_id) < 0)
+    if (H5Aclose(attr_id) < 0)
         goto out;
 
     /* Close the dataspace. */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0)
+    if (H5Oclose(obj_id) < 0)
         return -1;
 
     return 0;
@@ -1600,557 +1532,493 @@ out:
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_char
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_char
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 7, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_char( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const char *data,
-                              size_t size )
+herr_t
+H5LTset_attribute_char(hid_t loc_id, const char *obj_name, const char *attr_name, const char *data,
+                       size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_CHAR, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_CHAR, data) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_uchar
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_uchar
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_uchar( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const unsigned char *data,
-                               size_t size )
+herr_t
+H5LTset_attribute_uchar(hid_t loc_id, const char *obj_name, const char *attr_name, const unsigned char *data,
+                        size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_UCHAR, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_UCHAR, data) < 0)
         return -1;
 
     return 0;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_short
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_short
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 7, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_short( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const short *data,
-                               size_t size )
+herr_t
+H5LTset_attribute_short(hid_t loc_id, const char *obj_name, const char *attr_name, const short *data,
+                        size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_SHORT, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_SHORT, data) < 0)
         return -1;
 
     return 0;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_ushort
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_ushort
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_ushort( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                const unsigned short *data,
-                                size_t size )
+herr_t
+H5LTset_attribute_ushort(hid_t loc_id, const char *obj_name, const char *attr_name,
+                         const unsigned short *data, size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_USHORT, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_USHORT, data) < 0)
         return -1;
 
     return 0;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_int
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_int
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 7, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_int( hid_t loc_id,
-                             const char *obj_name,
-                             const char *attr_name,
-                             const int *data,
-                             size_t size )
+herr_t
+H5LTset_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name, const int *data, size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_INT, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_INT, data) < 0)
         return -1;
 
     return 0;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_uint
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_uint
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_uint( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const unsigned int *data,
-                              size_t size )
+herr_t
+H5LTset_attribute_uint(hid_t loc_id, const char *obj_name, const char *attr_name, const unsigned int *data,
+                       size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_UINT, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_UINT, data) < 0)
         return -1;
 
     return 0;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_long
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_long
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 7, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_long( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const long *data,
-                              size_t size )
+herr_t
+H5LTset_attribute_long(hid_t loc_id, const char *obj_name, const char *attr_name, const long *data,
+                       size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_LONG, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_LONG, data) < 0)
         return -1;
 
     return 0;
-
 }
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_long_long
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
-*
-* Date: June 17, 2005
-*
-* Comments: This function was added to support attributes of type long long
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_long_long
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
+ *
+ * Date: June 17, 2005
+ *
+ * Comments: This function was added to support attributes of type long long
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_long_long( hid_t loc_id,
-                                   const char *obj_name,
-                                   const char *attr_name,
-                                   const long long *data,
-                                   size_t size )
+herr_t
+H5LTset_attribute_long_long(hid_t loc_id, const char *obj_name, const char *attr_name, const long long *data,
+                            size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_LLONG, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_LLONG, data) < 0)
         return -1;
 
     return 0;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_ulong
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_ulong
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_ulong( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const unsigned long *data,
-                               size_t size )
+herr_t
+H5LTset_attribute_ulong(hid_t loc_id, const char *obj_name, const char *attr_name, const unsigned long *data,
+                        size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_ULONG, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_ULONG, data) < 0)
         return -1;
 
     return 0;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_float
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: July 25, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTset_attribute_float
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: July 25, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_float( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const float *data,
-                               size_t size )
+herr_t
+H5LTset_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name, const float *data,
+                        size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_FLOAT, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_FLOAT, data) < 0)
         return -1;
 
     return 0;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_double
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_double
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 7, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTset_attribute_double( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                const double *data,
-                                size_t size )
+herr_t
+H5LTset_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name, const double *data,
+                         size_t size)
 {
 
-    if ( H5LT_set_attribute_numerical( loc_id, obj_name, attr_name, size,
-        H5T_NATIVE_DOUBLE, data ) < 0 )
+    if (H5LT_set_attribute_numerical(loc_id, obj_name, attr_name, size, H5T_NATIVE_DOUBLE, data) < 0)
         return -1;
 
     return 0;
-
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: find_attr
-*
-* Purpose: operator function used by H5LT_find_attribute
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: June 21, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: find_attr
+ *
+ * Purpose: operator function used by H5LT_find_attribute
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 21, 2001
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 static herr_t
-find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo,
-          void *op_data)
+find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data)
 {
     int ret = H5_ITER_CONT;
 
     /* check the arguments */
-    if (name == NULL) 
-      return H5_ITER_CONT;
+    if (name == NULL)
+        return H5_ITER_CONT;
 
     /* Shut compiler up */
-    loc_id = loc_id; ainfo = ainfo;
+    loc_id = loc_id;
+    ainfo  = ainfo;
 
     /* Define a positive value for return value if the attribute was found. This will
-    * cause the iterator to immediately return that positive value,
-    * indicating short-circuit success
-    */
+     * cause the iterator to immediately return that positive value,
+     * indicating short-circuit success
+     */
 
-    if(HDstrncmp(name, (char *)op_data, MAX(HDstrlen((char *)op_data),HDstrlen(name))) == 0)
+    if (HDstrncmp(name, (char *)op_data, MAX(HDstrlen((char *)op_data), HDstrlen(name))) == 0)
         ret = H5_ITER_STOP;
 
     return ret;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTfind_attribute
-*
-* Purpose: Inquires if an attribute named attr_name exists attached to
-*          the object loc_id.
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: May 17, 2006
-*
-* Comments:
-*  Calls the private version of the function
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTfind_attribute
+ *
+ * Purpose: Inquires if an attribute named attr_name exists attached to
+ *          the object loc_id.
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 17, 2006
+ *
+ * Comments:
+ *  Calls the private version of the function
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTfind_attribute( hid_t loc_id, const char* attr_name )
+herr_t
+H5LTfind_attribute(hid_t loc_id, const char *attr_name)
 {
-    return H5LT_find_attribute(loc_id,attr_name);
+    return H5LT_find_attribute(loc_id, attr_name);
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LT_find_attribute
-*
-* Purpose: Inquires if an attribute named attr_name exists attached to the object loc_id.
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: June 21, 2001
-*
-* Comments:
-*  The function uses H5Aiterate2 with the operator function find_attr
-*
-* Return:
-*  Success: The return value of the first operator that
-*              returns non-zero, or zero if all members were
-*              processed with no operator returning non-zero.
-*
-*  Failure: Negative if something goes wrong within the
-*              library, or the negative value returned by one
-*              of the operators.
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LT_find_attribute
+ *
+ * Purpose: Inquires if an attribute named attr_name exists attached to the object loc_id.
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: June 21, 2001
+ *
+ * Comments:
+ *  The function uses H5Aiterate2 with the operator function find_attr
+ *
+ * Return:
+ *  Success: The return value of the first operator that
+ *              returns non-zero, or zero if all members were
+ *              processed with no operator returning non-zero.
+ *
+ *  Failure: Negative if something goes wrong within the
+ *              library, or the negative value returned by one
+ *              of the operators.
+ *
+ *-------------------------------------------------------------------------
+ */
 
 herr_t
-H5LT_find_attribute( hid_t loc_id, const char* attr_name )
+H5LT_find_attribute(hid_t loc_id, const char *attr_name)
 {
     return H5Aiterate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, find_attr, (void *)attr_name);
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_ndims
-*
-* Purpose: Gets the dimensionality of an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_ndims
+ *
+ * Purpose: Gets the dimensionality of an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 4, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTget_attribute_ndims( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               int *rank )
+herr_t
+H5LTget_attribute_ndims(hid_t loc_id, const char *obj_name, const char *attr_name, int *rank)
 {
-    hid_t       attr_id;
-    hid_t       sid;
-    hid_t       obj_id;
+    hid_t attr_id;
+    hid_t sid;
+    hid_t obj_id;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
 
     /* Open the object */
-    if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
+    if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Open the attribute. */
-    if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0)
-    {
+    if ((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0) {
         H5Oclose(obj_id);
         return -1;
     }
 
     /* Get the dataspace handle */
-    if((sid = H5Aget_space(attr_id)) < 0)
+    if ((sid = H5Aget_space(attr_id)) < 0)
         goto out;
 
     /* Get rank */
-    if((*rank = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((*rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* Terminate access to the attribute */
-    if ( H5Sclose( sid ) < 0 )
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* End access to the attribute */
-    if ( H5Aclose( attr_id ) )
-        goto out;;
+    if (H5Aclose(attr_id))
+        goto out;
+    ;
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0 )
+    if (H5Oclose(obj_id) < 0)
         return -1;
 
     return 0;
 
 out:
-    H5Aclose( attr_id );
+    H5Aclose(attr_id);
     H5Oclose(obj_id);
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_info
-*
-* Purpose: Gets information about an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_info
+ *
+ * Purpose: Gets information about an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 4, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTget_attribute_info( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              hsize_t *dims,
-                              H5T_class_t *type_class,
-                              size_t *type_size )
+herr_t
+H5LTget_attribute_info(hid_t loc_id, const char *obj_name, const char *attr_name, hsize_t *dims,
+                       H5T_class_t *type_class, size_t *type_size)
 {
-    hid_t       attr_id;
-    hid_t       tid;
-    hid_t       sid;
-    hid_t       obj_id;
+    hid_t attr_id;
+    hid_t tid;
+    hid_t sid;
+    hid_t obj_id;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
 
     /* Open the object */
-    if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
+    if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Open the attribute. */
-    if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0)
-    {
+    if ((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0) {
         H5Oclose(obj_id);
         return -1;
     }
@@ -2162,30 +2030,30 @@ herr_t H5LTget_attribute_info( hid_t loc_id,
     *type_class = H5Tget_class(tid);
 
     /* Get the size. */
-    *type_size = H5Tget_size( tid );
+    *type_size = H5Tget_size(tid);
 
     /* Get the dataspace handle */
-    if ( (sid = H5Aget_space( attr_id )) < 0 )
+    if ((sid = H5Aget_space(attr_id)) < 0)
         goto out;
 
     /* Get dimensions */
-    if ( H5Sget_simple_extent_dims( sid, dims, NULL) < 0 )
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
 
     /* Terminate access to the dataspace */
-    if ( H5Sclose( sid ) < 0 )
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* Release the datatype. */
-    if ( H5Tclose( tid ) )
+    if (H5Tclose(tid))
         goto out;
 
     /* End access to the attribute */
-    if ( H5Aclose( attr_id ) )
+    if (H5Aclose(attr_id))
         goto out;
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0 )
+    if (H5Oclose(obj_id) < 0)
         return -1;
 
     return 0;
@@ -2195,46 +2063,46 @@ out:
     H5Aclose(attr_id);
     H5Oclose(obj_id);
     return -1;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTtext_to_dtype
-*
-* Purpose:  Convert DDL description to HDF5 data type.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Raymond Lu, slu@ncsa.uiuc.edu
-*
-* Date: October 6, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-hid_t H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type)
-{
-    hid_t   type_id;
+ * Function: H5LTtext_to_dtype
+ *
+ * Purpose:  Convert DDL description to HDF5 data type.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Raymond Lu, slu@ncsa.uiuc.edu
+ *
+ * Date: October 6, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type)
+{
+    hid_t type_id;
 
     /* check the arguments */
-    if (text == NULL) 
-      return -1;
+    if (text == NULL)
+        return -1;
 
-    if(lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
+    if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
         goto out;
 
-    if(lang_type != H5LT_DDL) {
+    if (lang_type != H5LT_DDL) {
         HDfprintf(stderr, "only DDL is supported for now.\n");
         goto out;
     }
 
     input_len = HDstrlen(text);
-    myinput = HDstrdup(text);
+    myinput   = HDstrdup(text);
 
-    if((type_id = H5LTyyparse()) < 0) {
+    if ((type_id = H5LTyyparse()) < 0) {
         HDfree(myinput);
         goto out;
     }
@@ -2249,57 +2117,60 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    realloc_and_append
-*
-* Purpose:     Expand the buffer and append a string to it.
-*
-* Return:      void
-*
-* Programmer:  Raymond Lu, songyulu@hdfgroup.org
-*
-* Date:        29 September 2011
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-static char* 
+ * Function:    realloc_and_append
+ *
+ * Purpose:     Expand the buffer and append a string to it.
+ *
+ * Return:      void
+ *
+ * Programmer:  Raymond Lu, songyulu@hdfgroup.org
+ *
+ * Date:        29 September 2011
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static char *
 realloc_and_append(hbool_t _no_user_buf, size_t *len, char *buf, const char *str_to_add)
 {
     size_t size_str_to_add, size_str;
 
-    if(_no_user_buf) {
+    if (_no_user_buf) {
         /* If the buffer isn't big enough, reallocate it.  Otherwise, go to do strcat. */
-        if(str_to_add && ((ssize_t)(*len - (HDstrlen(buf) + HDstrlen(str_to_add) + 1)) < LIMIT)) {
+        if (str_to_add && ((ssize_t)(*len - (HDstrlen(buf) + HDstrlen(str_to_add) + 1)) < LIMIT)) {
             *len += ((HDstrlen(buf) + HDstrlen(str_to_add) + 1) / INCREMENT + 1) * INCREMENT;
-            buf = (char*)HDrealloc(buf, *len);
-        } else if(!str_to_add && ((ssize_t)(*len - HDstrlen(buf) - 1) < LIMIT)) {
+            buf = (char *)HDrealloc(buf, *len);
+        }
+        else if (!str_to_add && ((ssize_t)(*len - HDstrlen(buf) - 1) < LIMIT)) {
             *len += INCREMENT;
-            buf = (char*)HDrealloc(buf, *len);
+            buf = (char *)HDrealloc(buf, *len);
         }
     }
 
-    if(!buf)
-        goto out;
-
-    if(str_to_add) {
-      /* find the size of the buffer to add */
-      size_str_to_add = HDstrlen(str_to_add);
-      /* find the size of the current buffer */
-      size_str = HDstrlen(buf);
-
-      /* Check to make sure the appended string does not 
-       * extend past the allocated buffer; if it does then truncate the string
-       */
-      if(size_str < *len - 1) {
-	if( size_str + size_str_to_add < *len - 1) {
-	  HDstrncat(buf, str_to_add, size_str_to_add);
-	} else {
-	  HDstrncat(buf, str_to_add, (*len - 1) - size_str);
-	}
-      } else {
-	buf[*len-1] = '\0'; /* buffer is full, null terminate */
-      }
+    if (!buf)
+        goto out;
+
+    if (str_to_add) {
+        /* find the size of the buffer to add */
+        size_str_to_add = HDstrlen(str_to_add);
+        /* find the size of the current buffer */
+        size_str = HDstrlen(buf);
+
+        /* Check to make sure the appended string does not
+         * extend past the allocated buffer; if it does then truncate the string
+         */
+        if (size_str < *len - 1) {
+            if (size_str + size_str_to_add < *len - 1) {
+                HDstrncat(buf, str_to_add, size_str_to_add);
+            }
+            else {
+                HDstrncat(buf, str_to_add, (*len - 1) - size_str);
+            }
+        }
+        else {
+            buf[*len - 1] = '\0'; /* buffer is full, null terminate */
+        }
     }
 
     return buf;
@@ -2309,32 +2180,33 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    indentation
-*
-* Purpose:     Print spaces for indentation
-*
-* Return:      void
-*
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
-*
-* Date:        December 6, 2005
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-static char*
-indentation(size_t x, char* str, hbool_t no_u_buf, size_t *s_len)
-{
-    char        tmp_str[TMP_LEN];
+ * Function:    indentation
+ *
+ * Purpose:     Print spaces for indentation
+ *
+ * Return:      void
+ *
+ * Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+ *
+ * Date:        December 6, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static char *
+indentation(size_t x, char *str, hbool_t no_u_buf, size_t *s_len)
+{
+    char tmp_str[TMP_LEN];
 
     if (x < 80) {
         HDmemset(tmp_str, ' ', x);
-        tmp_str[x]='\0';
-    } else
+        tmp_str[x] = '\0';
+    }
+    else
         HDsnprintf(tmp_str, TMP_LEN, "error: the indentation exceeds the number of cols.");
 
-    if(!(str = realloc_and_append(no_u_buf, s_len, str, tmp_str)))
+    if (!(str = realloc_and_append(no_u_buf, s_len, str, tmp_str)))
         goto out;
 
     return str;
@@ -2344,98 +2216,99 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    print_enum
-*
-* Purpose:     prints the enum data
-*
-* Return:      Success: 0, Failure: -1
-*
-* Programmer:  Raymond Lu
-*
-* Modifications:
-*
-*-----------------------------------------------------------------------*/
-static char*
-print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
+ * Function:    print_enum
+ *
+ * Purpose:     prints the enum data
+ *
+ * Return:      Success: 0, Failure: -1
+ *
+ * Programmer:  Raymond Lu
+ *
+ * Modifications:
+ *
+ *-----------------------------------------------------------------------*/
+static char *
+print_enum(hid_t type, char *str, size_t *str_len, hbool_t no_ubuf, size_t indt)
 {
-    char           **name = NULL;   /*member names                   */
-    unsigned char   *value = NULL;  /*value array                    */
-    int              nmembs;        /*number of members              */
-    char             tmp_str[TMP_LEN];
-    int              nchars;        /*number of output characters    */
-    hid_t            super = -1;    /*enum base integer type         */
-    hid_t            native = -1;   /*native integer data type       */
-    size_t           super_size;    /*enum base type size            */
-    size_t           dst_size;      /*destination value type size    */
-    int              i;
+    char **        name  = NULL; /*member names                   */
+    unsigned char *value = NULL; /*value array                    */
+    int            nmembs;       /*number of members              */
+    char           tmp_str[TMP_LEN];
+    int            nchars;      /*number of output characters    */
+    hid_t          super  = -1; /*enum base integer type         */
+    hid_t          native = -1; /*native integer data type       */
+    size_t         super_size;  /*enum base type size            */
+    size_t         dst_size;    /*destination value type size    */
+    int            i;
 
-    if((nmembs = H5Tget_nmembers(type))<=0)
+    if ((nmembs = H5Tget_nmembers(type)) <= 0)
         goto out;
 
-    if((super = H5Tget_super(type)) < 0)
+    if ((super = H5Tget_super(type)) < 0)
         goto out;
 
     /* Use buffer of INT or UNSIGNED INT to print enum values because
-    * we don't expect these values to be so big that INT or UNSIGNED
-    * INT can't hold.
-    */
+     * we don't expect these values to be so big that INT or UNSIGNED
+     * INT can't hold.
+     */
     if (H5T_SGN_NONE == H5Tget_sign(super)) {
         native = H5T_NATIVE_UINT;
-    } else {
+    }
+    else {
         native = H5T_NATIVE_INT;
     }
 
     super_size = H5Tget_size(super);
-    dst_size = H5Tget_size(native);
+    dst_size   = H5Tget_size(native);
 
     /* Get the names and raw values of all members */
-    name = (char**)HDcalloc((size_t)nmembs, sizeof(char *));
-    value = (unsigned char*)HDcalloc((size_t)nmembs, MAX(dst_size, super_size));
+    name  = (char **)HDcalloc((size_t)nmembs, sizeof(char *));
+    value = (unsigned char *)HDcalloc((size_t)nmembs, MAX(dst_size, super_size));
 
     for (i = 0; i < nmembs; i++) {
-        if((name[i] = H5Tget_member_name(type, (unsigned)i))==NULL)
+        if ((name[i] = H5Tget_member_name(type, (unsigned)i)) == NULL)
             goto out;
-        if(H5Tget_member_value(type, (unsigned)i, value + (size_t)i * super_size) < 0)
+        if (H5Tget_member_value(type, (unsigned)i, value + (size_t)i * super_size) < 0)
             goto out;
     }
 
     /* Convert values to native data type */
     if (native > 0) {
-        if(H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0)
+        if (H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0)
             goto out;
     }
 
     /*
-    * Sort members by increasing value
-    *    ***not implemented yet***
-    */
+     * Sort members by increasing value
+     *    ***not implemented yet***
+     */
 
     /* Print members */
     for (i = 0; i < nmembs; i++) {
-        if(!(str = indentation(indt + COL, str, no_ubuf, str_len)))
+        if (!(str = indentation(indt + COL, str, no_ubuf, str_len)))
             goto out;
         nchars = HDsnprintf(tmp_str, TMP_LEN, "\"%s\"", name[i]);
-        if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
+        if (!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
             goto out;
         HDmemset(tmp_str, ' ', (size_t)MAX(3, 19 - nchars) + 1);
         tmp_str[MAX(3, 19 - nchars)] = '\0';
-        if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
+        if (!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
             goto out;
 
         if (H5T_SGN_NONE == H5Tget_sign(native))
             HDsnprintf(tmp_str, TMP_LEN, "%u", *((unsigned int *)((void *)(value + (size_t)i * dst_size))));
         else
             HDsnprintf(tmp_str, TMP_LEN, "%d", *((int *)((void *)(value + (size_t)i * dst_size))));
-        if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
+        if (!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
             goto out;
 
         HDsnprintf(tmp_str, TMP_LEN, ";\n");
-        if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
+        if (!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
             goto out;
     }
 
     /* Release resources */
-    for(i = 0; i < nmembs; i++)
+    for (i = 0; i < nmembs; i++)
         H5free_memory(name[i]);
 
     HDfree(name);
@@ -2446,71 +2319,73 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
 
 out:
 
-    if(0 == nmembs) {
+    if (0 == nmembs) {
         str = realloc_and_append(no_ubuf, str_len, str, "\n");
         HDassert((indt + 4) < TMP_LEN);
         HDmemset(tmp_str, ' ', (indt + 4) + 1);
         tmp_str[(indt + 4)] = '\0';
-        str = realloc_and_append(no_ubuf, str_len, str, tmp_str);
-        str = realloc_and_append(no_ubuf, str_len, str, " <empty>");
+        str                 = realloc_and_append(no_ubuf, str_len, str, tmp_str);
+        str                 = realloc_and_append(no_ubuf, str_len, str, " <empty>");
     } /* end if */
 
     /* Release resources */
-    if(name) {
-        for(i = 0; i < nmembs; i++)
-            if(name[i])
+    if (name) {
+        for (i = 0; i < nmembs; i++)
+            if (name[i])
                 HDfree(name[i]);
         HDfree(name);
     } /* end if */
 
-    if(value)
+    if (value)
         HDfree(value);
 
-    if(super >= 0)
+    if (super >= 0)
         H5Tclose(super);
 
     return NULL;
 }
 
 /*-------------------------------------------------------------------------
-* Function:    H5LTdtype_to_text
-*
-* Purpose:     Convert HDF5 data type to DDL description.
-*
-* Return:      Success: 0, Failure: -1
-*
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
-*
-* Date:        December 6, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len)
+ * Function:    H5LTdtype_to_text
+ *
+ * Purpose:     Convert HDF5 data type to DDL description.
+ *
+ * Return:      Success: 0, Failure: -1
+ *
+ * Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+ *
+ * Date:        December 6, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len)
 {
-    size_t      str_len = INCREMENT;
-    char        *text_str;
-    herr_t      ret = SUCCEED;
+    size_t str_len = INCREMENT;
+    char * text_str;
+    herr_t ret = SUCCEED;
 
-    if(lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
+    if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
         goto out;
 
-    if(len && !str) {
-        text_str = (char*)HDcalloc(str_len, sizeof(char));
-        text_str[0]='\0';
-        if(!(text_str = H5LT_dtype_to_text(dtype, text_str, lang_type, &str_len, 1)))
+    if (len && !str) {
+        text_str    = (char *)HDcalloc(str_len, sizeof(char));
+        text_str[0] = '\0';
+        if (!(text_str = H5LT_dtype_to_text(dtype, text_str, lang_type, &str_len, 1)))
             goto out;
         *len = HDstrlen(text_str) + 1;
-        if(text_str)
+        if (text_str)
             HDfree(text_str);
         text_str = NULL;
-    } else if(len && str) {
-        if(!(H5LT_dtype_to_text(dtype, str, lang_type, len, 0)))
+    }
+    else if (len && str) {
+        if (!(H5LT_dtype_to_text(dtype, str, lang_type, len, 0)))
             goto out;
-        str[*len-1] = '\0';
+        str[*len - 1] = '\0';
     }
 
     return ret;
@@ -2520,38 +2395,38 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    H5LT_dtype_to_text
-*
-* Purpose:     Private function to convert HDF5 data type to DDL description.
-*
-* Return:      Success: 0, Failure: -1
-*
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
-*
-* Date:        December 20, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen,
-                          hbool_t no_user_buf)
+ * Function:    H5LT_dtype_to_text
+ *
+ * Purpose:     Private function to convert HDF5 data type to DDL description.
+ *
+ * Return:      Success: 0, Failure: -1
+ *
+ * Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+ *
+ * Date:        December 20, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen, hbool_t no_user_buf)
 {
     H5T_class_t tcls;
     char        tmp_str[TMP_LEN];
     int         i;
 
-    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, NULL)))
+    if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, NULL)))
         goto out;
-    
-    if(lang != H5LT_DDL) {
+
+    if (lang != H5LT_DDL) {
         HDsnprintf(dt_str, *slen, "only DDL is supported for now");
         goto out;
     }
 
-    if((tcls = H5Tget_class(dtype)) < 0)
+    if ((tcls = H5Tget_class(dtype)) < 0)
         goto out;
 
     switch (tcls) {
@@ -2559,57 +2434,83 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
         case H5T_BITFIELD:
             if (H5Tequal(dtype, H5T_STD_I8BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I8BE");
-            } else if (H5Tequal(dtype, H5T_STD_I8LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I8LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I8LE");
-            } else if (H5Tequal(dtype, H5T_STD_I16BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I16BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I16BE");
-            } else if (H5Tequal(dtype, H5T_STD_I16LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I16LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I16LE");
-            } else if (H5Tequal(dtype, H5T_STD_I32BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I32BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I32BE");
-            } else if (H5Tequal(dtype, H5T_STD_I32LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I32LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I32LE");
-            } else if (H5Tequal(dtype, H5T_STD_I64BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I64BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I64BE");
-            } else if (H5Tequal(dtype, H5T_STD_I64LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_I64LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I64LE");
-            } else if (H5Tequal(dtype, H5T_STD_U8BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U8BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U8BE");
-            } else if (H5Tequal(dtype, H5T_STD_U8LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U8LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U8LE");
-            } else if (H5Tequal(dtype, H5T_STD_U16BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U16BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U16BE");
-            } else if (H5Tequal(dtype, H5T_STD_U16LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U16LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U16LE");
-            } else if (H5Tequal(dtype, H5T_STD_U32BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U32BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U32BE");
-            } else if (H5Tequal(dtype, H5T_STD_U32LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U32LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U32LE");
-            } else if (H5Tequal(dtype, H5T_STD_U64BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U64BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U64BE");
-            } else if (H5Tequal(dtype, H5T_STD_U64LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_STD_U64LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_U64LE");
-            } else if (H5Tequal(dtype, H5T_NATIVE_SCHAR)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_SCHAR)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_SCHAR");
-            } else if (H5Tequal(dtype, H5T_NATIVE_UCHAR)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_UCHAR)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_UCHAR");
-            } else if (H5Tequal(dtype, H5T_NATIVE_SHORT)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_SHORT)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_SHORT");
-            } else if (H5Tequal(dtype, H5T_NATIVE_USHORT)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_USHORT)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_USHORT");
-            } else if (H5Tequal(dtype, H5T_NATIVE_INT)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_INT)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_INT");
-            } else if (H5Tequal(dtype, H5T_NATIVE_UINT)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_UINT)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_UINT");
-            } else if (H5Tequal(dtype, H5T_NATIVE_LONG)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_LONG)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_LONG");
-            } else if (H5Tequal(dtype, H5T_NATIVE_ULONG)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_ULONG)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_ULONG");
-            } else if (H5Tequal(dtype, H5T_NATIVE_LLONG)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_LLONG)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_LLONG");
-            } else if (H5Tequal(dtype, H5T_NATIVE_ULLONG)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_ULLONG)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_ULLONG");
-            } else {
+            }
+            else {
                 HDsnprintf(dt_str, *slen, "undefined integer");
             }
 
@@ -2617,439 +2518,445 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
         case H5T_FLOAT:
             if (H5Tequal(dtype, H5T_IEEE_F32BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_IEEE_F32BE");
-            } else if (H5Tequal(dtype, H5T_IEEE_F32LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_IEEE_F32LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_IEEE_F32LE");
-            } else if (H5Tequal(dtype, H5T_IEEE_F64BE)) {
+            }
+            else if (H5Tequal(dtype, H5T_IEEE_F64BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_IEEE_F64BE");
-            } else if (H5Tequal(dtype, H5T_IEEE_F64LE)) {
+            }
+            else if (H5Tequal(dtype, H5T_IEEE_F64LE)) {
                 HDsnprintf(dt_str, *slen, "H5T_IEEE_F64LE");
-            } else if (H5Tequal(dtype, H5T_NATIVE_FLOAT)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_FLOAT)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_FLOAT");
-            } else if (H5Tequal(dtype, H5T_NATIVE_DOUBLE)) {
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_DOUBLE)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_DOUBLE");
-#if H5_SIZEOF_LONG_DOUBLE !=0
-            } else if (H5Tequal(dtype, H5T_NATIVE_LDOUBLE)) {
+#if H5_SIZEOF_LONG_DOUBLE != 0
+            }
+            else if (H5Tequal(dtype, H5T_NATIVE_LDOUBLE)) {
                 HDsnprintf(dt_str, *slen, "H5T_NATIVE_LDOUBLE");
 #endif
-            } else {
+            }
+            else {
                 HDsnprintf(dt_str, *slen, "undefined float");
             }
 
             break;
-        case H5T_STRING:
-            {
-                /* Make a copy of type in memory in case when DTYPE is on disk, the size
-                * will be bigger than in memory.  This makes it easier to compare
-                * types in memory. */
-                hid_t str_type;
-                H5T_order_t order;
-                hid_t tmp_type;
-                size_t size;
-                H5T_str_t str_pad;
-                H5T_cset_t cset;
-                htri_t is_vlstr;
-
-                if((tmp_type = H5Tcopy(dtype)) < 0)
-                    goto out;
-                if((size = H5Tget_size(tmp_type))==0)
-                    goto out;
-                if((str_pad = H5Tget_strpad(tmp_type)) < 0)
-                    goto out;
-                if((cset = H5Tget_cset(tmp_type)) < 0)
-                    goto out;
-                if((is_vlstr = H5Tis_variable_str(tmp_type)) < 0)
-                    goto out;
+        case H5T_STRING: {
+            /* Make a copy of type in memory in case when DTYPE is on disk, the size
+             * will be bigger than in memory.  This makes it easier to compare
+             * types in memory. */
+            hid_t       str_type;
+            H5T_order_t order;
+            hid_t       tmp_type;
+            size_t      size;
+            H5T_str_t   str_pad;
+            H5T_cset_t  cset;
+            htri_t      is_vlstr;
+
+            if ((tmp_type = H5Tcopy(dtype)) < 0)
+                goto out;
+            if ((size = H5Tget_size(tmp_type)) == 0)
+                goto out;
+            if ((str_pad = H5Tget_strpad(tmp_type)) < 0)
+                goto out;
+            if ((cset = H5Tget_cset(tmp_type)) < 0)
+                goto out;
+            if ((is_vlstr = H5Tis_variable_str(tmp_type)) < 0)
+                goto out;
 
-                /* Print lead-in */
-                HDsnprintf(dt_str, *slen, "H5T_STRING {\n");
-                indent += COL;
+            /* Print lead-in */
+            HDsnprintf(dt_str, *slen, "H5T_STRING {\n");
+            indent += COL;
 
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                if(is_vlstr)
-                    HDsnprintf(tmp_str, TMP_LEN, "STRSIZE H5T_VARIABLE;\n");
-                else
-                    HDsnprintf(tmp_str, TMP_LEN, "STRSIZE %d;\n", (int)size);
+            if (is_vlstr)
+                HDsnprintf(tmp_str, TMP_LEN, "STRSIZE H5T_VARIABLE;\n");
+            else
+                HDsnprintf(tmp_str, TMP_LEN, "STRSIZE %d;\n", (int)size);
 
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                if (str_pad == H5T_STR_NULLTERM)
-                    HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_NULLTERM;\n");
-                else if (str_pad == H5T_STR_NULLPAD)
-                    HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_NULLPAD;\n");
-                else if (str_pad == H5T_STR_SPACEPAD)
-                    HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_SPACEPAD;\n");
-                else
-                    HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_ERROR;\n");
+            if (str_pad == H5T_STR_NULLTERM)
+                HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_NULLTERM;\n");
+            else if (str_pad == H5T_STR_NULLPAD)
+                HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_NULLPAD;\n");
+            else if (str_pad == H5T_STR_SPACEPAD)
+                HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_SPACEPAD;\n");
+            else
+                HDsnprintf(tmp_str, TMP_LEN, "STRPAD H5T_STR_ERROR;\n");
 
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                if (cset == H5T_CSET_ASCII)
-                    HDsnprintf(tmp_str, TMP_LEN, "CSET H5T_CSET_ASCII;\n");
-                else if (cset == H5T_CSET_UTF8)
-                    HDsnprintf(tmp_str, TMP_LEN, "CSET H5T_CSET_UTF8;\n");
-                else
-                    HDsnprintf(tmp_str, TMP_LEN, "CSET unknown;\n");
+            if (cset == H5T_CSET_ASCII)
+                HDsnprintf(tmp_str, TMP_LEN, "CSET H5T_CSET_ASCII;\n");
+            else if (cset == H5T_CSET_UTF8)
+                HDsnprintf(tmp_str, TMP_LEN, "CSET H5T_CSET_UTF8;\n");
+            else
+                HDsnprintf(tmp_str, TMP_LEN, "CSET unknown;\n");
 
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                /* Reproduce a C type string */
-                if((str_type = H5Tcopy(H5T_C_S1)) < 0)
-                    goto out;
-                if(is_vlstr) {
-                    if(H5Tset_size(str_type, H5T_VARIABLE) < 0)
-                        goto out;
-                } else {
-                    if(H5Tset_size(str_type, size) < 0)
-                        goto out;
-                }
-                if(H5Tset_cset(str_type, cset) < 0)
+            /* Reproduce a C type string */
+            if ((str_type = H5Tcopy(H5T_C_S1)) < 0)
+                goto out;
+            if (is_vlstr) {
+                if (H5Tset_size(str_type, H5T_VARIABLE) < 0)
                     goto out;
-                if(H5Tset_strpad(str_type, str_pad) < 0)
+            }
+            else {
+                if (H5Tset_size(str_type, size) < 0)
                     goto out;
+            }
+            if (H5Tset_cset(str_type, cset) < 0)
+                goto out;
+            if (H5Tset_strpad(str_type, str_pad) < 0)
+                goto out;
 
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                /* Check C variable-length string first. Are the two types equal? */
-                if (H5Tequal(tmp_type, str_type)) {
-                    HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_C_S1;\n");
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                    goto next;
-                }
+            /* Check C variable-length string first. Are the two types equal? */
+            if (H5Tequal(tmp_type, str_type)) {
+                HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_C_S1;\n");
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                    goto out;
+                goto next;
+            }
 
-                /* Change the endianness and see if they're equal. */
-                if((order = H5Tget_order(tmp_type)) < 0)
+            /* Change the endianness and see if they're equal. */
+            if ((order = H5Tget_order(tmp_type)) < 0)
+                goto out;
+            if (order == H5T_ORDER_LE) {
+                if (H5Tset_order(str_type, H5T_ORDER_LE) < 0)
                     goto out;
-                if(order==H5T_ORDER_LE) {
-                    if(H5Tset_order(str_type, H5T_ORDER_LE) < 0)
-                        goto out;
-                } else if(order==H5T_ORDER_BE) {
-                    if(H5Tset_order(str_type, H5T_ORDER_BE) < 0)
-                        goto out;
-                }
-
-                if (H5Tequal(tmp_type, str_type)) {
-                    HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_C_S1;\n");
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                    goto next;
-                }
-
-                /* If not equal to C variable-length string, check Fortran type.
-                * Actually H5Tequal can't tell difference between H5T_C_S1 and H5T_FORTRAN_S1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-                if(H5Tclose(str_type) < 0)
+            }
+            else if (order == H5T_ORDER_BE) {
+                if (H5Tset_order(str_type, H5T_ORDER_BE) < 0)
                     goto out;
-                if((str_type = H5Tcopy(H5T_FORTRAN_S1)) < 0)
+            }
+
+            if (H5Tequal(tmp_type, str_type)) {
+                HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_C_S1;\n");
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                     goto out;
-                if(H5Tset_cset(str_type, cset) < 0)
+                goto next;
+            }
+
+            /* If not equal to C variable-length string, check Fortran type.
+             * Actually H5Tequal can't tell difference between H5T_C_S1 and
+             * H5T_FORTRAN_S1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+            if (H5Tclose(str_type) < 0)
+                goto out;
+            if ((str_type = H5Tcopy(H5T_FORTRAN_S1)) < 0)
+                goto out;
+            if (H5Tset_cset(str_type, cset) < 0)
+                goto out;
+            if (H5Tset_size(str_type, size) < 0)
+                goto out;
+            if (H5Tset_strpad(str_type, str_pad) < 0)
+                goto out;
+
+            /* Are the two types equal? */
+            if (H5Tequal(tmp_type, str_type)) {
+                HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_FORTRAN_S1;\n");
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                     goto out;
-                if(H5Tset_size(str_type, size) < 0)
+                goto next;
+            }
+
+            /* Change the endianness and see if they're equal. */
+            if ((order = H5Tget_order(tmp_type)) < 0)
+                goto out;
+            if (order == H5T_ORDER_LE) {
+                if (H5Tset_order(str_type, H5T_ORDER_LE) < 0)
                     goto out;
-                if(H5Tset_strpad(str_type, str_pad) < 0)
+            }
+            else if (order == H5T_ORDER_BE) {
+                if (H5Tset_order(str_type, H5T_ORDER_BE) < 0)
                     goto out;
+            }
 
-                /* Are the two types equal? */
-                if (H5Tequal(tmp_type, str_type)) {
-                    HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_FORTRAN_S1;\n");
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                    goto next;
-                }
-
-                /* Change the endianness and see if they're equal. */
-                if((order = H5Tget_order(tmp_type)) < 0)
-                    goto out;
-                if(order==H5T_ORDER_LE) {
-                    if(H5Tset_order(str_type, H5T_ORDER_LE) < 0)
-                        goto out;
-                } else if(order==H5T_ORDER_BE) {
-                    if(H5Tset_order(str_type, H5T_ORDER_BE) < 0)
-                        goto out;
-                }
-
-                /* Are the two types equal? */
-                if (H5Tequal(tmp_type, str_type)) {
-                    HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_FORTRAN_S1;\n");
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                    goto next;
-                }
-
-                /* Type doesn't match any of above. */
-                HDsnprintf(tmp_str, TMP_LEN, "CTYPE unknown_one_character_type;\n");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+            /* Are the two types equal? */
+            if (H5Tequal(tmp_type, str_type)) {
+                HDsnprintf(tmp_str, TMP_LEN, "CTYPE H5T_FORTRAN_S1;\n");
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                     goto out;
+                goto next;
+            }
+
+            /* Type doesn't match any of above. */
+            HDsnprintf(tmp_str, TMP_LEN, "CTYPE unknown_one_character_type;\n");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
 next:
-                H5Tclose(str_type);
-                H5Tclose(tmp_type);
+            H5Tclose(str_type);
+            H5Tclose(tmp_type);
 
-                /* Print closing */
-                indent -= COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
-                HDsnprintf(tmp_str, TMP_LEN, "}");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            /* Print closing */
+            indent -= COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+            HDsnprintf(tmp_str, TMP_LEN, "}");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                break;
-            }
-        case H5T_OPAQUE:
-            {
+            break;
+        }
+        case H5T_OPAQUE: {
             char *tag = NULL;
 
             /* Print lead-in */
             HDsnprintf(dt_str, *slen, "H5T_OPAQUE {\n");
             indent += COL;
 
-            if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
                 goto out;
             HDsnprintf(tmp_str, TMP_LEN, "OPQ_SIZE %lu;\n", (unsigned long)H5Tget_size(dtype));
-            if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                 goto out;
 
-            if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
                 goto out;
             tag = H5Tget_tag(dtype);
-            if(tag) {
+            if (tag) {
                 HDsnprintf(tmp_str, TMP_LEN, "OPQ_TAG \"%s\";\n", tag);
-                if(tag)
+                if (tag)
                     H5free_memory(tag);
                 tag = NULL;
-            } else
+            }
+            else
                 HDsnprintf(tmp_str, TMP_LEN, "OPQ_TAG \"\";\n");
-            if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                 goto out;
 
             /* Print closing */
             indent -= COL;
-            if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
                 goto out;
             HDsnprintf(tmp_str, TMP_LEN, "}");
-            if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                 goto out;
 
             break;
-            }
-        case H5T_ENUM:
-            {
-                hid_t super;
-                size_t super_len;
-                char* stmp = NULL;
-
-                /* Print lead-in */
-                HDsnprintf(dt_str, *slen, "H5T_ENUM {\n");
-                indent += COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+        }
+        case H5T_ENUM: {
+            hid_t  super;
+            size_t super_len;
+            char * stmp = NULL;
 
-                if((super = H5Tget_super(dtype)) < 0)
-                    goto out;
-                if(H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
-                    goto out;
-                stmp = (char*)HDcalloc(super_len, sizeof(char));
-                if(H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
-                     goto out;
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
-                    goto out;
+            /* Print lead-in */
+            HDsnprintf(dt_str, *slen, "H5T_ENUM {\n");
+            indent += COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                if(stmp)
-                    HDfree(stmp);
-                stmp = NULL;
+            if ((super = H5Tget_super(dtype)) < 0)
+                goto out;
+            if (H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
+                goto out;
+            stmp = (char *)HDcalloc(super_len, sizeof(char));
+            if (H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
+                goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
+                goto out;
 
-                HDsnprintf(tmp_str, TMP_LEN, ";\n");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
-                H5Tclose(super);
+            if (stmp)
+                HDfree(stmp);
+            stmp = NULL;
 
-                if(!(dt_str = print_enum(dtype, dt_str, slen, no_user_buf, indent)))
-                    goto out;
+            HDsnprintf(tmp_str, TMP_LEN, ";\n");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+            H5Tclose(super);
 
-                /* Print closing */
-                indent -= COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
-                HDsnprintf(tmp_str, TMP_LEN, "}");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            if (!(dt_str = print_enum(dtype, dt_str, slen, no_user_buf, indent)))
+                goto out;
 
-                break;
-            }
-        case H5T_VLEN:
-            {
-                hid_t super;
-                size_t super_len;
-                char* stmp = NULL;
-
-                /* Print lead-in */
-                HDsnprintf(dt_str, *slen, "H5T_VLEN {\n");
-                indent += COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
+            /* Print closing */
+            indent -= COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+            HDsnprintf(tmp_str, TMP_LEN, "}");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                if((super = H5Tget_super(dtype)) < 0)
-                    goto out;
-                if(H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
-                    goto out;
-                stmp = (char*)HDcalloc(super_len, sizeof(char));
-                if(H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
-                    goto out;
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
-                    goto out;
+            break;
+        }
+        case H5T_VLEN: {
+            hid_t  super;
+            size_t super_len;
+            char * stmp = NULL;
 
-                if(stmp)
-                    HDfree(stmp);
-                stmp = NULL;
-                HDsnprintf(tmp_str, TMP_LEN, "\n");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
-                H5Tclose(super);
+            /* Print lead-in */
+            HDsnprintf(dt_str, *slen, "H5T_VLEN {\n");
+            indent += COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
 
-                /* Print closing */
-                indent -= COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                    goto out;
-                HDsnprintf(tmp_str, TMP_LEN, "}");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                    goto out;
+            if ((super = H5Tget_super(dtype)) < 0)
+                goto out;
+            if (H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
+                goto out;
+            stmp = (char *)HDcalloc(super_len, sizeof(char));
+            if (H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
+                goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
+                goto out;
 
-                break;
-            }
-        case H5T_ARRAY:
-            {
-                hid_t       super;
-                size_t      super_len;
-                char*       stmp = NULL;
-                hsize_t     dims[H5S_MAX_RANK];
-                int         ndims;
-
-                /* Print lead-in */
-                HDsnprintf(dt_str, *slen, "H5T_ARRAY {\n");
-                indent += COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+            if (stmp)
+                HDfree(stmp);
+            stmp = NULL;
+            HDsnprintf(tmp_str, TMP_LEN, "\n");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+            H5Tclose(super);
+
+            /* Print closing */
+            indent -= COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+            HDsnprintf(tmp_str, TMP_LEN, "}");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+
+            break;
+        }
+        case H5T_ARRAY: {
+            hid_t   super;
+            size_t  super_len;
+            char *  stmp = NULL;
+            hsize_t dims[H5S_MAX_RANK];
+            int     ndims;
+
+            /* Print lead-in */
+            HDsnprintf(dt_str, *slen, "H5T_ARRAY {\n");
+            indent += COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+
+            /* Get array information */
+            if ((ndims = H5Tget_array_ndims(dtype)) < 0)
+                goto out;
+            if (H5Tget_array_dims2(dtype, dims) < 0)
+                goto out;
+
+            /* Print array dimensions */
+            for (i = 0; i < ndims; i++) {
+                HDsnprintf(tmp_str, TMP_LEN, "[%d]", (int)dims[i]);
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                     goto out;
+            }
+            HDsnprintf(tmp_str, TMP_LEN, " ");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+
+            if ((super = H5Tget_super(dtype)) < 0)
+                goto out;
+            if (H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
+                goto out;
+            stmp = (char *)HDcalloc(super_len, sizeof(char));
+            if (H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
+                goto out;
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
+                goto out;
+            if (stmp)
+                HDfree(stmp);
+            stmp = NULL;
+            HDsnprintf(tmp_str, TMP_LEN, "\n");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+            H5Tclose(super);
+
+            /* Print closing */
+            indent -= COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+            HDsnprintf(tmp_str, TMP_LEN, "}");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
 
-                /* Get array information */
-                if((ndims = H5Tget_array_ndims(dtype)) < 0)
+            break;
+        }
+        case H5T_COMPOUND: {
+            char *      mname = NULL;
+            hid_t       mtype;
+            size_t      moffset;
+            H5T_class_t mclass;
+            size_t      mlen;
+            char *      mtmp = NULL;
+            int         nmembs;
+
+            if ((nmembs = H5Tget_nmembers(dtype)) < 0)
+                goto out;
+
+            HDsnprintf(dt_str, *slen, "H5T_COMPOUND {\n");
+            indent += COL;
+
+            for (i = 0; i < nmembs; i++) {
+                if ((mname = H5Tget_member_name(dtype, (unsigned)i)) == NULL)
+                    goto out;
+                if ((mtype = H5Tget_member_type(dtype, (unsigned)i)) < 0)
                     goto out;
-                if(H5Tget_array_dims2(dtype, dims) < 0)
+                moffset = H5Tget_member_offset(dtype, (unsigned)i);
+                if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
                     goto out;
 
-                /* Print array dimensions */
-                for (i = 0; i < ndims; i++) {
-                    HDsnprintf(tmp_str, TMP_LEN, "[%d]", (int) dims[i]);
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                }
-                HDsnprintf(tmp_str, TMP_LEN, " ");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-
-                if((super = H5Tget_super(dtype)) < 0)
+                if ((mclass = H5Tget_class(mtype)) < 0)
                     goto out;
-                if(H5LTdtype_to_text(super, NULL, lang, &super_len) < 0)
+                if (H5T_COMPOUND == mclass)
+                    indent += COL;
+
+                if (H5LTdtype_to_text(mtype, NULL, lang, &mlen) < 0)
                     goto out;
-                stmp = (char*)HDcalloc(super_len, sizeof(char));
-                if(H5LTdtype_to_text(super, stmp, lang, &super_len) < 0)
+                mtmp = (char *)HDcalloc(mlen, sizeof(char));
+                if (H5LTdtype_to_text(mtype, mtmp, lang, &mlen) < 0)
                     goto out;
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, stmp)))
-                        goto out;
-                if(stmp)
-                    HDfree(stmp);
-                stmp = NULL;
-                HDsnprintf(tmp_str, TMP_LEN, "\n");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                H5Tclose(super);
-
-                /* Print closing */
-                indent -= COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, mtmp)))
                     goto out;
-                HDsnprintf(tmp_str, TMP_LEN, "}");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
+                if (mtmp)
+                    HDfree(mtmp);
+                mtmp = NULL;
 
-                break;
-            }
-        case H5T_COMPOUND:
-            {
-                char       *mname = NULL;
-                hid_t       mtype;
-                size_t      moffset;
-                H5T_class_t mclass;
-                size_t      mlen;
-                char*       mtmp = NULL;
-                int         nmembs;
-
-                if((nmembs = H5Tget_nmembers(dtype)) < 0)
-                    goto out;
+                if (H5T_COMPOUND == mclass)
+                    indent -= COL;
 
-                HDsnprintf(dt_str, *slen, "H5T_COMPOUND {\n");
-                indent += COL;
-
-                for (i = 0; i < nmembs; i++) {
-                    if((mname = H5Tget_member_name(dtype, (unsigned)i))==NULL)
-                        goto out;
-                    if((mtype = H5Tget_member_type(dtype, (unsigned)i)) < 0)
-                        goto out;
-                    moffset = H5Tget_member_offset(dtype, (unsigned)i);
-                    if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
-                        goto out;
-
-                    if((mclass = H5Tget_class(mtype)) < 0)
-                        goto out;
-                    if (H5T_COMPOUND == mclass)
-                        indent += COL;
-
-                    if(H5LTdtype_to_text(mtype, NULL, lang, &mlen) < 0)
-                        goto out;
-                    mtmp = (char*)HDcalloc(mlen, sizeof(char));
-                    if(H5LTdtype_to_text(mtype, mtmp, lang, &mlen) < 0)
-                        goto out;
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, mtmp)))
-                        goto out;
-                    if(mtmp)
-                        HDfree(mtmp);
-                    mtmp = NULL;
-
-                    if (H5T_COMPOUND == mclass)
-                        indent -= COL;
-
-                    HDsnprintf(tmp_str, TMP_LEN, " \"%s\"", mname);
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                    if(mname)
-                        H5free_memory(mname);
-                    mname = NULL;
-
-                    HDsnprintf(tmp_str, TMP_LEN, " : %lu;\n", (unsigned long)moffset);
-                    if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
-                }
-
-                /* Print closing */
-                indent -= COL;
-                if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                HDsnprintf(tmp_str, TMP_LEN, " \"%s\"", mname);
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
                     goto out;
-                HDsnprintf(tmp_str, TMP_LEN, "}");
-                if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
-                        goto out;
+                if (mname)
+                    H5free_memory(mname);
+                mname = NULL;
 
-                break;
+                HDsnprintf(tmp_str, TMP_LEN, " : %lu;\n", (unsigned long)moffset);
+                if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                    goto out;
             }
+
+            /* Print closing */
+            indent -= COL;
+            if (!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
+                goto out;
+            HDsnprintf(tmp_str, TMP_LEN, "}");
+            if (!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
+                goto out;
+
+            break;
+        }
         case H5T_TIME:
             HDsnprintf(dt_str, *slen, "H5T_TIME: not yet implemented");
             break;
@@ -3057,15 +2964,15 @@ next:
             HDsnprintf(dt_str, *slen, "H5T_NO_CLASS");
             break;
         case H5T_REFERENCE:
-	    if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
-	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
-	    }
-	    else {
-	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
-	    }
-	    break;
+            if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
+            }
+            else {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
+            }
+            break;
         case H5T_NCLASSES:
-	    break;
+            break;
         default:
             HDsnprintf(dt_str, *slen, "unknown data type");
     }
@@ -3077,747 +2984,701 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-*
-* Get attribute functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Get attribute functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Function: H5LTget_attribute_string
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-/*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_string
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-
-herr_t H5LTget_attribute_string( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                char *data )
+herr_t
+H5LTget_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name, char *data)
 {
     /* identifiers */
-    hid_t      obj_id;
+    hid_t obj_id;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
 
     /* Open the object */
-    if ((obj_id = H5Oopen( loc_id, obj_name, H5P_DEFAULT)) < 0)
+    if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Get the attribute */
-    if ( H5LT_get_attribute_disk( obj_id, attr_name, data ) < 0 ) 
-    {
-      H5Oclose(obj_id); 
-      return -1;
+    if (H5LT_get_attribute_disk(obj_id, attr_name, data) < 0) {
+        H5Oclose(obj_id);
+        return -1;
     }
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0)
+    if (H5Oclose(obj_id) < 0)
         return -1;
 
     return 0;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_char
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_char( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              char *data )
+ * Function: H5LTget_attribute_char
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_char(hid_t loc_id, const char *obj_name, const char *attr_name, char *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_CHAR, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_CHAR, data) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_uchar
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_uchar( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               unsigned char *data )
+ * Function: H5LTget_attribute_uchar
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_uchar(hid_t loc_id, const char *obj_name, const char *attr_name, unsigned char *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_UCHAR, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_UCHAR, data) < 0)
         return -1;
 
     return 0;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_short
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_short( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               short *data )
+ * Function: H5LTget_attribute_short
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_short(hid_t loc_id, const char *obj_name, const char *attr_name, short *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_SHORT, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_SHORT, data) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_ushort
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_ushort( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                unsigned short *data )
+ * Function: H5LTget_attribute_ushort
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_ushort(hid_t loc_id, const char *obj_name, const char *attr_name, unsigned short *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_USHORT, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_USHORT, data) < 0)
         return -1;
 
     return 0;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_int
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_int( hid_t loc_id,
-                             const char *obj_name,
-                             const char *attr_name,
-                             int *data )
+ * Function: H5LTget_attribute_int
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name, int *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_INT, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_INT, data) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_uint
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_uint( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              unsigned int *data )
+ * Function: H5LTget_attribute_uint
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_uint(hid_t loc_id, const char *obj_name, const char *attr_name, unsigned int *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_UINT, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_UINT, data) < 0)
         return -1;
 
     return 0;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_long
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_long( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              long *data )
+ * Function: H5LTget_attribute_long
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_long(hid_t loc_id, const char *obj_name, const char *attr_name, long *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LONG, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LONG, data) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_long_long
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
-*
-* Date: June 17, 2005
-*
-* Comments: This function was added to support INTEGER*8 Fortran types
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_long_long( hid_t loc_id,
-                                   const char *obj_name,
-                                   const char *attr_name,
-                                   long long *data )
+ * Function: H5LTget_attribute_long_long
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
+ *
+ * Date: June 17, 2005
+ *
+ * Comments: This function was added to support INTEGER*8 Fortran types
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_long_long(hid_t loc_id, const char *obj_name, const char *attr_name, long long *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LLONG, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LLONG, data) < 0)
         return -1;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_ulong
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LTget_attribute_ulong( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               unsigned long *data )
+ * Function: H5LTget_attribute_ulong
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LTget_attribute_ulong(hid_t loc_id, const char *obj_name, const char *attr_name, unsigned long *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_ULONG, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_ULONG, data) < 0)
         return -1;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_float
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_float
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-herr_t H5LTget_attribute_float( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               float *data )
+herr_t
+H5LTget_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name, float *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_FLOAT, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_FLOAT, data) < 0)
         return -1;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_double
-*
-* Purpose: Reads an attribute named attr_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_double
+ *
+ * Purpose: Reads an attribute named attr_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-
-herr_t H5LTget_attribute_double( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                double *data )
+herr_t
+H5LTget_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name, double *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_DOUBLE, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_DOUBLE, data) < 0)
         return -1;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute
-*
-* Purpose: Reads an attribute named attr_name with the memory type mem_type_id
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments: Private function
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTget_attribute
+ *
+ * Purpose: Reads an attribute named attr_name with the memory type mem_type_id
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments: Private function
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LTget_attribute( hid_t loc_id,
-                         const char *obj_name,
-                         const char *attr_name,
-                         hid_t mem_type_id,
-                         void *data )
+herr_t
+H5LTget_attribute(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t mem_type_id, void *data)
 {
     /* Get the attribute */
-    if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, mem_type_id, data) < 0)
+    if (H5LT_get_attribute_mem(loc_id, obj_name, attr_name, mem_type_id, data) < 0)
         return -1;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
-* private functions
-*-------------------------------------------------------------------------
-*/
-
+ * private functions
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Function: H5LT_get_attribute_mem
+ *
+ * Purpose: Reads an attribute named attr_name with the memory type mem_type_id
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments: Private function
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-/*-------------------------------------------------------------------------
-* Function: H5LT_get_attribute_mem
-*
-* Purpose: Reads an attribute named attr_name with the memory type mem_type_id
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments: Private function
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-
-static herr_t H5LT_get_attribute_mem(hid_t loc_id,
-                                     const char *obj_name,
-                                     const char *attr_name,
-                                     hid_t mem_type_id,
-                                     void *data)
+static herr_t
+H5LT_get_attribute_mem(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t mem_type_id,
+                       void *data)
 {
     /* identifiers */
-    hid_t obj_id = -1;
+    hid_t obj_id  = -1;
     hid_t attr_id = -1;
 
     /* check the arguments */
-    if (obj_name == NULL) 
-      return -1;
-    if (attr_name == NULL) 
-      return -1;
+    if (obj_name == NULL)
+        return -1;
+    if (attr_name == NULL)
+        return -1;
 
     /* Open the object */
-    if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
+    if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0)
         goto out;
 
-    if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0)
+    if ((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0)
         goto out;
 
-    if(H5Aread(attr_id, mem_type_id, data) < 0)
+    if (H5Aread(attr_id, mem_type_id, data) < 0)
         goto out;
 
-    if(H5Aclose(attr_id) < 0)
+    if (H5Aclose(attr_id) < 0)
         goto out;
     attr_id = -1;
 
     /* Close the object */
-    if(H5Oclose(obj_id) < 0)
+    if (H5Oclose(obj_id) < 0)
         goto out;
     obj_id = -1;
 
     return 0;
 
 out:
-    if(obj_id > 0)
+    if (obj_id > 0)
         H5Oclose(obj_id);
-    if(attr_id > 0)
+    if (attr_id > 0)
         H5Aclose(attr_id);
     return -1;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LT_get_attribute_disk
-*
-* Purpose: Reads an attribute named attr_name with the datatype stored on disk
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: September 19, 2002
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LT_get_attribute_disk
+ *
+ * Purpose: Reads an attribute named attr_name with the datatype stored on disk
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: September 19, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
 
-herr_t H5LT_get_attribute_disk( hid_t loc_id,
-                               const char *attr_name,
-                               void *attr_out )
+herr_t
+H5LT_get_attribute_disk(hid_t loc_id, const char *attr_name, void *attr_out)
 {
     /* identifiers */
     hid_t attr_id;
     hid_t attr_type;
 
-    if(( attr_id = H5Aopen(loc_id, attr_name, H5P_DEFAULT)) < 0)
+    if ((attr_id = H5Aopen(loc_id, attr_name, H5P_DEFAULT)) < 0)
         return -1;
 
-    if((attr_type = H5Aget_type(attr_id)) < 0)
+    if ((attr_type = H5Aget_type(attr_id)) < 0)
         goto out;
 
-    if(H5Aread(attr_id, attr_type, attr_out) < 0)
+    if (H5Aread(attr_id, attr_type, attr_out) < 0)
         goto out;
 
-    if(H5Tclose(attr_type) < 0)
+    if (H5Tclose(attr_type) < 0)
         goto out;
 
-    if ( H5Aclose( attr_id ) < 0 )
-        return -1;;
+    if (H5Aclose(attr_id) < 0)
+        return -1;
+    ;
 
     return 0;
 
 out:
-    H5Tclose( attr_type );
-    H5Aclose( attr_id );
+    H5Tclose(attr_type);
+    H5Aclose(attr_id);
     return -1;
 }
 
-
-/*-------------------------------------------------------------------------
-* Function: H5LT_set_attribute_string
-*
-* Purpose: creates and writes an attribute named NAME to the dataset DSET_ID
-*
-* Return: FAIL on error, SUCCESS on success
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5LT_set_attribute_string(hid_t dset_id,
-                                 const char *name,
-                                 const char *buf )
+/*-------------------------------------------------------------------------
+ * Function: H5LT_set_attribute_string
+ *
+ * Purpose: creates and writes an attribute named NAME to the dataset DSET_ID
+ *
+ * Return: FAIL on error, SUCCESS on success
+ *
+ * Programmer: pvn@ncsa.uiuc.edu
+ *
+ * Date: January 04, 2005
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5LT_set_attribute_string(hid_t dset_id, const char *name, const char *buf)
 {
-    hid_t   tid;
-    hid_t   sid = -1;
-    hid_t   aid = -1;
-    int     has_attr;
-    size_t  size;
+    hid_t  tid;
+    hid_t  sid = -1;
+    hid_t  aid = -1;
+    int    has_attr;
+    size_t size;
 
     /* verify if the attribute already exists */
-    has_attr = H5LT_find_attribute(dset_id,name);
+    has_attr = H5LT_find_attribute(dset_id, name);
 
     /* the attribute already exists, delete it */
-    if(has_attr == 1)
-        if(H5Adelete(dset_id, name) < 0)
+    if (has_attr == 1)
+        if (H5Adelete(dset_id, name) < 0)
             return FAIL;
 
     /*-------------------------------------------------------------------------
-    * create the attribute type
-    *-------------------------------------------------------------------------
-    */
-    if((tid = H5Tcopy(H5T_C_S1)) < 0)
+     * create the attribute type
+     *-------------------------------------------------------------------------
+     */
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
         return FAIL;
 
     size = HDstrlen(buf) + 1; /* extra null term */
 
-    if(H5Tset_size(tid,(size_t)size) < 0)
+    if (H5Tset_size(tid, (size_t)size) < 0)
         goto out;
 
-    if(H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0)
+    if (H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0)
         goto out;
 
-    if((sid = H5Screate(H5S_SCALAR)) < 0)
+    if ((sid = H5Screate(H5S_SCALAR)) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * create and write the attribute
-    *-------------------------------------------------------------------------
-    */
-    if((aid = H5Acreate2(dset_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+     * create and write the attribute
+     *-------------------------------------------------------------------------
+     */
+    if ((aid = H5Acreate2(dset_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
-    if(H5Awrite(aid, tid, buf) < 0)
+    if (H5Awrite(aid, tid, buf) < 0)
         goto out;
 
-    if(H5Aclose(aid) < 0)
+    if (H5Aclose(aid) < 0)
         goto out;
 
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
-    if(H5Tclose(tid) < 0)
+    if (H5Tclose(tid) < 0)
         goto out;
 
     return SUCCEED;
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Aclose(aid);
         H5Tclose(tid);
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
-
 }
 
 htri_t
 H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
- {
-     char *tmp_path = NULL; /* Temporary copy of the path */
-     char *curr_name;       /* Pointer to current component of path name */
-     char *delimit;         /* Pointer to path delimiter during traversal */
-     H5I_type_t obj_type;
-     htri_t link_exists, obj_exists;
-     size_t path_length;
-     htri_t ret_value;
-
-     /* Initialize */
-     ret_value = FALSE;
-
-     /* check the arguments */
-     if (path == NULL) {
-       ret_value = FAIL;
-       goto done;
-     }
-
-     /* Find the type of loc_id */
-     if((obj_type = H5Iget_type(loc_id)) == H5I_BADID) {
-       ret_value = FAIL;
-       goto done;
-     }
-
-     /* Find the length of the path */
-     path_length = HDstrlen(path);
-
-     /* Check if the identifier is the object itself, i.e. path is '.' */
-     if(HDstrncmp(path, ".", path_length) == 0) {
-       if(check_object_valid) {
-         obj_exists = H5Oexists_by_name(loc_id, path, H5P_DEFAULT);
-	 ret_value = obj_exists;
-	 goto done;
-       } else {
-	 ret_value = TRUE; /* Since the object is the identifier itself,
-			    * we can only check if loc_id is a valid type */
-	 goto done;
-       }
-     }
-
-     /* Duplicate the path to use */
-     if(NULL == (tmp_path = HDstrdup(path))) {
-       ret_value = FAIL;
-       goto done;
-     }
-
-     curr_name = tmp_path;
-
-     /* check if absolute pathname */
-     if(HDstrncmp(path, "/", 1) == 0) curr_name++;
-
-     /* check if relative path name starts with "./" */
-     if(HDstrncmp(path, "./", 2) == 0) curr_name += 2;
-
-     while((delimit=HDstrchr(curr_name,'/'))!=NULL) {
-       /* Change the delimiter to terminate the string */
-       *delimit='\0';
-
-       obj_exists = FALSE;
-       if((link_exists = H5Lexists(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	 ret_value = FAIL;
-	 goto done;
-       }
-
-       /* If target link does not exist then no reason to
-        *  continue checking the path */
-       if(link_exists != TRUE) {
-	 ret_value = FALSE;
-	 goto done;
-       }
-       
-       /* Determine if link resolves to an actual object */
-       if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	 ret_value = FAIL;
-         goto done;
-       }
-
-       if(obj_exists != TRUE)
-         break;
-
-       /* Change the delimiter back to '/' */
-       *delimit='/';
-
-       /* Advance the pointer in the path to the start of the next component */
-       curr_name = delimit + 1;
-
-     } /* end while */
-
-     /* Should be pointing to the last component in the path name now... */
-
-     /* Check if link does not exist */
-     if((link_exists = H5Lexists(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-       ret_value = FAIL;
-     } else {
-       ret_value = link_exists;
-       /* Determine if link resolves to an actual object for check_object_valid TRUE */
-       if(check_object_valid == TRUE && link_exists == TRUE) {
-	 if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	   ret_value = FAIL;
-	 } else {
-	   ret_value = obj_exists;
-	 }
-       }
-     }
+{
+    char *     tmp_path = NULL; /* Temporary copy of the path */
+    char *     curr_name;       /* Pointer to current component of path name */
+    char *     delimit;         /* Pointer to path delimiter during traversal */
+    H5I_type_t obj_type;
+    htri_t     link_exists, obj_exists;
+    size_t     path_length;
+    htri_t     ret_value;
+
+    /* Initialize */
+    ret_value = FALSE;
+
+    /* check the arguments */
+    if (path == NULL) {
+        ret_value = FAIL;
+        goto done;
+    }
+
+    /* Find the type of loc_id */
+    if ((obj_type = H5Iget_type(loc_id)) == H5I_BADID) {
+        ret_value = FAIL;
+        goto done;
+    }
+
+    /* Find the length of the path */
+    path_length = HDstrlen(path);
+
+    /* Check if the identifier is the object itself, i.e. path is '.' */
+    if (HDstrncmp(path, ".", path_length) == 0) {
+        if (check_object_valid) {
+            obj_exists = H5Oexists_by_name(loc_id, path, H5P_DEFAULT);
+            ret_value  = obj_exists;
+            goto done;
+        }
+        else {
+            ret_value = TRUE; /* Since the object is the identifier itself,
+                               * we can only check if loc_id is a valid type */
+            goto done;
+        }
+    }
+
+    /* Duplicate the path to use */
+    if (NULL == (tmp_path = HDstrdup(path))) {
+        ret_value = FAIL;
+        goto done;
+    }
+
+    curr_name = tmp_path;
+
+    /* check if absolute pathname */
+    if (HDstrncmp(path, "/", 1) == 0)
+        curr_name++;
+
+    /* check if relative path name starts with "./" */
+    if (HDstrncmp(path, "./", 2) == 0)
+        curr_name += 2;
+
+    while ((delimit = HDstrchr(curr_name, '/')) != NULL) {
+        /* Change the delimiter to terminate the string */
+        *delimit = '\0';
+
+        obj_exists = FALSE;
+        if ((link_exists = H5Lexists(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+            ret_value = FAIL;
+            goto done;
+        }
+
+        /* If target link does not exist then no reason to
+         *  continue checking the path */
+        if (link_exists != TRUE) {
+            ret_value = FALSE;
+            goto done;
+        }
+
+        /* Determine if link resolves to an actual object */
+        if ((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+            ret_value = FAIL;
+            goto done;
+        }
+
+        if (obj_exists != TRUE)
+            break;
+
+        /* Change the delimiter back to '/' */
+        *delimit = '/';
+
+        /* Advance the pointer in the path to the start of the next component */
+        curr_name = delimit + 1;
+
+    } /* end while */
+
+    /* Should be pointing to the last component in the path name now... */
+
+    /* Check if link does not exist */
+    if ((link_exists = H5Lexists(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+        ret_value = FAIL;
+    }
+    else {
+        ret_value = link_exists;
+        /* Determine if link resolves to an actual object for check_object_valid TRUE */
+        if (check_object_valid == TRUE && link_exists == TRUE) {
+            if ((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+                ret_value = FAIL;
+            }
+            else {
+                ret_value = obj_exists;
+            }
+        }
+    }
 
 done:
-     if(tmp_path != NULL)
-       HDfree(tmp_path);
+    if (tmp_path != NULL)
+        HDfree(tmp_path);
 
-     return ret_value;
- }
+    return ret_value;
+}
diff --git a/hl/src/H5LTprivate.h b/hl/src/H5LTprivate.h
index 01c5ee6..0200725 100644
--- a/hl/src/H5LTprivate.h
+++ b/hl/src/H5LTprivate.h
@@ -25,26 +25,17 @@
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5LT_get_attribute_disk( hid_t obj_id,
-                           const char *attr_name,
-                           void *data );
+H5_HLDLL herr_t H5LT_get_attribute_disk(hid_t obj_id, const char *attr_name, void *data);
 
-H5_HLDLL herr_t  H5LT_set_attribute_numerical( hid_t loc_id,
-                                     const char *obj_name,
-                                     const char *attr_name,
-                                     size_t size,
-                                     hid_t type_id,
-                                     const void *data );
+H5_HLDLL herr_t H5LT_set_attribute_numerical(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                             size_t size, hid_t type_id, const void *data);
 
-H5_HLDLL herr_t  H5LT_set_attribute_string( hid_t dset_id,
-                                 const char *name,
-                                 const char *buf );
+H5_HLDLL herr_t H5LT_set_attribute_string(hid_t dset_id, const char *name, const char *buf);
 
-H5_HLDLL herr_t  H5LT_find_attribute( hid_t loc_id, const char *name );
+H5_HLDLL herr_t H5LT_find_attribute(hid_t loc_id, const char *name);
 
-
-H5_HLDLL char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang,
-                                    size_t *slen, hbool_t no_user_buf);
+H5_HLDLL char *H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen,
+                                  hbool_t no_user_buf);
 
 H5_HLDLL hid_t H5LTyyparse(void);
 
diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h
index 47be98a..97129bf 100644
--- a/hl/src/H5LTpublic.h
+++ b/hl/src/H5LTpublic.h
@@ -15,13 +15,13 @@
 #define _H5LTpublic_H
 
 /* Flag definitions for H5LTopen_file_image() */
-#define H5LT_FILE_IMAGE_OPEN_RW      0x0001 /* Open image for read-write */
-#define H5LT_FILE_IMAGE_DONT_COPY    0x0002 /* The HDF5 lib won't copy   */
+#define H5LT_FILE_IMAGE_OPEN_RW   0x0001 /* Open image for read-write */
+#define H5LT_FILE_IMAGE_DONT_COPY 0x0002 /* The HDF5 lib won't copy   */
 /* user supplied image buffer. The same image is open with the core driver.  */
 #define H5LT_FILE_IMAGE_DONT_RELEASE 0x0004 /* The HDF5 lib won't        */
 /* deallocate user supplied image buffer. The user application is reponsible */
-/* for doing so.                                                             */ 
-#define H5LT_FILE_IMAGE_ALL          0x0007
+/* for doing so.                                                             */
+#define H5LT_FILE_IMAGE_ALL 0x0007
 
 typedef enum H5LT_lang_t {
     H5LT_LANG_ERR = -1, /*this is the first*/
@@ -42,53 +42,28 @@ extern "C" {
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5LTmake_dataset( hid_t loc_id,
-                         const char *dset_name,
-                         int rank,
-                         const hsize_t *dims,
-                         hid_t type_id,
-                         const void *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_char( hid_t loc_id,
-                              const char *dset_name,
-                              int rank,
-                              const hsize_t *dims,
-                              const char *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_short( hid_t loc_id,
-                               const char *dset_name,
-                               int rank,
-                               const hsize_t *dims,
-                               const short *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_int( hid_t loc_id,
-                             const char *dset_name,
-                             int rank,
-                             const hsize_t *dims,
-                             const int *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_long( hid_t loc_id,
-                              const char *dset_name,
-                              int rank,
-                              const hsize_t *dims,
-                              const long *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_float( hid_t loc_id,
-                               const char *dset_name,
-                               int rank,
-                               const hsize_t *dims,
-                               const float *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_double( hid_t loc_id,
-                                const char *dset_name,
-                                int rank,
-                                const hsize_t *dims,
-                                const double *buffer );
-
-H5_HLDLL herr_t  H5LTmake_dataset_string( hid_t loc_id,
-                               const char *dset_name,
-                               const char *buf );
+H5_HLDLL herr_t H5LTmake_dataset(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                 hid_t type_id, const void *buffer);
 
+H5_HLDLL herr_t H5LTmake_dataset_char(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                      const char *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_short(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                       const short *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_int(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                     const int *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_long(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                      const long *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_float(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                       const float *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_double(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims,
+                                        const double *buffer);
+
+H5_HLDLL herr_t H5LTmake_dataset_string(hid_t loc_id, const char *dset_name, const char *buf);
 
 /*-------------------------------------------------------------------------
  *
@@ -97,38 +72,21 @@ H5_HLDLL herr_t  H5LTmake_dataset_string( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5LTread_dataset( hid_t loc_id,
-                         const char *dset_name,
-                         hid_t type_id,
-                         void *buffer );
+H5_HLDLL herr_t H5LTread_dataset(hid_t loc_id, const char *dset_name, hid_t type_id, void *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_char( hid_t loc_id,
-                              const char *dset_name,
-                              char *buffer );
+H5_HLDLL herr_t H5LTread_dataset_char(hid_t loc_id, const char *dset_name, char *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_short( hid_t loc_id,
-                               const char *dset_name,
-                               short *buffer );
+H5_HLDLL herr_t H5LTread_dataset_short(hid_t loc_id, const char *dset_name, short *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_int( hid_t loc_id,
-                             const char *dset_name,
-                             int *buffer );
+H5_HLDLL herr_t H5LTread_dataset_int(hid_t loc_id, const char *dset_name, int *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_long( hid_t loc_id,
-                              const char *dset_name,
-                              long *buffer );
+H5_HLDLL herr_t H5LTread_dataset_long(hid_t loc_id, const char *dset_name, long *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_float( hid_t loc_id,
-                               const char *dset_name,
-                               float *buffer );
+H5_HLDLL herr_t H5LTread_dataset_float(hid_t loc_id, const char *dset_name, float *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_double( hid_t loc_id,
-                                const char *dset_name,
-                                double *buffer );
+H5_HLDLL herr_t H5LTread_dataset_double(hid_t loc_id, const char *dset_name, double *buffer);
 
-H5_HLDLL herr_t  H5LTread_dataset_string( hid_t loc_id,
-                                const char *dset_name,
-                                char *buf );
+H5_HLDLL herr_t H5LTread_dataset_string(hid_t loc_id, const char *dset_name, char *buf);
 
 /*-------------------------------------------------------------------------
  *
@@ -137,20 +95,12 @@ H5_HLDLL herr_t  H5LTread_dataset_string( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5LTget_dataset_ndims(hid_t loc_id, const char *dset_name, int *rank);
 
-H5_HLDLL herr_t  H5LTget_dataset_ndims( hid_t loc_id,
-                             const char *dset_name,
-                             int *rank );
-
-H5_HLDLL herr_t  H5LTget_dataset_info( hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t *dims,
-                             H5T_class_t *type_class,
-                             size_t *type_size );
-
-H5_HLDLL herr_t  H5LTfind_dataset( hid_t loc_id, const char *name );
-
+H5_HLDLL herr_t H5LTget_dataset_info(hid_t loc_id, const char *dset_name, hsize_t *dims,
+                                     H5T_class_t *type_class, size_t *type_size);
 
+H5_HLDLL herr_t H5LTfind_dataset(hid_t loc_id, const char *name);
 
 /*-------------------------------------------------------------------------
  *
@@ -159,77 +109,41 @@ H5_HLDLL herr_t  H5LTfind_dataset( hid_t loc_id, const char *name );
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5LTset_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         const char *attr_data);
+
+H5_HLDLL herr_t H5LTset_attribute_char(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                       const char *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_uchar(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        const unsigned char *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_short(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        const short *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_ushort(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         const unsigned short *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                      const int *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_uint(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                       const unsigned int *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_long(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                       const long *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_long_long(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                            const long long *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_ulong(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        const unsigned long *buffer, size_t size);
+
+H5_HLDLL herr_t H5LTset_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        const float *buffer, size_t size);
 
-H5_HLDLL herr_t  H5LTset_attribute_string( hid_t loc_id,
-                                 const char *obj_name,
-                                 const char *attr_name,
-                                 const char *attr_data );
-
-H5_HLDLL herr_t  H5LTset_attribute_char( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const char *buffer,
-                               size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_uchar( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const unsigned char *buffer,
-                               size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_short( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const short *buffer,
-                              size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_ushort( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const unsigned short *buffer,
-                              size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_int( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const int *buffer,
-                              size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_uint( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              const unsigned int *buffer,
-                              size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_long( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const long *buffer,
-                               size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_long_long( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const long long *buffer,
-                               size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_ulong( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               const unsigned long *buffer,
-                               size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_float( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                const float *buffer,
-                                size_t size );
-
-H5_HLDLL herr_t  H5LTset_attribute_double( hid_t loc_id,
-                                 const char *obj_name,
-                                 const char *attr_name,
-                                 const double *buffer,
-                                 size_t size );
+H5_HLDLL herr_t H5LTset_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         const double *buffer, size_t size);
 
 /*-------------------------------------------------------------------------
  *
@@ -238,72 +152,41 @@ H5_HLDLL herr_t  H5LTset_attribute_double( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5LTget_attribute( hid_t loc_id,
-                          const char *obj_name,
-                          const char *attr_name,
-                          hid_t mem_type_id,
-                          void *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_string( hid_t loc_id,
-                                 const char *obj_name,
-                                 const char *attr_name,
-                                 char *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_char( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               char *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_uchar( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               unsigned char *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_short( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                short *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_ushort( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                unsigned short *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_int( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              int *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_uint( hid_t loc_id,
-                              const char *obj_name,
-                              const char *attr_name,
-                              unsigned int *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_long( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               long *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_long_long( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               long long *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_ulong( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               unsigned long *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_float( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                float *data );
-
-H5_HLDLL herr_t  H5LTget_attribute_double( hid_t loc_id,
-                                 const char *obj_name,
-                                 const char *attr_name,
-                                 double *data );
+H5_HLDLL herr_t H5LTget_attribute(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                  hid_t mem_type_id, void *data);
 
+H5_HLDLL herr_t H5LTget_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         char *data);
+
+H5_HLDLL herr_t H5LTget_attribute_char(hid_t loc_id, const char *obj_name, const char *attr_name, char *data);
+
+H5_HLDLL herr_t H5LTget_attribute_uchar(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        unsigned char *data);
+
+H5_HLDLL herr_t H5LTget_attribute_short(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        short *data);
+
+H5_HLDLL herr_t H5LTget_attribute_ushort(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         unsigned short *data);
+
+H5_HLDLL herr_t H5LTget_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name, int *data);
+
+H5_HLDLL herr_t H5LTget_attribute_uint(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                       unsigned int *data);
+
+H5_HLDLL herr_t H5LTget_attribute_long(hid_t loc_id, const char *obj_name, const char *attr_name, long *data);
+
+H5_HLDLL herr_t H5LTget_attribute_long_long(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                            long long *data);
+
+H5_HLDLL herr_t H5LTget_attribute_ulong(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        unsigned long *data);
+
+H5_HLDLL herr_t H5LTget_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                        float *data);
+
+H5_HLDLL herr_t H5LTget_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                         double *data);
 
 /*-------------------------------------------------------------------------
  *
@@ -312,22 +195,10 @@ H5_HLDLL herr_t  H5LTget_attribute_double( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5LTget_attribute_ndims(hid_t loc_id, const char *obj_name, const char *attr_name, int *rank);
 
-H5_HLDLL herr_t  H5LTget_attribute_ndims( hid_t loc_id,
-                                const char *obj_name,
-                                const char *attr_name,
-                                int *rank );
-
-H5_HLDLL herr_t  H5LTget_attribute_info( hid_t loc_id,
-                               const char *obj_name,
-                               const char *attr_name,
-                               hsize_t *dims,
-                               H5T_class_t *type_class,
-                               size_t *type_size );
-
-
-
-
+H5_HLDLL herr_t H5LTget_attribute_info(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                       hsize_t *dims, H5T_class_t *type_class, size_t *type_size);
 
 /*-------------------------------------------------------------------------
  *
@@ -336,10 +207,9 @@ H5_HLDLL herr_t  H5LTget_attribute_info( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL hid_t H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type);
+H5_HLDLL hid_t  H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type);
 H5_HLDLL herr_t H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len);
 
-
 /*-------------------------------------------------------------------------
  *
  * Utility functions
@@ -347,7 +217,7 @@ H5_HLDLL herr_t H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t H5LTfind_attribute( hid_t loc_id, const char *name );
+H5_HLDLL herr_t H5LTfind_attribute(hid_t loc_id, const char *name);
 
 H5_HLDLL htri_t H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid);
 
@@ -365,4 +235,3 @@ H5_HLDLL hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flag
 #endif
 
 #endif
-
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index f413bea..f397365 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -18,22 +18,21 @@
 
 /*  Packet Table private data */
 
-typedef struct
-{
-  hid_t dset_id;  /* The ID of the dataset containing this table */
-  hid_t type_id;  /* The ID of the packet table's native datatype */
-  hsize_t current_index;  /* The index of the packet that get_next_packet will read next */
-  hsize_t size;  /* The number of packets currently contained in this table */
+typedef struct {
+    hid_t   dset_id;       /* The ID of the dataset containing this table */
+    hid_t   type_id;       /* The ID of the packet table's native datatype */
+    hsize_t current_index; /* The index of the packet that get_next_packet will read next */
+    hsize_t size;          /* The number of packets currently contained in this table */
 } htbl_t;
 
-static hsize_t H5PT_ptable_count = 0;
+static hsize_t    H5PT_ptable_count   = 0;
 static H5I_type_t H5PT_ptable_id_type = H5I_UNINIT;
 
 #define H5PT_HASH_TABLE_SIZE 64
 
 /* Packet Table private functions */
 static herr_t H5PT_free_id(void *id);
-static herr_t H5PT_close( htbl_t* table );
+static herr_t H5PT_close(htbl_t *table);
 static herr_t H5PT_create_index(htbl_t *table_id);
 static herr_t H5PT_set_index(htbl_t *table_id, hsize_t pt_index);
 static herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
@@ -71,109 +70,105 @@ static herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
  *
  *-------------------------------------------------------------------------
  */
-hid_t H5PTcreate(hid_t loc_id,
-                 const char *dset_name,
-                 hid_t dtype_id,
-                 hsize_t chunk_size,
-                 hid_t plist_id)
+hid_t
+H5PTcreate(hid_t loc_id, const char *dset_name, hid_t dtype_id, hsize_t chunk_size, hid_t plist_id)
 {
-  htbl_t * table = NULL;
-  hid_t dset_id = H5I_INVALID_HID;
-  hid_t space_id = H5I_INVALID_HID;
-  hid_t plistcopy_id = H5I_INVALID_HID;
-  hsize_t dims[1];
-  hsize_t dims_chunk[1];
-  hsize_t maxdims[1];
-  hid_t ret_value = H5I_INVALID_HID;
-
-  /* check the arguments */
-  if (dset_name == NULL) {
-    goto error;
-  }
-
-  /* Register the packet table ID type if this is the first table created */
-  if(H5PT_ptable_id_type < 0)
-    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
-      goto error;
-
-  /* Get memory for the table identifier */
-  table = (htbl_t *)HDmalloc(sizeof(htbl_t));
-  if ( table == NULL ) {
-    goto error;
-  }
-  table->dset_id = H5I_INVALID_HID;
-  table->type_id = H5I_INVALID_HID;
-
-  /* Create a simple data space with unlimited size */
-  dims[0] = 0;
-  dims_chunk[0] = chunk_size;
-  maxdims[0] = H5S_UNLIMITED;
-  if((space_id = H5Screate_simple(1, dims, maxdims)) < 0)
-    goto error;
-
-  /* Modify dataset creation properties to enable chunking  */
-  if (plist_id == H5P_DEFAULT) {
-	plistcopy_id = H5Pcreate(H5P_DATASET_CREATE);
-  }
-  else {
-	plistcopy_id = H5Pcopy(plist_id);
-  }
-  if (chunk_size > 0)
-  {
-    if(H5Pset_chunk(plistcopy_id, 1, dims_chunk) < 0)
-      goto error;
-  }
-
-  /* Create the dataset. */
-  if((dset_id = H5Dcreate2(loc_id, dset_name, dtype_id, space_id, H5P_DEFAULT, plistcopy_id, H5P_DEFAULT)) < 0)
-    goto error;
-
-  /* Create the table identifier */
-  table->dset_id = dset_id;
-
-  /* Terminate access to the data space. */
-  if(H5Sclose(space_id) < 0)
-    goto error;
-
-  /* End access to the property list */
-  if(H5Pclose(plistcopy_id) < 0)
-    goto error;
-
-  /* Make a copy of caller's datatype and save it in the table structure.
-     It will be closed when the table is closed */
-   if((table->type_id = H5Tcopy(dtype_id)) < 0)
-    goto error;
-
-  H5PT_create_index(table);
-  table->size = 0;
-
-  /* Get an ID for this table */
-  ret_value = H5Iregister(H5PT_ptable_id_type, table);
-  if(ret_value != H5I_INVALID_HID)
-    H5PT_ptable_count++;
-  else
-    H5PT_close(table);
-
-  return ret_value;
+    htbl_t *table        = NULL;
+    hid_t   dset_id      = H5I_INVALID_HID;
+    hid_t   space_id     = H5I_INVALID_HID;
+    hid_t   plistcopy_id = H5I_INVALID_HID;
+    hsize_t dims[1];
+    hsize_t dims_chunk[1];
+    hsize_t maxdims[1];
+    hid_t   ret_value = H5I_INVALID_HID;
+
+    /* check the arguments */
+    if (dset_name == NULL) {
+        goto error;
+    }
+
+    /* Register the packet table ID type if this is the first table created */
+    if (H5PT_ptable_id_type < 0)
+        if ((H5PT_ptable_id_type =
+                 H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
+            goto error;
+
+    /* Get memory for the table identifier */
+    table = (htbl_t *)HDmalloc(sizeof(htbl_t));
+    if (table == NULL) {
+        goto error;
+    }
+    table->dset_id = H5I_INVALID_HID;
+    table->type_id = H5I_INVALID_HID;
+
+    /* Create a simple data space with unlimited size */
+    dims[0]       = 0;
+    dims_chunk[0] = chunk_size;
+    maxdims[0]    = H5S_UNLIMITED;
+    if ((space_id = H5Screate_simple(1, dims, maxdims)) < 0)
+        goto error;
+
+    /* Modify dataset creation properties to enable chunking  */
+    if (plist_id == H5P_DEFAULT) {
+        plistcopy_id = H5Pcreate(H5P_DATASET_CREATE);
+    }
+    else {
+        plistcopy_id = H5Pcopy(plist_id);
+    }
+    if (chunk_size > 0) {
+        if (H5Pset_chunk(plistcopy_id, 1, dims_chunk) < 0)
+            goto error;
+    }
+
+    /* Create the dataset. */
+    if ((dset_id =
+             H5Dcreate2(loc_id, dset_name, dtype_id, space_id, H5P_DEFAULT, plistcopy_id, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Create the table identifier */
+    table->dset_id = dset_id;
+
+    /* Terminate access to the data space. */
+    if (H5Sclose(space_id) < 0)
+        goto error;
+
+    /* End access to the property list */
+    if (H5Pclose(plistcopy_id) < 0)
+        goto error;
+
+    /* Make a copy of caller's datatype and save it in the table structure.
+       It will be closed when the table is closed */
+    if ((table->type_id = H5Tcopy(dtype_id)) < 0)
+        goto error;
+
+    H5PT_create_index(table);
+    table->size = 0;
+
+    /* Get an ID for this table */
+    ret_value = H5Iregister(H5PT_ptable_id_type, table);
+    if (ret_value != H5I_INVALID_HID)
+        H5PT_ptable_count++;
+    else
+        H5PT_close(table);
+
+    return ret_value;
 
 error:
     if (space_id != H5I_INVALID_HID)
-	H5Sclose(space_id);
+        H5Sclose(space_id);
     if (plistcopy_id != H5I_INVALID_HID)
-	H5Pclose(plistcopy_id);
+        H5Pclose(plistcopy_id);
     if (dset_id != H5I_INVALID_HID)
-	H5Dclose(dset_id);
-    if (table)
-    {
+        H5Dclose(dset_id);
+    if (table) {
         if (table->type_id != H5I_INVALID_HID)
-	    H5Tclose(table->type_id);
-	HDfree(table);
+            H5Tclose(table->type_id);
+        HDfree(table);
     }
 
     return ret_value;
 } /* H5PTcreate */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PTcreate_fl
  *
@@ -196,98 +191,95 @@ error:
  *-------------------------------------------------------------------------
  */
 
-hid_t H5PTcreate_fl ( hid_t loc_id,
-                              const char *dset_name,
-                              hid_t dtype_id,
-                              hsize_t chunk_size,
-                              int compression )
+hid_t
+H5PTcreate_fl(hid_t loc_id, const char *dset_name, hid_t dtype_id, hsize_t chunk_size, int compression)
 {
-  htbl_t * table = NULL;
-  hid_t dset_id = H5I_INVALID_HID;
-  hid_t space_id = H5I_INVALID_HID;
-  hid_t plist_id = H5I_INVALID_HID;
-  hsize_t dims[1];
-  hsize_t dims_chunk[1];
-  hsize_t maxdims[1];
-  hid_t ret_value = H5I_INVALID_HID;
-
-  /* check the arguments */
-  if (dset_name == NULL) {
-    goto error;
-  }
-
-  /* Register the packet table ID type if this is the first table created */
-  if(H5PT_ptable_id_type < 0)
-    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
-      goto error;
-
-  /* Get memory for the table identifier */
-  table = (htbl_t *)HDmalloc(sizeof(htbl_t));
-  if ( table == NULL ) {
-    goto error;
-  }
-  table->dset_id = H5I_INVALID_HID;
-  table->type_id = H5I_INVALID_HID;
-
-  /* Create a simple data space with unlimited size */
-  dims[0] = 0;
-  dims_chunk[0] = chunk_size;
-  maxdims[0] = H5S_UNLIMITED;
-  if((space_id = H5Screate_simple(1, dims, maxdims)) < 0)
-    goto error;
-
-  /* Modify dataset creation properties to enable chunking  */
-  plist_id = H5Pcreate(H5P_DATASET_CREATE);
-  if(H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
-    goto error;
-  if(compression >= 0 && compression <= 9)
-    if(H5Pset_deflate(plist_id, (unsigned)compression) < 0)
+    htbl_t *table    = NULL;
+    hid_t   dset_id  = H5I_INVALID_HID;
+    hid_t   space_id = H5I_INVALID_HID;
+    hid_t   plist_id = H5I_INVALID_HID;
+    hsize_t dims[1];
+    hsize_t dims_chunk[1];
+    hsize_t maxdims[1];
+    hid_t   ret_value = H5I_INVALID_HID;
+
+    /* check the arguments */
+    if (dset_name == NULL) {
         goto error;
+    }
 
-  /* Create the dataset. */
-  if((dset_id = H5Dcreate2(loc_id, dset_name, dtype_id, space_id, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
-    goto error;
+    /* Register the packet table ID type if this is the first table created */
+    if (H5PT_ptable_id_type < 0)
+        if ((H5PT_ptable_id_type =
+                 H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
+            goto error;
 
-  /* Create the table identifier */
-  table->dset_id = dset_id;
+    /* Get memory for the table identifier */
+    table = (htbl_t *)HDmalloc(sizeof(htbl_t));
+    if (table == NULL) {
+        goto error;
+    }
+    table->dset_id = H5I_INVALID_HID;
+    table->type_id = H5I_INVALID_HID;
+
+    /* Create a simple data space with unlimited size */
+    dims[0]       = 0;
+    dims_chunk[0] = chunk_size;
+    maxdims[0]    = H5S_UNLIMITED;
+    if ((space_id = H5Screate_simple(1, dims, maxdims)) < 0)
+        goto error;
 
-  /* Terminate access to the data space. */
-  if(H5Sclose(space_id) < 0)
-    goto error;
+    /* Modify dataset creation properties to enable chunking  */
+    plist_id = H5Pcreate(H5P_DATASET_CREATE);
+    if (H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
+        goto error;
+    if (compression >= 0 && compression <= 9)
+        if (H5Pset_deflate(plist_id, (unsigned)compression) < 0)
+            goto error;
 
-  /* End access to the property list */
-  if(H5Pclose(plist_id) < 0)
-    goto error;
+    /* Create the dataset. */
+    if ((dset_id = H5Dcreate2(loc_id, dset_name, dtype_id, space_id, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
+        goto error;
 
-  /* Make a copy of caller's datatype and save it in the table structure.
-     It will be closed when the table is closed */
-  if((table->type_id = H5Tcopy(dtype_id)) < 0)
-    goto error;
+    /* Create the table identifier */
+    table->dset_id = dset_id;
 
-  H5PT_create_index(table);
-  table->size = 0;
+    /* Terminate access to the data space. */
+    if (H5Sclose(space_id) < 0)
+        goto error;
+
+    /* End access to the property list */
+    if (H5Pclose(plist_id) < 0)
+        goto error;
+
+    /* Make a copy of caller's datatype and save it in the table structure.
+       It will be closed when the table is closed */
+    if ((table->type_id = H5Tcopy(dtype_id)) < 0)
+        goto error;
+
+    H5PT_create_index(table);
+    table->size = 0;
 
-  /* Get an ID for this table */
-  ret_value = H5Iregister(H5PT_ptable_id_type, table);
-  if(ret_value != H5I_INVALID_HID)
-    H5PT_ptable_count++;
-  else
-    H5PT_close(table);
+    /* Get an ID for this table */
+    ret_value = H5Iregister(H5PT_ptable_id_type, table);
+    if (ret_value != H5I_INVALID_HID)
+        H5PT_ptable_count++;
+    else
+        H5PT_close(table);
 
-  return ret_value;
+    return ret_value;
 
 error:
     if (space_id != H5I_INVALID_HID)
-	H5Sclose(space_id);
+        H5Sclose(space_id);
     if (plist_id != H5I_INVALID_HID)
-	H5Pclose(plist_id);
+        H5Pclose(plist_id);
     if (dset_id != H5I_INVALID_HID)
-	H5Dclose(dset_id);
-    if (table)
-    {
+        H5Dclose(dset_id);
+    if (table) {
         if (table->type_id != H5I_INVALID_HID)
-	    H5Tclose(table->type_id);
-	HDfree(table);
+            H5Tclose(table->type_id);
+        HDfree(table);
     }
 
     return ret_value;
@@ -317,87 +309,87 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-hid_t H5PTopen( hid_t loc_id,
-                             const char *dset_name )
+hid_t
+H5PTopen(hid_t loc_id, const char *dset_name)
 {
-  hid_t type_id=H5I_INVALID_HID;
-  hid_t space_id=H5I_INVALID_HID;
-  htbl_t * table = NULL;
-  hsize_t dims[1];
-  hid_t ret_value = H5I_INVALID_HID;
-
-  /* check the arguments */
-  if (dset_name == NULL) {
-    goto error;
-  }
-
-  /* Register the packet table ID type if this is the first table created */
-  if( H5PT_ptable_id_type < 0)
-    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
-      goto error;
-
-  table = (htbl_t *)HDmalloc(sizeof(htbl_t));
-  if ( table == NULL ) {
-    goto error;
-  }
-  table->dset_id = H5I_INVALID_HID;
-  table->type_id = H5I_INVALID_HID;
-
-  /* Open the dataset */
-  if((table->dset_id = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
-    goto error;
-
-  /* Get the dataset's disk datatype */
-  if((type_id = H5Dget_type(table->dset_id)) < 0)
-    goto error;
-
-  /* Make a copy of the datatype obtained and save it in the table structure.
-     It will be closed when the table is closed */
-   if((table->type_id = H5Tcopy(type_id)) < 0)
-    goto error;
-
-  /* Close the disk datatype */
-  if(H5Tclose(type_id) < 0)
-    goto error;
-  type_id = H5I_INVALID_HID;
-
-  /* Initialize the current record pointer */
-  if((H5PT_create_index(table)) < 0)
-    goto error;
-
-  /* Get number of records in table */
-  if((space_id=H5Dget_space(table->dset_id)) < 0)
-    goto error;
-  if(H5Sget_simple_extent_dims(space_id, dims, NULL) < 0)
-    goto error;
-  if(H5Sclose(space_id) < 0)
-    goto error;
-  space_id = H5I_INVALID_HID;
-
-  table->size = dims[0];
-
-  /* Get an ID for this table */
-  ret_value = H5Iregister(H5PT_ptable_id_type, table);
-
-  if(ret_value != H5I_INVALID_HID)
-    H5PT_ptable_count++;
-  else
-    H5PT_close(table);
-
-  return ret_value;
+    hid_t   type_id  = H5I_INVALID_HID;
+    hid_t   space_id = H5I_INVALID_HID;
+    htbl_t *table    = NULL;
+    hsize_t dims[1];
+    hid_t   ret_value = H5I_INVALID_HID;
+
+    /* check the arguments */
+    if (dset_name == NULL) {
+        goto error;
+    }
+
+    /* Register the packet table ID type if this is the first table created */
+    if (H5PT_ptable_id_type < 0)
+        if ((H5PT_ptable_id_type =
+                 H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)H5PT_free_id)) < 0)
+            goto error;
+
+    table = (htbl_t *)HDmalloc(sizeof(htbl_t));
+    if (table == NULL) {
+        goto error;
+    }
+    table->dset_id = H5I_INVALID_HID;
+    table->type_id = H5I_INVALID_HID;
+
+    /* Open the dataset */
+    if ((table->dset_id = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Get the dataset's disk datatype */
+    if ((type_id = H5Dget_type(table->dset_id)) < 0)
+        goto error;
+
+    /* Make a copy of the datatype obtained and save it in the table structure.
+       It will be closed when the table is closed */
+    if ((table->type_id = H5Tcopy(type_id)) < 0)
+        goto error;
+
+    /* Close the disk datatype */
+    if (H5Tclose(type_id) < 0)
+        goto error;
+    type_id = H5I_INVALID_HID;
+
+    /* Initialize the current record pointer */
+    if ((H5PT_create_index(table)) < 0)
+        goto error;
+
+    /* Get number of records in table */
+    if ((space_id = H5Dget_space(table->dset_id)) < 0)
+        goto error;
+    if (H5Sget_simple_extent_dims(space_id, dims, NULL) < 0)
+        goto error;
+    if (H5Sclose(space_id) < 0)
+        goto error;
+    space_id = H5I_INVALID_HID;
+
+    table->size = dims[0];
+
+    /* Get an ID for this table */
+    ret_value = H5Iregister(H5PT_ptable_id_type, table);
+
+    if (ret_value != H5I_INVALID_HID)
+        H5PT_ptable_count++;
+    else
+        H5PT_close(table);
+
+    return ret_value;
 
 error:
     if (type_id != H5I_INVALID_HID)
-	H5Dclose(type_id);
+        H5Dclose(type_id);
     if (space_id != H5I_INVALID_HID)
-	H5Sclose(space_id);
-    if(table)
-    {
+        H5Sclose(space_id);
+    if (table) {
         if (table->type_id != H5I_INVALID_HID)
-	    H5Tclose(table->type_id);
-	if (table->dset_id != H5I_INVALID_HID)
-	    H5Dclose(table->dset_id);
-	HDfree(table);
+            H5Tclose(table->type_id);
+        if (table->dset_id != H5I_INVALID_HID)
+            H5Dclose(table->dset_id);
+        HDfree(table);
     }
 
     return ret_value;
@@ -438,33 +430,32 @@ H5PT_free_id(void *id)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5PT_close( htbl_t* table)
+H5PT_close(htbl_t *table)
 {
-  if(table == NULL)
-    goto error;
+    if (table == NULL)
+        goto error;
 
-  /* Close the dataset */
-  if(H5Dclose(table->dset_id) < 0)
-    goto error;
+    /* Close the dataset */
+    if (H5Dclose(table->dset_id) < 0)
+        goto error;
 
-  /* Close the memory datatype */
-  if(H5Tclose(table->type_id) < 0)
-    goto error;
+    /* Close the memory datatype */
+    if (H5Tclose(table->type_id) < 0)
+        goto error;
 
-  HDfree(table);
+    HDfree(table);
 
-  return SUCCEED;
+    return SUCCEED;
 
 error:
-  if(table)
-  {
-    H5E_BEGIN_TRY
-    H5Dclose(table->dset_id);
-    H5Tclose(table->type_id);
-    H5E_END_TRY
-    HDfree(table);
-  }
-  return FAIL;
+    if (table) {
+        H5E_BEGIN_TRY
+        H5Dclose(table->dset_id);
+        H5Tclose(table->type_id);
+        H5E_END_TRY
+        HDfree(table);
+    }
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -486,36 +477,35 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTclose( hid_t table_id )
+herr_t
+H5PTclose(hid_t table_id)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* Remove the ID from the library */
-  if((table = (htbl_t *)H5Iremove_verify(table_id, H5PT_ptable_id_type)) ==NULL)
-    goto error;
+    /* Remove the ID from the library */
+    if ((table = (htbl_t *)H5Iremove_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  /* If the library found the table, remove it */
-  if( H5PT_close(table) < 0)
-    goto error;
+    /* If the library found the table, remove it */
+    if (H5PT_close(table) < 0)
+        goto error;
 
-  /* One less packet table open */
-  H5PT_ptable_count--;
+    /* One less packet table open */
+    H5PT_ptable_count--;
 
-  /* Remove the packet table type ID if no more packet */
-  /* tables are open                                   */
-  if(H5PT_ptable_count == 0)
-  {
-    H5Idestroy_type(H5PT_ptable_id_type);
-    H5PT_ptable_id_type = H5I_UNINIT;
-  }
+    /* Remove the packet table type ID if no more packet */
+    /* tables are open                                   */
+    if (H5PT_ptable_count == 0) {
+        H5Idestroy_type(H5PT_ptable_id_type);
+        H5PT_ptable_id_type = H5I_UNINIT;
+    }
 
-  return SUCCEED;
+    return SUCCEED;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  *
  * Write functions
@@ -541,30 +531,28 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTappend( hid_t table_id,
-                           size_t nrecords,
-                           const void * data )
+herr_t
+H5PTappend(hid_t table_id, size_t nrecords, const void *data)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* Find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* Find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  /* If we are asked to write 0 records, just do nothing */
-  if(nrecords == 0)
-    return SUCCEED;
+    /* If we are asked to write 0 records, just do nothing */
+    if (nrecords == 0)
+        return SUCCEED;
 
-  if((H5TB_common_append_records(table->dset_id, table->type_id,
-  			nrecords, table->size, data)) < 0)
-    goto error;
+    if ((H5TB_common_append_records(table->dset_id, table->type_id, nrecords, table->size, data)) < 0)
+        goto error;
 
-  /* Update table size */
-  table->size += nrecords;
-  return SUCCEED;
+    /* Update table size */
+    table->size += nrecords;
+    return SUCCEED;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -574,7 +562,6 @@ error:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PTget_next
  *
@@ -595,30 +582,29 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTget_next( hid_t table_id,
-                             size_t nrecords,
-                             void * data)
+herr_t
+H5PTget_next(hid_t table_id, size_t nrecords, void *data)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* Find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* Find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  /* If nrecords == 0, do nothing */
-  if(nrecords == 0)
-    return SUCCEED;
+    /* If nrecords == 0, do nothing */
+    if (nrecords == 0)
+        return SUCCEED;
 
-  if((H5TB_common_read_records(table->dset_id, table->type_id,
-                              table->current_index, nrecords, table->size, data)) < 0)
-    goto error;
+    if ((H5TB_common_read_records(table->dset_id, table->type_id, table->current_index, nrecords, table->size,
+                                  data)) < 0)
+        goto error;
 
-  /* Update the current index */
-  table->current_index += nrecords;
-  return SUCCEED;
+    /* Update the current index */
+    table->current_index += nrecords;
+    return SUCCEED;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -640,30 +626,27 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTread_packets( hid_t table_id,
-                         hsize_t start,
-                         size_t nrecords,
-                         void *data)
+herr_t
+H5PTread_packets(hid_t table_id, hsize_t start, size_t nrecords, void *data)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* find the table struct from its ID */
-  table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type);
-  if(table == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type);
+    if (table == NULL)
+        goto error;
 
-  /* If nrecords == 0, do nothing */
-  if(nrecords == 0)
-    return SUCCEED;
+    /* If nrecords == 0, do nothing */
+    if (nrecords == 0)
+        return SUCCEED;
 
-  if( H5TB_common_read_records(table->dset_id, table->type_id,
-                              start, nrecords, table->size, data) < 0)
-    goto error;
+    if (H5TB_common_read_records(table->dset_id, table->type_id, start, nrecords, table->size, data) < 0)
+        goto error;
 
-  return SUCCEED;
+    return SUCCEED;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -694,40 +677,36 @@ error:
 static herr_t
 H5PT_create_index(htbl_t *table)
 {
-  if( table != NULL)
-  {
-    table->current_index = 0;
-    return SUCCEED;
-  }
-  return FAIL;
+    if (table != NULL) {
+        table->current_index = 0;
+        return SUCCEED;
+    }
+    return FAIL;
 }
 
 static herr_t
 H5PT_set_index(htbl_t *table, hsize_t pt_index)
 {
-  /* Ensure index is valid */
-  if( table != NULL )
-  {
-    if( pt_index < table->size )
-    {
-      table->current_index = pt_index;
-      return SUCCEED;
+    /* Ensure index is valid */
+    if (table != NULL) {
+        if (pt_index < table->size) {
+            table->current_index = pt_index;
+            return SUCCEED;
+        }
     }
-  }
-  return FAIL;
+    return FAIL;
 }
 
 static herr_t
 H5PT_get_index(htbl_t *table, hsize_t *pt_index)
 {
-  /* Ensure index is valid */
-  if( table != NULL )
-  {
-    if(pt_index)
-      *pt_index = table->current_index;
-    return SUCCEED;
-  }
-  return FAIL;
+    /* Ensure index is valid */
+    if (table != NULL) {
+        if (pt_index)
+            *pt_index = table->current_index;
+        return SUCCEED;
+    }
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -748,37 +727,40 @@ H5PT_get_index(htbl_t *table, hsize_t *pt_index)
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTcreate_index(hid_t table_id)
+herr_t
+H5PTcreate_index(hid_t table_id)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    return FAIL;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)(htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        return FAIL;
 
-  return H5PT_create_index(table);
+    return H5PT_create_index(table);
 }
 
-herr_t H5PTset_index(hid_t table_id, hsize_t pt_index)
+herr_t
+H5PTset_index(hid_t table_id, hsize_t pt_index)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    return FAIL;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        return FAIL;
 
-  return H5PT_set_index(table, pt_index);
+    return H5PT_set_index(table, pt_index);
 }
 
-herr_t H5PTget_index(hid_t table_id, hsize_t *pt_index)
+herr_t
+H5PTget_index(hid_t table_id, hsize_t *pt_index)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    return FAIL;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        return FAIL;
 
-  return H5PT_get_index(table, pt_index);
+    return H5PT_get_index(table, pt_index);
 }
 
 /*-------------------------------------------------------------------------
@@ -807,24 +789,24 @@ herr_t H5PTget_index(hid_t table_id, hsize_t *pt_index)
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTget_num_packets( hid_t table_id, hsize_t *nrecords)
+herr_t
+H5PTget_num_packets(hid_t table_id, hsize_t *nrecords)
 {
-  htbl_t * table;
+    htbl_t *table;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  if(nrecords)
-    *nrecords = table->size;
+    if (nrecords)
+        *nrecords = table->size;
 
-  return SUCCEED;
+    return SUCCEED;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PTis_valid
  *
@@ -844,13 +826,14 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTis_valid(hid_t table_id)
+herr_t
+H5PTis_valid(hid_t table_id)
 {
-  /* find the table struct from its ID */
-  if(H5Iobject_verify(table_id, H5PT_ptable_id_type) ==NULL)
-    return FAIL;
+    /* find the table struct from its ID */
+    if (H5Iobject_verify(table_id, H5PT_ptable_id_type) == NULL)
+        return FAIL;
 
-  return SUCCEED;
+    return SUCCEED;
 }
 
 /*-------------------------------------------------------------------------
@@ -873,25 +856,26 @@ herr_t H5PTis_valid(hid_t table_id)
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5PTis_varlen(hid_t table_id)
+herr_t
+H5PTis_varlen(hid_t table_id)
 {
-  H5T_class_t type;
-  htbl_t * table;
+    H5T_class_t type;
+    htbl_t *    table;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  if((type = H5Tget_class( table->type_id )) == H5T_NO_CLASS)
-    goto error;
+    if ((type = H5Tget_class(table->type_id)) == H5T_NO_CLASS)
+        goto error;
 
-  if( type == H5T_VLEN )
-    return 1;
-  else
-    return 0;
+    if (type == H5T_VLEN)
+        return 1;
+    else
+        return 0;
 
 error:
-  return FAIL;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -923,38 +907,37 @@ error:
  *-------------------------------------------------------------------------
  */
 
-herr_t H5PTfree_vlen_buff( hid_t table_id,
-                               size_t _bufflen,
-                               void * buff )
+herr_t
+H5PTfree_vlen_buff(hid_t table_id, size_t _bufflen, void *buff)
 {
-  hid_t space_id = H5I_INVALID_HID;
-  htbl_t * table;
-  hsize_t bufflen = _bufflen;
-  herr_t ret_value;
+    hid_t   space_id = H5I_INVALID_HID;
+    htbl_t *table;
+    hsize_t bufflen = _bufflen;
+    herr_t  ret_value;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  if((space_id = H5Screate_simple(1, &bufflen, NULL)) < 0)
-    goto error;
+    if ((space_id = H5Screate_simple(1, &bufflen, NULL)) < 0)
+        goto error;
 
-  /* Free the memory.  If this succeeds, ret_value should be 0. */
-  if((ret_value = H5Treclaim(table->type_id, space_id, H5P_DEFAULT, buff)) < 0)
-    goto error;
+    /* Free the memory.  If this succeeds, ret_value should be 0. */
+    if ((ret_value = H5Treclaim(table->type_id, space_id, H5P_DEFAULT, buff)) < 0)
+        goto error;
 
-  /* If the dataspace cannot be closed, return -2 to indicate that memory */
-  /* was freed successfully but an error still occurred. */
-  if(H5Sclose(space_id) < 0)
-    return -2;
+    /* If the dataspace cannot be closed, return -2 to indicate that memory */
+    /* was freed successfully but an error still occurred. */
+    if (H5Sclose(space_id) < 0)
+        return -2;
 
-  return ret_value;
+    return ret_value;
 
 error:
-  H5E_BEGIN_TRY
+    H5E_BEGIN_TRY
     H5Sclose(space_id);
-  H5E_END_TRY
-  return FAIL;
+    H5E_END_TRY
+    return FAIL;
 } /* H5PTfree_vlen_buff */
 
 /*-------------------------------------------------------------------------
@@ -981,20 +964,21 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-hid_t H5PTget_dataset(hid_t table_id)
+hid_t
+H5PTget_dataset(hid_t table_id)
 {
-  htbl_t * table;
-  hid_t ret_value = H5I_INVALID_HID;
+    htbl_t *table;
+    hid_t   ret_value = H5I_INVALID_HID;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  ret_value = table->dset_id;
+    ret_value = table->dset_id;
 
 error:
 
-  return ret_value;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -1015,18 +999,19 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-hid_t H5PTget_type( hid_t table_id)
+hid_t
+H5PTget_type(hid_t table_id)
 {
-  htbl_t * table;
-  hid_t ret_value = H5I_INVALID_HID;
+    htbl_t *table;
+    hid_t   ret_value = H5I_INVALID_HID;
 
-  /* find the table struct from its ID */
-  if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
-    goto error;
+    /* find the table struct from its ID */
+    if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
+        goto error;
 
-  ret_value = table->type_id;
+    ret_value = table->type_id;
 
 error:
 
-  return ret_value;
+    return ret_value;
 }
diff --git a/hl/src/H5PTprivate.h b/hl/src/H5PTprivate.h
index eec9df7..18ea3c2 100644
--- a/hl/src/H5PTprivate.h
+++ b/hl/src/H5PTprivate.h
@@ -21,4 +21,3 @@
 #include "H5PTpublic.h"
 
 #endif
-
diff --git a/hl/src/H5PTpublic.h b/hl/src/H5PTpublic.h
index 8a12c8c..a94e81c 100644
--- a/hl/src/H5PTpublic.h
+++ b/hl/src/H5PTpublic.h
@@ -14,7 +14,6 @@
 #ifndef _H5PTpublic_H
 #define _H5PTpublic_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -25,17 +24,16 @@ extern "C" {
  */
 /* NOTE: H5PTcreate is replacing H5PTcreate_fl for better name due to the
    removal of H5PTcreate_vl.  H5PTcreate_fl may be retired in 1.8.19. */
-H5_HLDLL hid_t H5PTcreate(hid_t loc_id, const char *dset_name,
-			hid_t dtype_id, hsize_t chunk_size, hid_t plist_id);
+H5_HLDLL hid_t H5PTcreate(hid_t loc_id, const char *dset_name, hid_t dtype_id, hsize_t chunk_size,
+                          hid_t plist_id);
 
 H5_HLDLL hid_t H5PTopen(hid_t loc_id, const char *dset_name);
 
 H5_HLDLL herr_t H5PTclose(hid_t table_id);
 
 /* This function may be removed from the packet table in release 1.8.19. */
-H5_HLDLL hid_t H5PTcreate_fl(hid_t loc_id, const char *dset_name,
-			hid_t dtype_id, hsize_t chunk_size, int compression);
-
+H5_HLDLL hid_t H5PTcreate_fl(hid_t loc_id, const char *dset_name, hid_t dtype_id, hsize_t chunk_size,
+                             int compression);
 
 /*-------------------------------------------------------------------------
  * Write functions
@@ -47,10 +45,9 @@ H5_HLDLL herr_t H5PTappend(hid_t table_id, size_t nrecords, const void *data);
  * Read functions
  *-------------------------------------------------------------------------
  */
-H5_HLDLL herr_t H5PTget_next(hid_t table_id, size_t nrecords, void * data);
+H5_HLDLL herr_t H5PTget_next(hid_t table_id, size_t nrecords, void *data);
 
-H5_HLDLL herr_t H5PTread_packets(hid_t table_id, hsize_t start,
-			size_t nrecords, void *data);
+H5_HLDLL herr_t H5PTread_packets(hid_t table_id, hsize_t start, size_t nrecords, void *data);
 
 /*-------------------------------------------------------------------------
  * Inquiry functions
@@ -80,13 +77,11 @@ H5_HLDLL hid_t H5PTget_type(hid_t table_id);
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5PTcreate_index( hid_t table_id );
+H5_HLDLL herr_t H5PTcreate_index(hid_t table_id);
 
-H5_HLDLL herr_t  H5PTset_index( hid_t table_id,
-                             hsize_t pt_index );
+H5_HLDLL herr_t H5PTset_index(hid_t table_id, hsize_t pt_index);
 
-H5_HLDLL herr_t  H5PTget_index( hid_t table_id,
-                             hsize_t *pt_index );
+H5_HLDLL herr_t H5PTget_index(hid_t table_id, hsize_t *pt_index);
 
 /*-------------------------------------------------------------------------
  *
@@ -95,13 +90,10 @@ H5_HLDLL herr_t  H5PTget_index( hid_t table_id,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5PTfree_vlen_buff( hid_t table_id,
-                               size_t bufflen,
-                               void * buff );
+H5_HLDLL herr_t H5PTfree_vlen_buff(hid_t table_id, size_t bufflen, void *buff);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index a4bcbd4..5d51856 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
 #include <string.h>
@@ -17,178 +17,160 @@
 #include "H5LTprivate.h"
 #include "H5TBprivate.h"
 
-
 /*-------------------------------------------------------------------------
-*
-* internal functions
-*
-*-------------------------------------------------------------------------
-*/
-
-static hbool_t H5TB_find_field(const char *field,
-                           const char *field_list);
-
-static herr_t H5TB_attach_attributes(const char *table_title,
-                                     hid_t loc_id,
-                                     const char *dset_name,
-                                     hsize_t nfields,
-                                     hid_t tid);
-
-static hid_t H5TB_create_type(hid_t loc_id,
-                              const char *dset_name,
-                              size_t type_size,
-                              const size_t *field_offset,
-                              const size_t *field_sizes,
-                              hid_t ftype_id);
+ *
+ * internal functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static hbool_t H5TB_find_field(const char *field, const char *field_list);
+
+static herr_t H5TB_attach_attributes(const char *table_title, hid_t loc_id, const char *dset_name,
+                                     hsize_t nfields, hid_t tid);
+
+static hid_t H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size,
+                              const size_t *field_offset, const size_t *field_sizes, hid_t ftype_id);
 
 /*-------------------------------------------------------------------------
-*
-* Create functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Create functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBmake_table
-*
-* Purpose: Make a table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*             Quincey Koziol
-*
-* Date: January 17, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBmake_table(const char *table_title,
-                      hid_t loc_id,
-                      const char *dset_name,
-                      hsize_t nfields,
-                      hsize_t nrecords,
-                      size_t type_size,
-                      const char *field_names[],
-                      const size_t *field_offset,
-                      const hid_t *field_types,
-                      hsize_t chunk_size,
-                      void *fill_data,
-                      int compress,
-                      const void *buf)
+ * Function: H5TBmake_table
+ *
+ * Purpose: Make a table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *             Quincey Koziol
+ *
+ * Date: January 17, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsize_t nfields,
+               hsize_t nrecords, size_t type_size, const char *field_names[], const size_t *field_offset,
+               const hid_t *field_types, hsize_t chunk_size, void *fill_data, int compress, const void *buf)
 {
-    hid_t   did = H5I_BADID;
-    hid_t   sid = H5I_BADID;
-    hid_t   mem_type_id = H5I_BADID;
-    hid_t   plist_id = H5I_BADID;
-    hid_t   attr_id = H5I_BADID;
-    hsize_t dims[1];
-    hsize_t dims_chunk[1];
-    hsize_t maxdims[1] = {H5S_UNLIMITED};
-    char    attr_name[255];
-    char    *member_name = NULL;
-    unsigned char *tmp_buf = NULL;
-    hsize_t i;
-    herr_t  ret_val = -1;
+    hid_t          did         = H5I_BADID;
+    hid_t          sid         = H5I_BADID;
+    hid_t          mem_type_id = H5I_BADID;
+    hid_t          plist_id    = H5I_BADID;
+    hid_t          attr_id     = H5I_BADID;
+    hsize_t        dims[1];
+    hsize_t        dims_chunk[1];
+    hsize_t        maxdims[1] = {H5S_UNLIMITED};
+    char           attr_name[255];
+    char *         member_name = NULL;
+    unsigned char *tmp_buf     = NULL;
+    hsize_t        i;
+    herr_t         ret_val = -1;
 
     /* check the arguments */
     if (table_title == NULL) {
-      goto out;
+        goto out;
     }
     if (dset_name == NULL) {
-      goto out;
+        goto out;
     }
     if (field_names == NULL) {
-      goto out;
+        goto out;
     }
-    
+
     dims[0]       = nrecords;
     dims_chunk[0] = chunk_size;
 
     /* create the memory data type. */
-    if((mem_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+    if ((mem_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
         goto out;
 
     /* insert fields. */
-    for(i = 0; i < nfields; i++)
-        if(H5Tinsert(mem_type_id, field_names[i], field_offset[i], field_types[i] ) < 0)
+    for (i = 0; i < nfields; i++)
+        if (H5Tinsert(mem_type_id, field_names[i], field_offset[i], field_types[i]) < 0)
             goto out;
 
     /* create a simple data space with unlimited size */
-    if((sid = H5Screate_simple(1, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(1, dims, maxdims)) < 0)
         goto out;
 
     /* modify dataset creation properties, i.e. enable chunking  */
-    if((plist_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((plist_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
-    if(H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
+    if (H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
         goto out;
 
     /* set the fill value using a struct as the data type. */
-    if(fill_data)
-        if(H5Pset_fill_value(plist_id, mem_type_id, fill_data) < 0)
+    if (fill_data)
+        if (H5Pset_fill_value(plist_id, mem_type_id, fill_data) < 0)
             goto out;
 
     /*
     dataset creation property list is modified to use
     GZIP compression with the compression effort set to 6.
     */
-    if(compress)
-        if(H5Pset_deflate(plist_id, 6) < 0)
+    if (compress)
+        if (H5Pset_deflate(plist_id, 6) < 0)
             goto out;
 
     /* create the dataset. */
-    if((did = H5Dcreate2(loc_id, dset_name, mem_type_id, sid, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(loc_id, dset_name, mem_type_id, sid, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
         goto out;
 
     /* only write if there is something to write */
-    if(buf)
-        if(H5Dwrite(did, mem_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (buf)
+        if (H5Dwrite(did, mem_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
 
     /* terminate access to the data space. */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
     sid = H5I_BADID;
 
     /* end access to the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
     did = H5I_BADID;
 
     /* end access to the property list */
-    if(H5Pclose(plist_id) < 0)
+    if (H5Pclose(plist_id) < 0)
         goto out;
     plist_id = H5I_BADID;
 
     /*-------------------------------------------------------------------------
-    * set the conforming table attributes
-    *-------------------------------------------------------------------------
-    */
+     * set the conforming table attributes
+     *-------------------------------------------------------------------------
+     */
 
     /* attach the CLASS attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", TABLE_CLASS) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", TABLE_CLASS) < 0)
         goto out;
 
     /* attach the VERSION attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "VERSION", TABLE_VERSION) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "VERSION", TABLE_VERSION) < 0)
         goto out;
 
     /* attach the TITLE attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "TITLE", table_title) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "TITLE", table_title) < 0)
         goto out;
 
     /* attach the FIELD_ name attribute */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(mem_type_id, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(mem_type_id, (unsigned)i)))
             goto out;
 
         HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_NAME", (int)i);
 
         /* attach the attribute */
-        if(H5LTset_attribute_string(loc_id, dset_name, attr_name, member_name) < 0)
+        if (H5LTset_attribute_string(loc_id, dset_name, attr_name, member_name) < 0)
             goto out;
 
         H5free_memory(member_name);
@@ -196,357 +178,343 @@ herr_t H5TBmake_table(const char *table_title,
     } /* end for */
 
     /* attach the FIELD_ fill value attribute */
-    if(fill_data) {
+    if (fill_data) {
         tmp_buf = (unsigned char *)fill_data;
 
         /* open the dataset. */
-        if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+        if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
             goto out;
 
-        if((sid = H5Screate(H5S_SCALAR)) < 0)
+        if ((sid = H5Screate(H5S_SCALAR)) < 0)
             goto out;
 
-        for(i = 0; i < nfields; i++) {
+        for (i = 0; i < nfields; i++) {
             HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
-            if((attr_id = H5Acreate2(did, attr_name, field_types[i], sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            if ((attr_id = H5Acreate2(did, attr_name, field_types[i], sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 goto out;
 
-            if(H5Awrite(attr_id, field_types[i], tmp_buf + field_offset[i]) < 0)
+            if (H5Awrite(attr_id, field_types[i], tmp_buf + field_offset[i]) < 0)
                 goto out;
 
-            if(H5Aclose(attr_id) < 0)
+            if (H5Aclose(attr_id) < 0)
                 goto out;
             attr_id = H5I_BADID;
         } /* end for */
 
         /* terminate access to the data space. */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
         sid = H5I_BADID;
 
         /* end access to the dataset */
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
         did = H5I_BADID;
     } /* end if */
 
     /* release the datatype. */
-    if(H5Tclose(mem_type_id) < 0)
+    if (H5Tclose(mem_type_id) < 0)
         goto out;
     mem_type_id = H5I_BADID;
 
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(attr_id > 0)
-        if(H5Aclose(attr_id) < 0)
+    if (attr_id > 0)
+        if (H5Aclose(attr_id) < 0)
             ret_val = -1;
-    if(plist_id > 0)
-        if(H5Pclose(plist_id) < 0)
+    if (plist_id > 0)
+        if (H5Pclose(plist_id) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBmake_table() */
 
 /*-------------------------------------------------------------------------
-*
-* Write functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Write functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBappend_records
-*
-* Purpose: Appends records to a table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmers:
-*  Pedro Vicente, pvn@ncsa.uiuc.edu
-*  Quincey Koziol
-*
-* Date: November 19, 2001
-*
-* Comments: Uses memory offsets
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBappend_records(hid_t loc_id,
-                          const char *dset_name,
-                          hsize_t nrecords,
-                          size_t type_size,
-                          const size_t *field_offset,
-                          const size_t *field_sizes,
-                          const void *buf)
+ * Function: H5TBappend_records
+ *
+ * Purpose: Appends records to a table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmers:
+ *  Pedro Vicente, pvn@ncsa.uiuc.edu
+ *  Quincey Koziol
+ *
+ * Date: November 19, 2001
+ *
+ * Comments: Uses memory offsets
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBappend_records(hid_t loc_id, const char *dset_name, hsize_t nrecords, size_t type_size,
+                   const size_t *field_offset, const size_t *field_sizes, const void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hsize_t  nrecords_orig;
-    hsize_t  nfields;
-    herr_t   ret_val = -1;
+    hid_t   did         = H5I_BADID;
+    hid_t   tid         = H5I_BADID;
+    hid_t   mem_type_id = H5I_BADID;
+    hsize_t nrecords_orig;
+    hsize_t nfields;
+    herr_t  ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* get the original number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords_orig) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords_orig) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatypes */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
-    if((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
+    if ((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
         goto out;
 
     /* append the records */
-    if((H5TB_common_append_records(did, mem_type_id, (size_t)nrecords, nrecords_orig, buf)) < 0)
+    if ((H5TB_common_append_records(did, mem_type_id, (size_t)nrecords, nrecords_orig, buf)) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBappend_records() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBwrite_records
-*
-* Purpose: Writes records
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments: Uses memory offsets
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBwrite_records(hid_t loc_id,
-                         const char *dset_name,
-                         hsize_t start,
-                         hsize_t nrecords,
-                         size_t type_size,
-                         const size_t *field_offset,
-                         const size_t *field_sizes,
-                         const void *buf)
+ * Function: H5TBwrite_records
+ *
+ * Purpose: Writes records
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments: Uses memory offsets
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBwrite_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
+                  const size_t *field_offset, const size_t *field_sizes, const void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  dims[1];
-    herr_t   ret_val = -1;
+    hid_t   did         = H5I_BADID;
+    hid_t   tid         = H5I_BADID;
+    hid_t   sid         = H5I_BADID;
+    hid_t   m_sid       = H5I_BADID;
+    hid_t   mem_type_id = H5I_BADID;
+    hsize_t count[1];
+    hsize_t offset[1];
+    hsize_t mem_size[1];
+    hsize_t dims[1];
+    herr_t  ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
-    if((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
+    if ((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
         goto out;
 
     /* get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get records */
-    if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
 
-    if(start + nrecords > dims[0])
+    if (start + nrecords > dims[0])
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
-    if(H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBwrite_records() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBwrite_fields_name
-*
-* Purpose: Writes fields
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 21, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBwrite_fields_name(hid_t loc_id,
-                             const char *dset_name,
-                             const char *field_names,
-                             hsize_t start,
-                             hsize_t nrecords,
-                             size_t type_size,
-                             const size_t *field_offset,
-                             const size_t *field_sizes,
-                             const void *buf)
+ * Function: H5TBwrite_fields_name
+ *
+ * Purpose: Writes fields
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 21, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_names, hsize_t start,
+                      hsize_t nrecords, size_t type_size, const size_t *field_offset,
+                      const size_t *field_sizes, const void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    write_type_id = H5I_BADID;
+    hid_t    did            = H5I_BADID;
+    hid_t    tid            = H5I_BADID;
+    hid_t    write_type_id  = H5I_BADID;
     hid_t    member_type_id = H5I_BADID;
-    hid_t    nmtype_id = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hid_t    file_space_id = H5I_BADID;
-    hid_t    preserve_id = H5I_BADID;
+    hid_t    nmtype_id      = H5I_BADID;
+    hid_t    m_sid          = H5I_BADID;
+    hid_t    file_space_id  = H5I_BADID;
+    hid_t    preserve_id    = H5I_BADID;
     hssize_t nfields;
     hssize_t i, j;
     hsize_t  count[1];
     hsize_t  offset[1];
-    char     *member_name = NULL;
+    char *   member_name = NULL;
     size_t   size_native;
     herr_t   ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
-    if (field_names == NULL) 
+    if (field_names == NULL)
         goto out;
 
     /* create xfer properties to preserve initialized data */
-    if((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+    if ((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         goto out;
-    if(H5Pset_preserve(preserve_id, 1) < 0)
+    if (H5Pset_preserve(preserve_id, 1) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* get the number of fields */
-    if((nfields = H5Tget_nmembers(tid)) < 0)
+    if ((nfields = H5Tget_nmembers(tid)) < 0)
         goto out;
 
     /* create a write id */
-    if((write_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+    if ((write_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
         goto out;
 
     j = 0;
 
     /* iterate though the members */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
             goto out;
 
-        if(H5TB_find_field(member_name, field_names)) {
+        if (H5TB_find_field(member_name, field_names)) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid, (unsigned)i)) < 0)
                 goto out;
 
             /* convert to native type */
-            if((nmtype_id = H5Tget_native_type(member_type_id, H5T_DIR_DEFAULT)) < 0)
+            if ((nmtype_id = H5Tget_native_type(member_type_id, H5T_DIR_DEFAULT)) < 0)
                 goto out;
 
-            if(0 == (size_native = H5Tget_size(nmtype_id)))
+            if (0 == (size_native = H5Tget_size(nmtype_id)))
                 goto out;
 
             /* adjust, if necessary */
-            if(field_sizes[j] != size_native)
-                if(H5Tset_size(nmtype_id, field_sizes[j]) < 0)
+            if (field_sizes[j] != size_native)
+                if (H5Tset_size(nmtype_id, field_sizes[j]) < 0)
                     goto out;
 
             /* the field in the file is found by its name */
-            if(field_offset) {
-                if(H5Tinsert(write_type_id, member_name, field_offset[j], nmtype_id) < 0)
+            if (field_offset) {
+                if (H5Tinsert(write_type_id, member_name, field_offset[j], nmtype_id) < 0)
                     goto out;
             } /* end if */
             /* only one field */
             else {
-                if(H5Tinsert(write_type_id, member_name, (size_t)0, nmtype_id) < 0)
+                if (H5Tinsert(write_type_id, member_name, (size_t)0, nmtype_id) < 0)
                     goto out;
             } /* end else */
 
             j++;
 
             /* close */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
-            if(H5Tclose(nmtype_id) < 0)
+            if (H5Tclose(nmtype_id) < 0)
                 goto out;
             nmtype_id = H5I_BADID;
         } /* end if */
@@ -556,156 +524,150 @@ herr_t H5TBwrite_fields_name(hid_t loc_id,
     } /* end for */
 
     /* get the dataspace handle */
-    if((file_space_id = H5Dget_space(did)) < 0)
+    if ((file_space_id = H5Dget_space(did)) < 0)
         goto out;
-    if((m_sid = H5Screate_simple(1, &nrecords, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, &nrecords, NULL)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(file_space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(file_space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* write */
-    if(H5Dwrite(did, write_type_id, m_sid, file_space_id, preserve_id, buf) < 0)
+    if (H5Dwrite(did, write_type_id, m_sid, file_space_id, preserve_id, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(preserve_id > 0)
-        if(H5Pclose(preserve_id) < 0)
+    if (preserve_id > 0)
+        if (H5Pclose(preserve_id) < 0)
             ret_val = -1;
-    if(write_type_id > 0)
-        if(H5Tclose(write_type_id) < 0)
+    if (write_type_id > 0)
+        if (H5Tclose(write_type_id) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(file_space_id > 0)
-        if(H5Sclose(file_space_id) < 0)
+    if (file_space_id > 0)
+        if (H5Sclose(file_space_id) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBwrite_fields_name() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBwrite_fields_index
-*
-* Purpose: Writes fields
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 21, 2001
-*
-* Comments: Uses memory offsets
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBwrite_fields_index(hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t nfields,
-                              const int *field_index,
-                              hsize_t start,
-                              hsize_t nrecords,
-                              size_t type_size,
-                              const size_t *field_offset,
-                              const size_t *field_sizes,
-                              const void *buf)
+ * Function: H5TBwrite_fields_index
+ *
+ * Purpose: Writes fields
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 21, 2001
+ *
+ * Comments: Uses memory offsets
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, const int *field_index,
+                       hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset,
+                       const size_t *field_sizes, const void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    write_type_id = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    nmtype_id = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hid_t    file_space_id = H5I_BADID;
-    hid_t    preserve_id = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  i;
-    size_t   size_native;
-    char    *member_name = NULL;
-    herr_t   ret_val = -1;
+    hid_t   did            = H5I_BADID;
+    hid_t   tid            = H5I_BADID;
+    hid_t   write_type_id  = H5I_BADID;
+    hid_t   member_type_id = H5I_BADID;
+    hid_t   nmtype_id      = H5I_BADID;
+    hid_t   m_sid          = H5I_BADID;
+    hid_t   file_space_id  = H5I_BADID;
+    hid_t   preserve_id    = H5I_BADID;
+    hsize_t count[1];
+    hsize_t offset[1];
+    hsize_t i;
+    size_t  size_native;
+    char *  member_name = NULL;
+    herr_t  ret_val     = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* create xfer properties to preserve initialized data */
-    if((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+    if ((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         goto out;
-    if(H5Pset_preserve(preserve_id, 1) < 0)
+    if (H5Pset_preserve(preserve_id, 1) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* create a write id */
-    if((write_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+    if ((write_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
         goto out;
 
     /* iterate tru the members */
-    for(i = 0; i < nfields; i++) {
-        unsigned  j;
+    for (i = 0; i < nfields; i++) {
+        unsigned j;
 
         /* Range check value */
-        if(field_index[i] < 0)
+        if (field_index[i] < 0)
             goto out;
 
         j = (unsigned)field_index[i];
 
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid, j)))
+        if (NULL == (member_name = H5Tget_member_name(tid, j)))
             goto out;
 
         /* get the member type */
-        if((member_type_id = H5Tget_member_type(tid, j)) < 0)
+        if ((member_type_id = H5Tget_member_type(tid, j)) < 0)
             goto out;
 
         /* convert to native type */
-        if((nmtype_id = H5Tget_native_type(member_type_id,H5T_DIR_DEFAULT)) < 0)
+        if ((nmtype_id = H5Tget_native_type(member_type_id, H5T_DIR_DEFAULT)) < 0)
             goto out;
 
-        if(0 == (size_native = H5Tget_size(nmtype_id)))
+        if (0 == (size_native = H5Tget_size(nmtype_id)))
             goto out;
 
-        if(field_sizes[i] != size_native)
-            if(H5Tset_size(nmtype_id, field_sizes[i]) < 0)
+        if (field_sizes[i] != size_native)
+            if (H5Tset_size(nmtype_id, field_sizes[i]) < 0)
                 goto out;
 
         /* the field in the file is found by its name */
-        if(field_offset) {
-            if(H5Tinsert(write_type_id, member_name, field_offset[i], nmtype_id) < 0)
+        if (field_offset) {
+            if (H5Tinsert(write_type_id, member_name, field_offset[i], nmtype_id) < 0)
                 goto out;
         } /* end if */
         /* only one field */
         else {
-            if(H5Tinsert(write_type_id, member_name, (size_t)0, nmtype_id) < 0)
+            if (H5Tinsert(write_type_id, member_name, (size_t)0, nmtype_id) < 0)
                 goto out;
         } /* end else */
 
         /* close */
-        if(H5Tclose(member_type_id) < 0)
+        if (H5Tclose(member_type_id) < 0)
             goto out;
         member_type_id = H5I_BADID;
-        if(H5Tclose(nmtype_id) < 0)
+        if (H5Tclose(nmtype_id) < 0)
             goto out;
         nmtype_id = H5I_BADID;
 
@@ -714,309 +676,295 @@ herr_t H5TBwrite_fields_index(hid_t loc_id,
     } /* end for */
 
     /* get the dataspace handles */
-    if((file_space_id = H5Dget_space(did)) < 0)
+    if ((file_space_id = H5Dget_space(did)) < 0)
         goto out;
-    if((m_sid = H5Screate_simple(1, &nrecords, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, &nrecords, NULL)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(file_space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(file_space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* write */
-    if(H5Dwrite(did, write_type_id, m_sid, file_space_id, preserve_id, buf) < 0)
+    if (H5Dwrite(did, write_type_id, m_sid, file_space_id, preserve_id, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(preserve_id > 0)
-        if(H5Pclose(preserve_id) < 0)
+    if (preserve_id > 0)
+        if (H5Pclose(preserve_id) < 0)
             ret_val = -1;
-    if(write_type_id > 0)
-        if(H5Tclose(write_type_id) < 0)
+    if (write_type_id > 0)
+        if (H5Tclose(write_type_id) < 0)
             ret_val = -1;
-    if(member_type_id > 0)
-        if(H5Tclose(member_type_id) < 0)
+    if (member_type_id > 0)
+        if (H5Tclose(member_type_id) < 0)
             ret_val = -1;
-    if(nmtype_id > 0)
-        if(H5Tclose(nmtype_id) < 0)
+    if (nmtype_id > 0)
+        if (H5Tclose(nmtype_id) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(file_space_id > 0)
-        if(H5Sclose(file_space_id) < 0)
+    if (file_space_id > 0)
+        if (H5Sclose(file_space_id) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBwrite_fields_index() */
 
-
 /*-------------------------------------------------------------------------
-*
-* Read functions
-*
-*-------------------------------------------------------------------------
-*/
-
+ *
+ * Read functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBread_table
-*
-* Purpose: Reads a table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 20, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBread_table(hid_t loc_id,
-                      const char *dset_name,
-                      size_t type_size,
-                      const size_t *field_offset,
-                      const size_t *field_sizes,
-                      void *dst_buf)
+ * Function: H5TBread_table
+ *
+ * Purpose: Reads a table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 20, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBread_table(hid_t loc_id, const char *dset_name, size_t type_size, const size_t *field_offset,
+               const size_t *field_sizes, void *dst_buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    ftype_id = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hsize_t  dims[1];
-    herr_t   ret_val = -1;
+    hid_t   did         = H5I_BADID;
+    hid_t   ftype_id    = H5I_BADID;
+    hid_t   mem_type_id = H5I_BADID;
+    hid_t   sid         = H5I_BADID;
+    hsize_t dims[1];
+    herr_t  ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get dimensions */
-    if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
 
     /* get the datatypes */
-    if((ftype_id = H5Dget_type (did)) < 0)
+    if ((ftype_id = H5Dget_type(did)) < 0)
         goto out;
 
-    if((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, ftype_id)) < 0)
+    if ((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, ftype_id)) <
+        0)
         goto out;
 
     /* read */
-    if(H5Dread(did, mem_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, dst_buf) < 0)
+    if (H5Dread(did, mem_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, dst_buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(ftype_id > 0)
-        if(H5Tclose(ftype_id) < 0)
+    if (ftype_id > 0)
+        if (H5Tclose(ftype_id) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBread_table() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBread_records
-*
-* Purpose: Reads records
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBread_records(hid_t loc_id,
-                        const char *dset_name,
-                        hsize_t start,
-                        hsize_t nrecords,
-                        size_t type_size,
-                        const size_t *field_offset,
-                        const size_t *field_sizes,
-                        void *buf)
+ * Function: H5TBread_records
+ *
+ * Purpose: Reads records
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBread_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
+                 const size_t *field_offset, const size_t *field_sizes, void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    ftype_id = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hsize_t  nrecords_orig;
-    hsize_t  nfields;
-    herr_t   ret_val = -1;
+    hid_t   did         = H5I_BADID;
+    hid_t   ftype_id    = H5I_BADID;
+    hid_t   mem_type_id = H5I_BADID;
+    hsize_t nrecords_orig;
+    hsize_t nfields;
+    herr_t  ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords_orig) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords_orig) < 0)
         goto out;
 
     /* open the dataset */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatypes */
-    if((ftype_id = H5Dget_type(did)) < 0)
+    if ((ftype_id = H5Dget_type(did)) < 0)
         goto out;
 
-    if((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, ftype_id)) < 0)
+    if ((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, ftype_id)) <
+        0)
         goto out;
 
     /* read the records */
-    if((H5TB_common_read_records(did, mem_type_id, start, (size_t)nrecords, nrecords_orig, buf)) < 0)
+    if ((H5TB_common_read_records(did, mem_type_id, start, (size_t)nrecords, nrecords_orig, buf)) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(ftype_id > 0)
-        if(H5Tclose(ftype_id) < 0)
+    if (ftype_id > 0)
+        if (H5Tclose(ftype_id) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBread_records() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBread_fields_name
-*
-* Purpose: Reads fields
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBread_fields_name(hid_t loc_id,
-                            const char *dset_name,
-                            const char *field_names,
-                            hsize_t start,
-                            hsize_t nrecords,
-                            size_t type_size,
-                            const size_t *field_offset,
-                            const size_t *field_sizes,
-                            void *buf)
+ * Function: H5TBread_fields_name
+ *
+ * Purpose: Reads fields
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_names, hsize_t start,
+                     hsize_t nrecords, size_t type_size, const size_t *field_offset,
+                     const size_t *field_sizes, void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    ftype_id = H5I_BADID;
+    hid_t    did         = H5I_BADID;
+    hid_t    ftype_id    = H5I_BADID;
     hid_t    mem_type_id = H5I_BADID;
-    hid_t    mtype_id = H5I_BADID;
-    hid_t    nmtype_id = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
+    hid_t    mtype_id    = H5I_BADID;
+    hid_t    nmtype_id   = H5I_BADID;
+    hid_t    sid         = H5I_BADID;
+    hid_t    m_sid       = H5I_BADID;
     hssize_t nfields;
     hsize_t  count[1];
     hsize_t  offset[1];
     hsize_t  mem_size[1];
     size_t   size_native;
-    char    *member_name = NULL;
+    char *   member_name = NULL;
     hssize_t i, j;
     herr_t   ret_val = -1;
 
-
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
-    if (field_names == NULL) 
+    if (field_names == NULL)
         goto out;
 
     /* open the dataset */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((ftype_id = H5Dget_type(did)) < 0)
+    if ((ftype_id = H5Dget_type(did)) < 0)
         goto out;
 
     /* get the number of fields */
-    if((nfields = H5Tget_nmembers(ftype_id)) < 0)
+    if ((nfields = H5Tget_nmembers(ftype_id)) < 0)
         goto out;
 
     /* create a memory read id */
-    if((mem_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+    if ((mem_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
         goto out;
 
     /* iterate through the members */
-    for(i = 0, j = 0; i < nfields; i++) {
+    for (i = 0, j = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(ftype_id, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(ftype_id, (unsigned)i)))
             goto out;
 
-        if(H5TB_find_field(member_name, field_names)) {
+        if (H5TB_find_field(member_name, field_names)) {
             /* get the member type */
-            if((mtype_id = H5Tget_member_type(ftype_id, (unsigned)i)) < 0)
+            if ((mtype_id = H5Tget_member_type(ftype_id, (unsigned)i)) < 0)
                 goto out;
 
             /* convert to native type */
-            if((nmtype_id = H5Tget_native_type(mtype_id, H5T_DIR_DEFAULT)) < 0)
+            if ((nmtype_id = H5Tget_native_type(mtype_id, H5T_DIR_DEFAULT)) < 0)
                 goto out;
 
-            if(0 == (size_native = H5Tget_size(nmtype_id)))
+            if (0 == (size_native = H5Tget_size(nmtype_id)))
                 goto out;
 
-            if(field_sizes[j] != size_native)
-                if(H5Tset_size(nmtype_id, field_sizes[j]) < 0)
+            if (field_sizes[j] != size_native)
+                if (H5Tset_size(nmtype_id, field_sizes[j]) < 0)
                     goto out;
 
             /* the field in the file is found by its name */
-            if(field_offset) {
-                if(H5Tinsert(mem_type_id, member_name, field_offset[j], nmtype_id) < 0)
+            if (field_offset) {
+                if (H5Tinsert(mem_type_id, member_name, field_offset[j], nmtype_id) < 0)
                     goto out;
             } /* end if */
             else {
-                if(H5Tinsert(mem_type_id, member_name, (size_t)0, nmtype_id) < 0)
+                if (H5Tinsert(mem_type_id, member_name, (size_t)0, nmtype_id) < 0)
                     goto out;
             } /* end else */
 
             /* close */
-            if(H5Tclose(mtype_id) < 0)
+            if (H5Tclose(mtype_id) < 0)
                 goto out;
             mtype_id = H5I_BADID;
-            if(H5Tclose(nmtype_id) < 0)
+            if (H5Tclose(nmtype_id) < 0)
                 goto out;
             nmtype_id = H5I_BADID;
             j++;
@@ -1027,159 +975,153 @@ herr_t H5TBread_fields_name(hid_t loc_id,
     } /* end for */
 
     /* check to make sure field was found, no reason to continue if it does not exist */
-    if(j == 0)
-      goto out;
-    
+    if (j == 0)
+        goto out;
+
     /* get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
     /* read */
-    if(H5Dread(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Dread(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(mtype_id > 0)
-        if(H5Tclose(mtype_id) < 0)
+    if (mtype_id > 0)
+        if (H5Tclose(mtype_id) < 0)
             ret_val = -1;
-    if(nmtype_id > 0)
-        if(H5Tclose(nmtype_id) < 0)
+    if (nmtype_id > 0)
+        if (H5Tclose(nmtype_id) < 0)
             ret_val = -1;
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(ftype_id > 0)
-        if(H5Tclose(ftype_id) < 0)
+    if (ftype_id > 0)
+        if (H5Tclose(ftype_id) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBread_fields_name() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBread_fields_index
-*
-* Purpose: Reads fields
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBread_fields_index(hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t nfields,
-                             const int *field_index,
-                             hsize_t start,
-                             hsize_t nrecords,
-                             size_t type_size,
-                             const size_t *field_offset,
-                             const size_t *field_sizes,
-                             void *buf)
+ * Function: H5TBread_fields_index
+ *
+ * Purpose: Reads fields
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, const int *field_index,
+                      hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset,
+                      const size_t *field_sizes, void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    read_type_id = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    nmtype_id = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  i;
-    size_t   size_native;
-    char    *member_name = NULL;
-    herr_t   ret_val = -1;
+    hid_t   did            = H5I_BADID;
+    hid_t   tid            = H5I_BADID;
+    hid_t   read_type_id   = H5I_BADID;
+    hid_t   member_type_id = H5I_BADID;
+    hid_t   nmtype_id      = H5I_BADID;
+    hid_t   sid            = H5I_BADID;
+    hid_t   m_sid          = H5I_BADID;
+    hsize_t count[1];
+    hsize_t offset[1];
+    hsize_t mem_size[1];
+    hsize_t i;
+    size_t  size_native;
+    char *  member_name = NULL;
+    herr_t  ret_val     = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* create a read id */
-    if((read_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+    if ((read_type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
         goto out;
 
     /* iterate tru the members */
-    for(i = 0; i < nfields; i++) {
-        unsigned  j;
+    for (i = 0; i < nfields; i++) {
+        unsigned j;
 
         /* Range check */
-        if(field_index[i] < 0)
+        if (field_index[i] < 0)
             goto out;
 
         j = (unsigned)field_index[i];
 
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid, (unsigned)j)))
+        if (NULL == (member_name = H5Tget_member_name(tid, (unsigned)j)))
             goto out;
 
         /* get the member type */
-        if((member_type_id = H5Tget_member_type(tid, (unsigned)j)) < 0)
+        if ((member_type_id = H5Tget_member_type(tid, (unsigned)j)) < 0)
             goto out;
 
         /* convert to native type */
-        if((nmtype_id = H5Tget_native_type(member_type_id, H5T_DIR_DEFAULT)) < 0)
+        if ((nmtype_id = H5Tget_native_type(member_type_id, H5T_DIR_DEFAULT)) < 0)
             goto out;
 
-        if(0 == (size_native = H5Tget_size(nmtype_id)))
+        if (0 == (size_native = H5Tget_size(nmtype_id)))
             goto out;
 
-        if(field_sizes[i] != size_native)
-            if(H5Tset_size(nmtype_id, field_sizes[i]) < 0)
+        if (field_sizes[i] != size_native)
+            if (H5Tset_size(nmtype_id, field_sizes[i]) < 0)
                 goto out;
 
         /* the field in the file is found by its name */
-        if(field_offset) {
-            if(H5Tinsert(read_type_id, member_name, field_offset[i], nmtype_id) < 0)
+        if (field_offset) {
+            if (H5Tinsert(read_type_id, member_name, field_offset[i], nmtype_id) < 0)
                 goto out;
         } /* end if */
         else {
-            if(H5Tinsert(read_type_id, member_name, (size_t)0, nmtype_id) < 0)
+            if (H5Tinsert(read_type_id, member_name, (size_t)0, nmtype_id) < 0)
                 goto out;
         } /* end else */
 
         /* close the member type */
-        if(H5Tclose(member_type_id) < 0)
+        if (H5Tclose(member_type_id) < 0)
             goto out;
         member_type_id = H5I_BADID;
-        if(H5Tclose(nmtype_id) < 0)
+        if (H5Tclose(nmtype_id) < 0)
             goto out;
         nmtype_id = H5I_BADID;
 
@@ -1188,683 +1130,671 @@ herr_t H5TBread_fields_index(hid_t loc_id,
     } /* end for */
 
     /* get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
     /* read */
-    if(H5Dread( did, read_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Dread(did, read_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(read_type_id > 0)
-        if(H5Tclose(read_type_id) < 0)
+    if (read_type_id > 0)
+        if (H5Tclose(read_type_id) < 0)
             ret_val = -1;
-    if(member_type_id > 0)
-        if(H5Tclose(member_type_id) < 0)
+    if (member_type_id > 0)
+        if (H5Tclose(member_type_id) < 0)
             ret_val = -1;
-    if(nmtype_id > 0)
-        if(H5Tclose(nmtype_id) < 0)
+    if (nmtype_id > 0)
+        if (H5Tclose(nmtype_id) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBread_fields_index() */
 
-
 /*-------------------------------------------------------------------------
-*
-* Manipulation functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Manipulation functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBdelete_record
-*
-* Purpose: Delete records from middle of table ("pulling up" all the records after it)
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 26, 2001
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBdelete_record(hid_t loc_id,
-                         const char *dset_name,
-                         hsize_t start,
-                         hsize_t nrecords)
+ * Function: H5TBdelete_record
+ *
+ * Purpose: Delete records from middle of table ("pulling up" all the records after it)
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 26, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hsize_t  nfields;
-    hsize_t  ntotal_records;
-    hsize_t  read_start;
-    hsize_t  read_nrecords;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  dims[1];
-    size_t   src_size;
-    size_t  *src_offset = NULL;
-    size_t  *src_sizes = NULL;
-    unsigned char *tmp_buf = NULL;
-    herr_t   ret_val = -1;
+    hid_t          did         = H5I_BADID;
+    hid_t          tid         = H5I_BADID;
+    hid_t          sid         = H5I_BADID;
+    hid_t          m_sid       = H5I_BADID;
+    hid_t          mem_type_id = H5I_BADID;
+    hsize_t        nfields;
+    hsize_t        ntotal_records;
+    hsize_t        read_start;
+    hsize_t        read_nrecords;
+    hsize_t        count[1];
+    hsize_t        offset[1];
+    hsize_t        mem_size[1];
+    hsize_t        dims[1];
+    size_t         src_size;
+    size_t *       src_offset = NULL;
+    size_t *       src_sizes  = NULL;
+    unsigned char *tmp_buf    = NULL;
+    herr_t         ret_val    = -1;
 
-    
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * first we get information about type size and offsets on disk
-    *-------------------------------------------------------------------------
-    */
+     * first we get information about type size and offsets on disk
+     *-------------------------------------------------------------------------
+     */
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &ntotal_records) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &ntotal_records) < 0)
         goto out;
 
-    if(NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
-    if(NULL == (src_sizes = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_sizes = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
 
     /* get field info */
-    if(H5TBget_field_info(loc_id, dset_name, NULL, src_sizes, src_offset, &src_size) < 0)
+    if (H5TBget_field_info(loc_id, dset_name, NULL, src_sizes, src_offset, &src_size) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * read the records after the deleted one(s)
-    *-------------------------------------------------------------------------
-    */
+     * read the records after the deleted one(s)
+     *-------------------------------------------------------------------------
+     */
 
-    read_start = start + nrecords;
+    read_start    = start + nrecords;
     read_nrecords = ntotal_records - read_start;
 
-    if(read_nrecords) {
-        if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)read_nrecords, src_size)))
+    if (read_nrecords) {
+        if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)read_nrecords, src_size)))
             goto out;
 
         /* read the records after the deleted one(s) */
-        if(H5TBread_records(loc_id, dset_name, read_start, read_nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
+        if (H5TBread_records(loc_id, dset_name, read_start, read_nrecords, src_size, src_offset, src_sizes,
+                             tmp_buf) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * write the records in another position
-        *-------------------------------------------------------------------------
-        */
+         * write the records in another position
+         *-------------------------------------------------------------------------
+         */
 
         /* get the datatype */
-        if((tid = H5Dget_type(did)) < 0)
+        if ((tid = H5Dget_type(did)) < 0)
             goto out;
 
         /* get the dataspace handle */
-        if((sid = H5Dget_space(did)) < 0)
+        if ((sid = H5Dget_space(did)) < 0)
             goto out;
 
-	/* create the memory data type. */
-	if((mem_type_id = H5TB_create_type( loc_id, dset_name, src_size, src_offset, src_sizes, tid)) < 0)
-	    goto out;
+        /* create the memory data type. */
+        if ((mem_type_id = H5TB_create_type(loc_id, dset_name, src_size, src_offset, src_sizes, tid)) < 0)
+            goto out;
 
         /* define a hyperslab in the dataset of the size of the records */
         offset[0] = start;
         count[0]  = read_nrecords;
-        if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+        if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
             goto out;
 
         /* create a memory dataspace handle */
         mem_size[0] = count[0];
-        if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+        if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
             goto out;
 
-        if(H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
+        if (H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
             goto out;
 
         /* close */
-        if(H5Sclose(m_sid) < 0)
+        if (H5Sclose(m_sid) < 0)
             goto out;
         m_sid = H5I_BADID;
-	if(H5Tclose(mem_type_id) < 0)
-	    goto out;
+        if (H5Tclose(mem_type_id) < 0)
+            goto out;
         mem_type_id = H5I_BADID;
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
         sid = H5I_BADID;
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
         tid = H5I_BADID;
     } /* read_nrecords */
 
     /*-------------------------------------------------------------------------
-    * change the dataset dimension
-    *-------------------------------------------------------------------------
-    */
+     * change the dataset dimension
+     *-------------------------------------------------------------------------
+     */
     dims[0] = ntotal_records - nrecords;
-    if(H5Dset_extent(did, dims) < 0)
+    if (H5Dset_extent(did, dims) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(src_offset)
+    if (src_offset)
         HDfree(src_offset);
-    if(src_sizes)
+    if (src_sizes)
         HDfree(src_sizes);
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBdelete_record() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBinsert_record
-*
-* Purpose: Inserts records into middle of table ("pushing down" all the records after it)
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 26, 2001
-*
-* Comments: Uses memory offsets
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBinsert_record(hid_t loc_id,
-                         const char *dset_name,
-                         hsize_t start,
-                         hsize_t nrecords,
-                         size_t type_size,
-                         const size_t *field_offset,
-                         const size_t *field_sizes,
-                         void *buf)
+ * Function: H5TBinsert_record
+ *
+ * Purpose: Inserts records into middle of table ("pushing down" all the records after it)
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 26, 2001
+ *
+ * Comments: Uses memory offsets
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBinsert_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
+                  const size_t *field_offset, const size_t *field_sizes, void *buf)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hsize_t  nfields;
-    hsize_t  ntotal_records;
-    hsize_t  read_nrecords;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  dims[1];
-    hsize_t  mem_dims[1];
+    hid_t          did         = H5I_BADID;
+    hid_t          tid         = H5I_BADID;
+    hid_t          mem_type_id = H5I_BADID;
+    hid_t          sid         = H5I_BADID;
+    hid_t          m_sid       = H5I_BADID;
+    hsize_t        nfields;
+    hsize_t        ntotal_records;
+    hsize_t        read_nrecords;
+    hsize_t        count[1];
+    hsize_t        offset[1];
+    hsize_t        dims[1];
+    hsize_t        mem_dims[1];
     unsigned char *tmp_buf = NULL;
-    herr_t   ret_val = -1;
+    herr_t         ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * read the records after the inserted one(s)
-    *-------------------------------------------------------------------------
-    */
+     * read the records after the inserted one(s)
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dimensions  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &ntotal_records) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &ntotal_records) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* create the memory data type. */
-    if((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
+    if ((mem_type_id = H5TB_create_type(loc_id, dset_name, type_size, field_offset, field_sizes, tid)) < 0)
         goto out;
 
     read_nrecords = ntotal_records - start;
-    if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t) read_nrecords, type_size)))
+    if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)read_nrecords, type_size)))
         goto out;
 
     /* read the records after the inserted one(s) */
-    if(H5TBread_records(loc_id, dset_name, start, read_nrecords, type_size, field_offset, field_sizes, tmp_buf) < 0)
+    if (H5TBread_records(loc_id, dset_name, start, read_nrecords, type_size, field_offset, field_sizes,
+                         tmp_buf) < 0)
         goto out;
 
     /* extend the dataset */
     dims[0] = ntotal_records + nrecords;
 
-    if(H5Dset_extent(did, dims) < 0)
+    if (H5Dset_extent(did, dims) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * write the inserted records
-    *-------------------------------------------------------------------------
-    */
+     * write the inserted records
+     *-------------------------------------------------------------------------
+     */
 
     /* create a simple memory data space */
     mem_dims[0] = nrecords;
-    if((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
         goto out;
 
     /* get the file data space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset to write the new data */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
-    if(H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
 
     /* terminate access to the dataspace */
-    if(H5Sclose(m_sid) < 0)
+    if (H5Sclose(m_sid) < 0)
         goto out;
     m_sid = H5I_BADID;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
     sid = H5I_BADID;
 
     /*-------------------------------------------------------------------------
-    * write the "pushed down" records
-    *-------------------------------------------------------------------------
-    */
+     * write the "pushed down" records
+     *-------------------------------------------------------------------------
+     */
 
     /* create a simple memory data space */
     mem_dims[0] = read_nrecords;
-    if((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
         goto out;
 
     /* get the file data space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset to write the new data */
     offset[0] = start + nrecords;
     count[0]  = read_nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
-    if(H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dwrite(did, mem_type_id, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(mem_type_id > 0)
-        if(H5Tclose(mem_type_id) < 0)
+    if (mem_type_id > 0)
+        if (H5Tclose(mem_type_id) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBinsert_record() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBadd_records_from
-*
-* Purpose: Add records from first table to second table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: December 5, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBadd_records_from(hid_t loc_id,
-                            const char *dset_name1,
-                            hsize_t start1,
-                            hsize_t nrecords,
-                            const char *dset_name2,
-                            hsize_t start2)
+ * Function: H5TBadd_records_from
+ *
+ * Purpose: Add records from first table to second table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: December 5, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize_t nrecords,
+                     const char *dset_name2, hsize_t start2)
 {
-    hid_t    did = H5I_BADID;
-    hid_t    tid = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  nfields;
-    hsize_t  ntotal_records;
-    size_t   type_size1;
-    size_t   src_size;
-    size_t  *src_offset = NULL;
-    size_t  *src_sizes = NULL;
-    unsigned char *tmp_buf = NULL;
-    herr_t   ret_val = -1;
+    hid_t          did   = H5I_BADID;
+    hid_t          tid   = H5I_BADID;
+    hid_t          sid   = H5I_BADID;
+    hid_t          m_sid = H5I_BADID;
+    hsize_t        count[1];
+    hsize_t        offset[1];
+    hsize_t        mem_size[1];
+    hsize_t        nfields;
+    hsize_t        ntotal_records;
+    size_t         type_size1;
+    size_t         src_size;
+    size_t *       src_offset = NULL;
+    size_t *       src_sizes  = NULL;
+    unsigned char *tmp_buf    = NULL;
+    herr_t         ret_val    = -1;
 
     /* check the arguments */
-    if (dset_name1 == NULL) 
-      goto out;
-    if (dset_name2 == NULL) 
-      goto out;
+    if (dset_name1 == NULL)
+        goto out;
+    if (dset_name2 == NULL)
+        goto out;
 
     /*-------------------------------------------------------------------------
-    * first we get information about type size and offsets on disk
-    *-------------------------------------------------------------------------
-    */
+     * first we get information about type size and offsets on disk
+     *-------------------------------------------------------------------------
+     */
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name1, &nfields, &ntotal_records) < 0)
+    if (H5TBget_table_info(loc_id, dset_name1, &nfields, &ntotal_records) < 0)
         goto out;
 
-    if(NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
-    if(NULL == (src_sizes  = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_sizes = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
 
     /* get field info */
-    if(H5TBget_field_info(loc_id, dset_name1, NULL, src_sizes, src_offset, &src_size) < 0)
+    if (H5TBget_field_info(loc_id, dset_name1, NULL, src_sizes, src_offset, &src_size) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * Get information about the first table and read it
-    *-------------------------------------------------------------------------
-    */
+     * Get information about the first table and read it
+     *-------------------------------------------------------------------------
+     */
 
     /* open the 1st dataset. */
-    if((did = H5Dopen2(loc_id, dset_name1, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name1, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* get the dataspace handle */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get the size of the datatype */
-    if(0 == (type_size1 = H5Tget_size(tid)))
+    if (0 == (type_size1 = H5Tget_size(tid)))
         goto out;
 
-    if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size1)))
+    if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size1)))
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = start1;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
-    if(H5Dread(did, tid, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dread(did, tid, m_sid, sid, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * add to the second table
-    *-------------------------------------------------------------------------
-    */
-    if(H5TBinsert_record(loc_id, dset_name2, start2, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
+     * add to the second table
+     *-------------------------------------------------------------------------
+     */
+    if (H5TBinsert_record(loc_id, dset_name2, start2, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(src_offset)
+    if (src_offset)
         HDfree(src_offset);
-    if(src_sizes)
+    if (src_sizes)
         HDfree(src_sizes);
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBadd_records_from() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBcombine_tables
-*
-* Purpose: Combine records from two tables into a third
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: December 10, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBcombine_tables(hid_t loc_id1,
-                          const char *dset_name1,
-                          hid_t loc_id2,
-                          const char *dset_name2,
-                          const char *dset_name3)
+ * Function: H5TBcombine_tables
+ *
+ * Purpose: Combine records from two tables into a third
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: December 10, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const char *dset_name2,
+                   const char *dset_name3)
 {
     /* identifiers for the 1st dataset. */
-    hid_t    did_1 = H5I_BADID;
-    hid_t    tid_1 = H5I_BADID;
-    hid_t    sid_1 = H5I_BADID;
-    hid_t    pid_1 = H5I_BADID;
+    hid_t did_1 = H5I_BADID;
+    hid_t tid_1 = H5I_BADID;
+    hid_t sid_1 = H5I_BADID;
+    hid_t pid_1 = H5I_BADID;
     /* identifiers for the 2nd dataset. */
-    hid_t    did_2 = H5I_BADID;
-    hid_t    tid_2 = H5I_BADID;
-    hid_t    sid_2 = H5I_BADID;
-    hid_t    pid_2 = H5I_BADID;
+    hid_t did_2 = H5I_BADID;
+    hid_t tid_2 = H5I_BADID;
+    hid_t sid_2 = H5I_BADID;
+    hid_t pid_2 = H5I_BADID;
     /* identifiers for the 3rd dataset. */
-    hid_t    did_3 = H5I_BADID;
-    hid_t    tid_3 = H5I_BADID;
-    hid_t    sid_3 = H5I_BADID;
-    hid_t    pid_3 = H5I_BADID;
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    attr_id = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  nfields;
-    hsize_t  nrecords;
-    hsize_t  dims[1];
-    hsize_t  maxdims[1] = {H5S_UNLIMITED};
-    hsize_t  i;
-    size_t   type_size;
-    size_t   member_offset;
-    size_t   src_size;
-    size_t  *src_offset = NULL;
-    size_t  *src_sizes = NULL;
-    char     attr_name[255];
-    unsigned char *tmp_buf = NULL;
+    hid_t          did_3          = H5I_BADID;
+    hid_t          tid_3          = H5I_BADID;
+    hid_t          sid_3          = H5I_BADID;
+    hid_t          pid_3          = H5I_BADID;
+    hid_t          sid            = H5I_BADID;
+    hid_t          m_sid          = H5I_BADID;
+    hid_t          member_type_id = H5I_BADID;
+    hid_t          attr_id        = H5I_BADID;
+    hsize_t        count[1];
+    hsize_t        offset[1];
+    hsize_t        mem_size[1];
+    hsize_t        nfields;
+    hsize_t        nrecords;
+    hsize_t        dims[1];
+    hsize_t        maxdims[1] = {H5S_UNLIMITED};
+    hsize_t        i;
+    size_t         type_size;
+    size_t         member_offset;
+    size_t         src_size;
+    size_t *       src_offset = NULL;
+    size_t *       src_sizes  = NULL;
+    char           attr_name[255];
+    unsigned char *tmp_buf      = NULL;
     unsigned char *tmp_fill_buf = NULL;
-    htri_t   has_fill;
-    herr_t   ret_val = -1;
+    htri_t         has_fill;
+    herr_t         ret_val = -1;
 
     /* check the arguments */
-    if (dset_name1 == NULL) 
-      goto out;
-    if (dset_name2 == NULL) 
-      goto out;
-    if (dset_name3 == NULL) 
-      goto out;
+    if (dset_name1 == NULL)
+        goto out;
+    if (dset_name2 == NULL)
+        goto out;
+    if (dset_name3 == NULL)
+        goto out;
 
     /*-------------------------------------------------------------------------
-    * first we get information about type size and offsets on disk
-    *-------------------------------------------------------------------------
-    */
+     * first we get information about type size and offsets on disk
+     *-------------------------------------------------------------------------
+     */
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id1, dset_name1, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id1, dset_name1, &nfields, &nrecords) < 0)
         goto out;
 
-    if(NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
-    if(NULL == (src_sizes  = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_sizes = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
 
     /* get field info */
-    if(H5TBget_field_info(loc_id1, dset_name1, NULL, src_sizes, src_offset, &src_size) < 0)
+    if (H5TBget_field_info(loc_id1, dset_name1, NULL, src_sizes, src_offset, &src_size) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get information about the first table
-    *-------------------------------------------------------------------------
-    */
+     * get information about the first table
+     *-------------------------------------------------------------------------
+     */
 
     /* open the 1st dataset. */
-    if((did_1 = H5Dopen2(loc_id1, dset_name1, H5P_DEFAULT)) < 0)
+    if ((did_1 = H5Dopen2(loc_id1, dset_name1, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_1 = H5Dget_type(did_1)) < 0)
+    if ((tid_1 = H5Dget_type(did_1)) < 0)
         goto out;
 
     /* get the dataspace handle */
-    if((sid_1 = H5Dget_space(did_1)) < 0)
+    if ((sid_1 = H5Dget_space(did_1)) < 0)
         goto out;
 
     /* get creation properties list */
-    if((pid_1 = H5Dget_create_plist(did_1)) < 0)
+    if ((pid_1 = H5Dget_create_plist(did_1)) < 0)
         goto out;
 
     /* get the dimensions  */
-    if(H5TBget_table_info(loc_id1, dset_name1, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id1, dset_name1, &nfields, &nrecords) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * make the merged table with no data originally
-    *-------------------------------------------------------------------------
-    */
+     * make the merged table with no data originally
+     *-------------------------------------------------------------------------
+     */
 
     /* clone the property list */
-    if((pid_3 = H5Pcopy(pid_1)) < 0)
+    if ((pid_3 = H5Pcopy(pid_1)) < 0)
         goto out;
 
     /* clone the type id */
-    if((tid_3 = H5Tcopy(tid_1)) < 0)
+    if ((tid_3 = H5Tcopy(tid_1)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * here we do not clone the file space from the 1st dataset, because we want to create
-    * an empty table. Instead we create a new dataspace with zero records and expandable.
-    *-------------------------------------------------------------------------
-    */
+     * here we do not clone the file space from the 1st dataset, because we want to create
+     * an empty table. Instead we create a new dataspace with zero records and expandable.
+     *-------------------------------------------------------------------------
+     */
     dims[0] = 0;
 
     /* create a simple data space with unlimited size */
-    if((sid_3 = H5Screate_simple(1, dims, maxdims)) < 0)
+    if ((sid_3 = H5Screate_simple(1, dims, maxdims)) < 0)
         goto out;
 
     /* create the dataset */
-    if((did_3 = H5Dcreate2(loc_id1, dset_name3, tid_3, sid_3, H5P_DEFAULT, pid_3, H5P_DEFAULT)) < 0)
+    if ((did_3 = H5Dcreate2(loc_id1, dset_name3, tid_3, sid_3, H5P_DEFAULT, pid_3, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the conforming table attributes
-    *-------------------------------------------------------------------------
-    */
-    if(H5TB_attach_attributes("Merge table", loc_id1, dset_name3, nfields, tid_3) < 0)
+     * attach the conforming table attributes
+     *-------------------------------------------------------------------------
+     */
+    if (H5TB_attach_attributes("Merge table", loc_id1, dset_name3, nfields, tid_3) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get attributes
-    *-------------------------------------------------------------------------
-    */
-    if(0 == (type_size = H5Tget_size(tid_3)))
+     * get attributes
+     *-------------------------------------------------------------------------
+     */
+    if (0 == (type_size = H5Tget_size(tid_3)))
         goto out;
 
     /* alloc fill value attribute buffer */
-    if(NULL == (tmp_fill_buf = (unsigned char *)HDmalloc(type_size)))
+    if (NULL == (tmp_fill_buf = (unsigned char *)HDmalloc(type_size)))
         goto out;
 
     /* get the fill value attributes */
-    if((has_fill = H5TBAget_fill(loc_id1, dset_name1, did_1, tmp_fill_buf)) < 0)
+    if ((has_fill = H5TBAget_fill(loc_id1, dset_name1, did_1, tmp_fill_buf)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the fill attributes from previous table
-    *-------------------------------------------------------------------------
-    */
-    if(has_fill) {
-        if((sid = H5Screate(H5S_SCALAR)) < 0)
+     * attach the fill attributes from previous table
+     *-------------------------------------------------------------------------
+     */
+    if (has_fill) {
+        if ((sid = H5Screate(H5S_SCALAR)) < 0)
             goto out;
 
-        for(i = 0; i < nfields; i++) {
+        for (i = 0; i < nfields; i++) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
                 goto out;
 
             /* get the member offset */
@@ -1872,258 +1802,254 @@ herr_t H5TBcombine_tables(hid_t loc_id1,
 
             HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
-            if((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            if ((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 goto out;
 
-            if(H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
+            if (H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
                 goto out;
 
-            if(H5Aclose(attr_id) < 0)
+            if (H5Aclose(attr_id) < 0)
                 goto out;
             attr_id = H5I_BADID;
 
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
         } /* end for */
 
         /* close data space. */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
         sid = H5I_BADID;
     } /* end if */
 
     /*-------------------------------------------------------------------------
-    * read data from 1st table
-    *-------------------------------------------------------------------------
-    */
-    if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size)))
+     * read data from 1st table
+     *-------------------------------------------------------------------------
+     */
+    if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size)))
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = 0;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid_1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid_1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
-    if(H5Dread(did_1, tid_1, m_sid, sid_1, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dread(did_1, tid_1, m_sid, sid_1, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * save data from 1st table into new table
-    *-------------------------------------------------------------------------
-    */
+     * save data from 1st table into new table
+     *-------------------------------------------------------------------------
+     */
 
     /* append the records to the new table */
-    if(H5TBappend_records(loc_id1, dset_name3, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
+    if (H5TBappend_records(loc_id1, dset_name3, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * release temporary resources
-    *-------------------------------------------------------------------------
-    */
-    if(H5Sclose(m_sid) < 0)
+     * release temporary resources
+     *-------------------------------------------------------------------------
+     */
+    if (H5Sclose(m_sid) < 0)
         goto out;
     m_sid = H5I_BADID;
     HDfree(tmp_buf);
     tmp_buf = NULL;
 
     /*-------------------------------------------------------------------------
-    * get information about the 2nd table
-    *-------------------------------------------------------------------------
-    */
+     * get information about the 2nd table
+     *-------------------------------------------------------------------------
+     */
 
     /* open the dataset. */
-    if((did_2 = H5Dopen2(loc_id2, dset_name2, H5P_DEFAULT)) < 0)
+    if ((did_2 = H5Dopen2(loc_id2, dset_name2, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_2 = H5Dget_type(did_2)) < 0)
+    if ((tid_2 = H5Dget_type(did_2)) < 0)
         goto out;
 
     /* get the dataspace handle */
-    if((sid_2 = H5Dget_space(did_2)) < 0)
+    if ((sid_2 = H5Dget_space(did_2)) < 0)
         goto out;
 
     /* get the property list handle */
-    if((pid_2 = H5Dget_create_plist(did_2)) < 0)
+    if ((pid_2 = H5Dget_create_plist(did_2)) < 0)
         goto out;
 
     /* get the dimensions  */
-    if(H5TBget_table_info(loc_id2, dset_name2, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id2, dset_name2, &nfields, &nrecords) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * read data from 2nd table
-    *-------------------------------------------------------------------------
-    */
+     * read data from 2nd table
+     *-------------------------------------------------------------------------
+     */
 
-    if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size)))
+    if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, type_size)))
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = 0;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid_2, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid_2, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
-    if(H5Dread(did_2, tid_2, m_sid, sid_2, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dread(did_2, tid_2, m_sid, sid_2, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * save data from 2nd table into new table
-    *-------------------------------------------------------------------------
-    */
+     * save data from 2nd table into new table
+     *-------------------------------------------------------------------------
+     */
 
     /* append the records to the new table */
-    if(H5TBappend_records(loc_id1, dset_name3, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
+    if (H5TBappend_records(loc_id1, dset_name3, nrecords, src_size, src_offset, src_sizes, tmp_buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(tmp_fill_buf)
+    if (tmp_fill_buf)
         HDfree(tmp_fill_buf);
-    if(src_offset)
+    if (src_offset)
         HDfree(src_offset);
-    if(src_sizes)
+    if (src_sizes)
         HDfree(src_sizes);
-    if(member_type_id > 0)
-        if(H5Tclose(member_type_id) < 0)
+    if (member_type_id > 0)
+        if (H5Tclose(member_type_id) < 0)
             ret_val = -1;
-    if(attr_id > 0)
-        if(H5Aclose(attr_id) < 0)
+    if (attr_id > 0)
+        if (H5Aclose(attr_id) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid_1 > 0)
-        if(H5Sclose(sid_1) < 0)
+    if (sid_1 > 0)
+        if (H5Sclose(sid_1) < 0)
             ret_val = -1;
-    if(tid_1 > 0)
-        if(H5Tclose(tid_1) < 0)
+    if (tid_1 > 0)
+        if (H5Tclose(tid_1) < 0)
             ret_val = -1;
-    if(pid_1 > 0)
-        if(H5Pclose(pid_1) < 0)
+    if (pid_1 > 0)
+        if (H5Pclose(pid_1) < 0)
             ret_val = -1;
-    if(did_1 > 0)
-        if(H5Dclose(did_1) < 0)
+    if (did_1 > 0)
+        if (H5Dclose(did_1) < 0)
             ret_val = -1;
-    if(sid_2 > 0)
-        if(H5Sclose(sid_2) < 0)
+    if (sid_2 > 0)
+        if (H5Sclose(sid_2) < 0)
             ret_val = -1;
-    if(tid_2 > 0)
-        if(H5Tclose(tid_2) < 0)
+    if (tid_2 > 0)
+        if (H5Tclose(tid_2) < 0)
             ret_val = -1;
-    if(pid_2 > 0)
-        if(H5Pclose(pid_2) < 0)
+    if (pid_2 > 0)
+        if (H5Pclose(pid_2) < 0)
             ret_val = -1;
-    if(did_2 > 0)
-        if(H5Dclose(did_2) < 0)
+    if (did_2 > 0)
+        if (H5Dclose(did_2) < 0)
             ret_val = -1;
-    if(sid_3 > 0)
-        if(H5Sclose(sid_3) < 0)
+    if (sid_3 > 0)
+        if (H5Sclose(sid_3) < 0)
             ret_val = -1;
-    if(tid_3 > 0)
-        if(H5Tclose(tid_3) < 0)
+    if (tid_3 > 0)
+        if (H5Tclose(tid_3) < 0)
             ret_val = -1;
-    if(pid_3 > 0)
-        if(H5Pclose(pid_3) < 0)
+    if (pid_3 > 0)
+        if (H5Pclose(pid_3) < 0)
             ret_val = -1;
-    if(did_3 > 0)
-        if(H5Dclose(did_3) < 0)
+    if (did_3 > 0)
+        if (H5Dclose(did_3) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBcombine_tables() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBinsert_field
-*
-* Purpose: Inserts a field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: January 30, 2002
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBinsert_field(hid_t loc_id,
-                        const char *dset_name,
-                        const char *field_name,
-                        hid_t field_type,
-                        hsize_t position,
-                        const void *fill_data,
-                        const void *buf)
+ * Function: H5TBinsert_field
+ *
+ * Purpose: Inserts a field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: January 30, 2002
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hid_t field_type,
+                 hsize_t position, const void *fill_data, const void *buf)
 {
     /* identifiers for the 1st, original dataset */
-    hid_t    did_1 = H5I_BADID;
-    hid_t    tid_1 = H5I_BADID;
-    hid_t    sid_1 = H5I_BADID;
-    hid_t    pid_1 = H5I_BADID;
-    hid_t    msid_1 = H5I_BADID;
+    hid_t did_1  = H5I_BADID;
+    hid_t tid_1  = H5I_BADID;
+    hid_t sid_1  = H5I_BADID;
+    hid_t pid_1  = H5I_BADID;
+    hid_t msid_1 = H5I_BADID;
     /* identifiers for the 2nd, new dataset */
-    hid_t    did_2 = H5I_BADID;
-    hid_t    tid_2 = H5I_BADID;
-    hid_t    sid_2 = H5I_BADID;
-    hid_t    pid_2 = H5I_BADID;
-    hid_t    msid_2 = H5I_BADID;
+    hid_t did_2  = H5I_BADID;
+    hid_t tid_2  = H5I_BADID;
+    hid_t sid_2  = H5I_BADID;
+    hid_t pid_2  = H5I_BADID;
+    hid_t msid_2 = H5I_BADID;
     /* identifiers for the 3rd, final dataset */
-    hid_t    did_3 = H5I_BADID;
-    hid_t    tid_3 = H5I_BADID;
-    hid_t    sid_3 = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    write_type_id = H5I_BADID;
-    hid_t    preserve_id = H5I_BADID;
-    hid_t    attr_id = H5I_BADID;
-    size_t   member_size;
-    size_t   new_member_size = 0;
-    size_t   total_size;
-    size_t   curr_offset;
-    hsize_t  nfields;
-    hsize_t  nrecords;
-    hsize_t  dims_chunk[1];
-    hsize_t  dims[1];
-    hsize_t  maxdims[1] = { H5S_UNLIMITED };
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    hsize_t  i;
-    char     table_title[255];
-    char     attr_name[255];
-    char    *member_name = NULL;
-    unsigned char *tmp_buf = NULL;
+    hid_t          did_3          = H5I_BADID;
+    hid_t          tid_3          = H5I_BADID;
+    hid_t          sid_3          = H5I_BADID;
+    hid_t          member_type_id = H5I_BADID;
+    hid_t          write_type_id  = H5I_BADID;
+    hid_t          preserve_id    = H5I_BADID;
+    hid_t          attr_id        = H5I_BADID;
+    size_t         member_size;
+    size_t         new_member_size = 0;
+    size_t         total_size;
+    size_t         curr_offset;
+    hsize_t        nfields;
+    hsize_t        nrecords;
+    hsize_t        dims_chunk[1];
+    hsize_t        dims[1];
+    hsize_t        maxdims[1] = {H5S_UNLIMITED};
+    hsize_t        count[1];
+    hsize_t        offset[1];
+    hsize_t        mem_size[1];
+    hsize_t        i;
+    char           table_title[255];
+    char           attr_name[255];
+    char *         member_name  = NULL;
+    unsigned char *tmp_buf      = NULL;
     unsigned char *tmp_fill_buf = NULL;
-    hbool_t  inserted;
-    herr_t   ret_val = -1;
+    hbool_t        inserted;
+    herr_t         ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
-    if (field_name == NULL) 
+    if (field_name == NULL)
         goto out;
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2132,27 +2058,27 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* open the dataset. */
-    if((did_1 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did_1 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get creation properties list */
-    if((pid_1 = H5Dget_create_plist(did_1)) < 0)
+    if ((pid_1 = H5Dget_create_plist(did_1)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_1 = H5Dget_type(did_1)) < 0)
+    if ((tid_1 = H5Dget_type(did_1)) < 0)
         goto out;
 
     /* get the size of the datatype */
-    if(0 == (total_size = H5Tget_size(tid_1)))
+    if (0 == (total_size = H5Tget_size(tid_1)))
         goto out;
 
     /* get the dataspace handle */
-    if((sid_1 = H5Dget_space(did_1)) < 0)
+    if ((sid_1 = H5Dget_space(did_1)) < 0)
         goto out;
 
     /* get dimension */
-    if(H5Sget_simple_extent_dims(sid_1, dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid_1, dims, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2161,15 +2087,15 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* get the table title */
-    if((H5TBAget_title(did_1, table_title)) < 0)
+    if ((H5TBAget_title(did_1, table_title)) < 0)
         goto out;
 
     /* alloc fill value attribute buffer */
-    if(NULL == (tmp_fill_buf = (unsigned char *)HDmalloc(total_size)))
+    if (NULL == (tmp_fill_buf = (unsigned char *)HDmalloc(total_size)))
         goto out;
 
     /* get the fill value attributes */
-    if((H5TBAget_fill(loc_id, dset_name, did_1, tmp_fill_buf)) < 0)
+    if ((H5TBAget_fill(loc_id, dset_name, did_1, tmp_fill_buf)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2178,31 +2104,31 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* get the new member size */
-    if(0 == (member_size = H5Tget_size(field_type)))
+    if (0 == (member_size = H5Tget_size(field_type)))
         goto out;
 
     /* create the data type. */
-    if((tid_2 = H5Tcreate(H5T_COMPOUND, (size_t)(total_size + member_size))) < 0)
+    if ((tid_2 = H5Tcreate(H5T_COMPOUND, (size_t)(total_size + member_size))) < 0)
         goto out;
 
     curr_offset = 0;
     inserted    = FALSE;
 
     /* insert the old fields, counting with the new one */
-    for(i = 0; i < nfields + 1; i++) {
-        hsize_t  idx;
+    for (i = 0; i < nfields + 1; i++) {
+        hsize_t idx;
 
         idx = i;
-        if(inserted)
+        if (inserted)
             idx = i - 1;
 
-        if(i == position) {
+        if (i == position) {
             /* get the new member size */
-            if(0 == (new_member_size = H5Tget_size(field_type)))
+            if (0 == (new_member_size = H5Tget_size(field_type)))
                 goto out;
 
             /* insert the new field type */
-            if(H5Tinsert(tid_2, field_name, curr_offset, field_type) < 0)
+            if (H5Tinsert(tid_2, field_name, curr_offset, field_type) < 0)
                 goto out;
 
             curr_offset += new_member_size;
@@ -2211,19 +2137,19 @@ herr_t H5TBinsert_field(hid_t loc_id,
         } /* end if */
         else {
             /* get the member name */
-            if(NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)idx)))
+            if (NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)idx)))
                 goto out;
 
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_1, (unsigned)idx)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_1, (unsigned)idx)) < 0)
                 goto out;
 
             /* get the member size */
-            if(0 == (member_size = H5Tget_size(member_type_id)))
+            if (0 == (member_size = H5Tget_size(member_type_id)))
                 goto out;
 
             /* insert it into the new type */
-            if(H5Tinsert(tid_2, member_name, curr_offset, member_type_id) < 0)
+            if (H5Tinsert(tid_2, member_name, curr_offset, member_type_id) < 0)
                 goto out;
 
             curr_offset += member_size;
@@ -2232,11 +2158,11 @@ herr_t H5TBinsert_field(hid_t loc_id,
             member_name = NULL;
 
             /* close the member type */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     /*-------------------------------------------------------------------------
      * create a new temporary dataset
@@ -2244,21 +2170,21 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* retrieve the size of chunk */
-    if(H5Pget_chunk(pid_1, 1, dims_chunk) < 0)
+    if (H5Pget_chunk(pid_1, 1, dims_chunk) < 0)
         goto out;
 
     /* create a new simple data space with unlimited size, using the dimension */
-    if((sid_2 = H5Screate_simple(1, dims, maxdims)) < 0)
+    if ((sid_2 = H5Screate_simple(1, dims, maxdims)) < 0)
         goto out;
 
     /* modify dataset creation properties, i.e. enable chunking  */
-    if((pid_2 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((pid_2 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
-    if(H5Pset_chunk(pid_2, 1, dims_chunk) < 0)
+    if (H5Pset_chunk(pid_2, 1, dims_chunk) < 0)
         goto out;
 
     /* create the dataset. */
-    if((did_2 = H5Dcreate2(loc_id, "new", tid_2, sid_2, H5P_DEFAULT, pid_2, H5P_DEFAULT)) < 0)
+    if ((did_2 = H5Dcreate2(loc_id, "new", tid_2, sid_2, H5P_DEFAULT, pid_2, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2266,21 +2192,21 @@ herr_t H5TBinsert_field(hid_t loc_id,
      *-------------------------------------------------------------------------
      */
 
-    if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, (size_t)total_size)))
+    if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, (size_t)total_size)))
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = 0;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid_1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid_1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((msid_1 = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((msid_1 = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
 
-    if(H5Dread(did_1, tid_1, msid_1, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dread(did_1, tid_1, msid_1, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2289,7 +2215,7 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* write */
-    if(H5Dwrite(did_2, tid_1, msid_1, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
+    if (H5Dwrite(did_2, tid_1, msid_1, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2298,27 +2224,27 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* create a write id */
-    if((write_type_id = H5Tcreate(H5T_COMPOUND, (size_t)new_member_size)) < 0)
+    if ((write_type_id = H5Tcreate(H5T_COMPOUND, (size_t)new_member_size)) < 0)
         goto out;
 
     /* the field in the file is found by its name */
-    if(H5Tinsert(write_type_id, field_name, (size_t)0, field_type) < 0)
+    if (H5Tinsert(write_type_id, field_name, (size_t)0, field_type) < 0)
         goto out;
 
     /* create xfer properties to preserve initialized data */
-    if((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+    if ((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         goto out;
-    if(H5Pset_preserve(preserve_id, 1) < 0)
+    if (H5Pset_preserve(preserve_id, 1) < 0)
         goto out;
 
     /* only write if there is something to write */
-    if(buf) {
+    if (buf) {
         /* create a memory dataspace handle */
-        if((msid_2 = H5Screate_simple(1, mem_size, NULL)) < 0)
+        if ((msid_2 = H5Screate_simple(1, mem_size, NULL)) < 0)
             goto out;
 
         /* write */
-        if(H5Dwrite(did_2, write_type_id, msid_2, sid_2, preserve_id, buf) < 0)
+        if (H5Dwrite(did_2, write_type_id, msid_2, sid_2, preserve_id, buf) < 0)
             goto out;
     } /* end if */
 
@@ -2326,14 +2252,14 @@ herr_t H5TBinsert_field(hid_t loc_id,
      * delete 1st table
      *-------------------------------------------------------------------------
      */
-    if(H5Ldelete(loc_id, dset_name, H5P_DEFAULT) < 0)
+    if (H5Ldelete(loc_id, dset_name, H5P_DEFAULT) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
      * rename 2nd table
      *-------------------------------------------------------------------------
      */
-    if(H5Lmove(loc_id, "new", H5L_SAME_LOC, dset_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+    if (H5Lmove(loc_id, "new", H5L_SAME_LOC, dset_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -2342,33 +2268,33 @@ herr_t H5TBinsert_field(hid_t loc_id,
      */
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did_3 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did_3 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_3 = H5Dget_type(did_3)) < 0)
+    if ((tid_3 = H5Dget_type(did_3)) < 0)
         goto out;
 
     /* set the attributes */
-    if(H5TB_attach_attributes(table_title, loc_id, dset_name, (hsize_t)nfields, tid_3) < 0)
+    if (H5TB_attach_attributes(table_title, loc_id, dset_name, (hsize_t)nfields, tid_3) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
      * attach the fill attributes from previous table
      *-------------------------------------------------------------------------
      */
-    if((sid_3 = H5Screate(H5S_SCALAR)) < 0)
+    if ((sid_3 = H5Screate(H5S_SCALAR)) < 0)
         goto out;
 
-    for(i = 0; i < (nfields - 1); i++) {
-        size_t   member_offset;
+    for (i = 0; i < (nfields - 1); i++) {
+        size_t member_offset;
 
         /* get the member type */
-        if((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
+        if ((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
             goto out;
 
         /* get the member offset */
@@ -2376,18 +2302,18 @@ herr_t H5TBinsert_field(hid_t loc_id,
 
         HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
-        if((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
-        if(H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
+        if (H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
             goto out;
 
-        if(H5Aclose(attr_id) < 0)
+        if (H5Aclose(attr_id) < 0)
             goto out;
         attr_id = H5I_BADID;
 
         /* close the member type */
-        if(H5Tclose(member_type_id) < 0)
+        if (H5Tclose(member_type_id) < 0)
             goto out;
         member_type_id = H5I_BADID;
     } /* end for */
@@ -2396,24 +2322,24 @@ herr_t H5TBinsert_field(hid_t loc_id,
      * attach the fill attribute from the new field, if present
      *-------------------------------------------------------------------------
      */
-    if(fill_data) {
+    if (fill_data) {
         HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)(nfields - 1));
 
         /* get the member type */
-        if((member_type_id = H5Tget_member_type(tid_3, (unsigned)nfields - 1)) < 0)
+        if ((member_type_id = H5Tget_member_type(tid_3, (unsigned)nfields - 1)) < 0)
             goto out;
 
-        if((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
-        if(H5Awrite(attr_id, member_type_id, fill_data) < 0)
+        if (H5Awrite(attr_id, member_type_id, fill_data) < 0)
             goto out;
 
-        if(H5Aclose(attr_id) < 0)
+        if (H5Aclose(attr_id) < 0)
             goto out;
         attr_id = H5I_BADID;
 
-        if(H5Tclose(member_type_id) < 0)
+        if (H5Tclose(member_type_id) < 0)
             goto out;
         member_type_id = H5I_BADID;
     } /* end fill_data */
@@ -2421,178 +2347,176 @@ herr_t H5TBinsert_field(hid_t loc_id,
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(tmp_fill_buf)
+    if (tmp_fill_buf)
         HDfree(tmp_fill_buf);
-    if(preserve_id > 0)
-        if(H5Pclose(preserve_id) < 0)
+    if (preserve_id > 0)
+        if (H5Pclose(preserve_id) < 0)
             ret_val = -1;
-    if(msid_1 > 0)
-        if(H5Sclose(msid_1) < 0)
+    if (msid_1 > 0)
+        if (H5Sclose(msid_1) < 0)
             ret_val = -1;
-    if(tid_1 > 0)
-        if(H5Tclose(tid_1) < 0)
+    if (tid_1 > 0)
+        if (H5Tclose(tid_1) < 0)
             ret_val = -1;
-    if(pid_1 > 0)
-        if(H5Pclose(pid_1) < 0)
+    if (pid_1 > 0)
+        if (H5Pclose(pid_1) < 0)
             ret_val = -1;
-    if(sid_1 > 0)
-        if(H5Sclose(sid_1) < 0)
+    if (sid_1 > 0)
+        if (H5Sclose(sid_1) < 0)
             ret_val = -1;
-    if(did_1 > 0)
-        if(H5Dclose(did_1) < 0)
+    if (did_1 > 0)
+        if (H5Dclose(did_1) < 0)
             ret_val = -1;
-    if(msid_2 > 0)
-        if(H5Sclose(msid_2) < 0)
+    if (msid_2 > 0)
+        if (H5Sclose(msid_2) < 0)
             ret_val = -1;
-    if(sid_2 > 0)
-        if(H5Sclose(sid_2) < 0)
+    if (sid_2 > 0)
+        if (H5Sclose(sid_2) < 0)
             ret_val = -1;
-    if(tid_2 > 0)
-        if(H5Tclose(tid_2) < 0)
+    if (tid_2 > 0)
+        if (H5Tclose(tid_2) < 0)
             ret_val = -1;
-    if(pid_2 > 0)
-        if(H5Pclose(pid_2) < 0)
+    if (pid_2 > 0)
+        if (H5Pclose(pid_2) < 0)
             ret_val = -1;
-    if(did_2 > 0)
-        if(H5Dclose(did_2) < 0)
+    if (did_2 > 0)
+        if (H5Dclose(did_2) < 0)
             ret_val = -1;
-    if(sid_3 > 0)
-        if(H5Sclose(sid_3) < 0)
+    if (sid_3 > 0)
+        if (H5Sclose(sid_3) < 0)
             ret_val = -1;
-    if(tid_3 > 0)
-        if(H5Tclose(tid_3) < 0)
+    if (tid_3 > 0)
+        if (H5Tclose(tid_3) < 0)
             ret_val = -1;
-    if(did_3 > 0)
-        if(H5Dclose(did_3) < 0)
+    if (did_3 > 0)
+        if (H5Dclose(did_3) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBinsert_field() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBdelete_field
-*
-* Purpose: Deletes a field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: January 30, 2002
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBdelete_field(hid_t loc_id,
-                        const char *dset_name,
-                        const char *field_name)
+ * Function: H5TBdelete_field
+ *
+ * Purpose: Deletes a field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: January 30, 2002
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
 {
     /* identifiers for the 1st original dataset */
-    hid_t    did_1 = H5I_BADID;
-    hid_t    tid_1 = H5I_BADID;
-    hid_t    sid_1 = H5I_BADID;
-    hid_t    pid_1 = H5I_BADID;
+    hid_t did_1 = H5I_BADID;
+    hid_t tid_1 = H5I_BADID;
+    hid_t sid_1 = H5I_BADID;
+    hid_t pid_1 = H5I_BADID;
     /* identifiers for the 2nd new dataset */
-    hid_t    did_2 = H5I_BADID;
-    hid_t    tid_2 = H5I_BADID;
-    hid_t    sid_2 = H5I_BADID;
-    hid_t    pid_2 = H5I_BADID;
+    hid_t did_2 = H5I_BADID;
+    hid_t tid_2 = H5I_BADID;
+    hid_t sid_2 = H5I_BADID;
+    hid_t pid_2 = H5I_BADID;
     /* identifiers for the 3rd final dataset */
-    hid_t    did_3 = H5I_BADID;
-    hid_t    tid_3 = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    preserve_id = H5I_BADID;
-    hid_t    read_type_id = H5I_BADID;
-    hid_t    write_type_id = H5I_BADID;
-    hid_t    attr_id = H5I_BADID;
-    size_t   member_size;
-    size_t   type_size1;
-    size_t   type_size2;
-    size_t   curr_offset;
-    size_t   delete_member_size = 0;
-    size_t   member_offset;
-    hsize_t  nfields;
-    hsize_t  nrecords;
-    hsize_t  dims_chunk[1];
-    hsize_t  dims[1];
-    hsize_t  maxdims[1] = { H5S_UNLIMITED };
-    hsize_t  i;
-    char     attr_name[255];
-    char     table_title[255];
-    char    *member_name = NULL;
-    unsigned char *tmp_buf = NULL;
+    hid_t          did_3          = H5I_BADID;
+    hid_t          tid_3          = H5I_BADID;
+    hid_t          member_type_id = H5I_BADID;
+    hid_t          preserve_id    = H5I_BADID;
+    hid_t          read_type_id   = H5I_BADID;
+    hid_t          write_type_id  = H5I_BADID;
+    hid_t          attr_id        = H5I_BADID;
+    size_t         member_size;
+    size_t         type_size1;
+    size_t         type_size2;
+    size_t         curr_offset;
+    size_t         delete_member_size = 0;
+    size_t         member_offset;
+    hsize_t        nfields;
+    hsize_t        nrecords;
+    hsize_t        dims_chunk[1];
+    hsize_t        dims[1];
+    hsize_t        maxdims[1] = {H5S_UNLIMITED};
+    hsize_t        i;
+    char           attr_name[255];
+    char           table_title[255];
+    char *         member_name  = NULL;
+    unsigned char *tmp_buf      = NULL;
     unsigned char *tmp_fill_buf = NULL;
-    htri_t   has_fill = FALSE;
-    herr_t   ret_val = -1;
-
+    htri_t         has_fill     = FALSE;
+    herr_t         ret_val      = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
-    if (field_name == NULL) 
+    if (field_name == NULL)
         goto out;
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get information about the old data type
-    *-------------------------------------------------------------------------
-    */
+     * get information about the old data type
+     *-------------------------------------------------------------------------
+     */
 
     /* open the dataset. */
-    if((did_1 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did_1 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get creation properties list */
-    if((pid_1 = H5Dget_create_plist(did_1)) < 0)
+    if ((pid_1 = H5Dget_create_plist(did_1)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_1 = H5Dget_type(did_1)) < 0)
+    if ((tid_1 = H5Dget_type(did_1)) < 0)
         goto out;
 
     /* get the size of the datatype */
-    if(0 == (type_size1 = H5Tget_size(tid_1)))
+    if (0 == (type_size1 = H5Tget_size(tid_1)))
         goto out;
 
     /* get the dataspace handle */
-    if((sid_1 = H5Dget_space(did_1)) < 0)
+    if ((sid_1 = H5Dget_space(did_1)) < 0)
         goto out;
 
     /* get dimension */
-    if(H5Sget_simple_extent_dims(sid_1, dims, NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid_1, dims, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a new data type; first we find the size of the datatype to delete
-    *-------------------------------------------------------------------------
-    */
+     * create a new data type; first we find the size of the datatype to delete
+     *-------------------------------------------------------------------------
+     */
 
     /* check out the field */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
             goto out;
 
         /* we want to find the field to delete */
-        if(H5TB_find_field(member_name, field_name)) {
+        if (H5TB_find_field(member_name, field_name)) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
                 goto out;
 
             /* get the member size */
-            if(0 == (delete_member_size = H5Tget_size(member_type_id)))
+            if (0 == (delete_member_size = H5Tget_size(member_type_id)))
                 goto out;
 
             /* close the member type */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
 
@@ -2607,75 +2531,75 @@ herr_t H5TBdelete_field(hid_t loc_id,
     } /* end for */
 
     /* no field to delete was found */
-    if(delete_member_size == 0)
+    if (delete_member_size == 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a new data type; we now insert all the fields into the new type
-    *-------------------------------------------------------------------------
-    */
+     * create a new data type; we now insert all the fields into the new type
+     *-------------------------------------------------------------------------
+     */
 
     type_size2 = type_size1 - delete_member_size;
 
     /* create the data type. */
-    if((tid_2 = H5Tcreate (H5T_COMPOUND, type_size2)) < 0)
+    if ((tid_2 = H5Tcreate(H5T_COMPOUND, type_size2)) < 0)
         goto out;
 
     curr_offset = 0;
 
     /* alloc fill value attribute buffer */
-    if(NULL == (tmp_fill_buf = (unsigned char *)HDmalloc((size_t)type_size2)))
+    if (NULL == (tmp_fill_buf = (unsigned char *)HDmalloc((size_t)type_size2)))
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get attributes from previous table in the process
-    *-------------------------------------------------------------------------
-    */
+     * get attributes from previous table in the process
+     *-------------------------------------------------------------------------
+     */
 
     /* get the table title */
-    if((H5TBAget_title(did_1, table_title)) < 0)
+    if ((H5TBAget_title(did_1, table_title)) < 0)
         goto out;
 
     /* insert the old fields except the one to delete */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
             goto out;
 
         /* we want to skip the field to delete */
-        if(!H5TB_find_field(member_name, field_name)) {
+        if (!H5TB_find_field(member_name, field_name)) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
                 goto out;
 
             /* get the member size */
-            if(0 == (member_size = H5Tget_size(member_type_id)))
+            if (0 == (member_size = H5Tget_size(member_type_id)))
                 goto out;
 
             /* insert it into the new type */
-            if(H5Tinsert(tid_2, member_name, curr_offset, member_type_id) < 0)
+            if (H5Tinsert(tid_2, member_name, curr_offset, member_type_id) < 0)
                 goto out;
 
             /*-------------------------------------------------------------------------
-            * get the fill value information
-            *-------------------------------------------------------------------------
-            */
+             * get the fill value information
+             *-------------------------------------------------------------------------
+             */
 
             HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
             /* check if we have the _FILL attribute */
-            if((has_fill = H5LT_find_attribute(did_1, attr_name)) < 0)
+            if ((has_fill = H5LT_find_attribute(did_1, attr_name)) < 0)
                 goto out;
 
             /* get it */
-            if(has_fill)
-                if(H5LT_get_attribute_disk(did_1, attr_name, tmp_fill_buf + curr_offset) < 0)
+            if (has_fill)
+                if (H5LT_get_attribute_disk(did_1, attr_name, tmp_fill_buf + curr_offset) < 0)
                     goto out;
 
             curr_offset += member_size;
 
             /* close the member type */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
         } /* end if */
@@ -2685,96 +2609,96 @@ herr_t H5TBdelete_field(hid_t loc_id,
     } /* end for */
 
     /*-------------------------------------------------------------------------
-    * create a new temporary dataset
-    *-------------------------------------------------------------------------
-    */
+     * create a new temporary dataset
+     *-------------------------------------------------------------------------
+     */
 
     /* retrieve the size of chunk */
-    if(H5Pget_chunk(pid_1, 1, dims_chunk) < 0)
+    if (H5Pget_chunk(pid_1, 1, dims_chunk) < 0)
         goto out;
 
     /* create a new simple data space with unlimited size, using the dimension */
-    if((sid_2 = H5Screate_simple(1, dims, maxdims)) < 0)
+    if ((sid_2 = H5Screate_simple(1, dims, maxdims)) < 0)
         goto out;
 
     /* modify dataset creation properties, i.e. enable chunking  */
     pid_2 = H5Pcreate(H5P_DATASET_CREATE);
-    if(H5Pset_chunk(pid_2, 1, dims_chunk) < 0)
+    if (H5Pset_chunk(pid_2, 1, dims_chunk) < 0)
         goto out;
 
     /* create the dataset. */
-    if((did_2 = H5Dcreate2(loc_id, "new", tid_2, sid_2, H5P_DEFAULT, pid_2, H5P_DEFAULT)) < 0)
+    if ((did_2 = H5Dcreate2(loc_id, "new", tid_2, sid_2, H5P_DEFAULT, pid_2, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * we have to read field by field of the old dataset and save it into the new one
-    *-------------------------------------------------------------------------
-    */
-    for(i = 0; i < nfields; i++) {
+     * we have to read field by field of the old dataset and save it into the new one
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(tid_1, (unsigned)i)))
             goto out;
 
         /* skip the field to delete */
-        if(!H5TB_find_field(member_name, field_name)) {
+        if (!H5TB_find_field(member_name, field_name)) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
                 goto out;
 
             /* get the member size */
-            if(0 == (member_size = H5Tget_size(member_type_id)))
+            if (0 == (member_size = H5Tget_size(member_type_id)))
                 goto out;
 
             /* create a read id */
-            if((read_type_id = H5Tcreate(H5T_COMPOUND, member_size)) < 0)
+            if ((read_type_id = H5Tcreate(H5T_COMPOUND, member_size)) < 0)
                 goto out;
 
             /* insert it into the new type */
-            if(H5Tinsert(read_type_id, member_name, (size_t)0, member_type_id) < 0)
+            if (H5Tinsert(read_type_id, member_name, (size_t)0, member_type_id) < 0)
                 goto out;
 
-            if(NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, member_size)))
+            if (NULL == (tmp_buf = (unsigned char *)HDcalloc((size_t)nrecords, member_size)))
                 goto out;
 
             /* read */
-            if(H5Dread(did_1, read_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
+            if (H5Dread(did_1, read_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
                 goto out;
 
             /* create a write id */
-            if((write_type_id = H5Tcreate(H5T_COMPOUND, member_size)) < 0)
+            if ((write_type_id = H5Tcreate(H5T_COMPOUND, member_size)) < 0)
                 goto out;
 
             /* the field in the file is found by its name */
-            if(H5Tinsert(write_type_id, member_name, (size_t)0, member_type_id) < 0)
+            if (H5Tinsert(write_type_id, member_name, (size_t)0, member_type_id) < 0)
                 goto out;
 
             /* create xfer properties to preserve initialized data */
-            if((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+            if ((preserve_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
                 goto out;
-            if(H5Pset_preserve(preserve_id, 1) < 0)
+            if (H5Pset_preserve(preserve_id, 1) < 0)
                 goto out;
 
             /* write */
-            if(H5Dwrite(did_2, write_type_id, H5S_ALL, H5S_ALL, preserve_id, tmp_buf) < 0)
+            if (H5Dwrite(did_2, write_type_id, H5S_ALL, H5S_ALL, preserve_id, tmp_buf) < 0)
                 goto out;
 
             /* end access to the property list */
-            if(H5Pclose(preserve_id) < 0)
+            if (H5Pclose(preserve_id) < 0)
                 goto out;
             preserve_id = H5I_BADID;
 
             /* close the member type */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
 
             /* close the read type */
-            if(H5Tclose(read_type_id) < 0)
+            if (H5Tclose(read_type_id) < 0)
                 goto out;
             read_type_id = H5I_BADID;
 
             /* close the write type */
-            if(H5Tclose(write_type_id) < 0)
+            if (H5Tclose(write_type_id) < 0)
                 goto out;
             write_type_id = H5I_BADID;
 
@@ -2788,51 +2712,51 @@ herr_t H5TBdelete_field(hid_t loc_id,
     } /* end for */
 
     /*-------------------------------------------------------------------------
-    * delete 1st table
-    *-------------------------------------------------------------------------
-    */
-    if(H5Ldelete(loc_id, dset_name, H5P_DEFAULT) < 0)
+     * delete 1st table
+     *-------------------------------------------------------------------------
+     */
+    if (H5Ldelete(loc_id, dset_name, H5P_DEFAULT) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * rename 2nd table
-    *-------------------------------------------------------------------------
-    */
-    if(H5Lmove(loc_id, "new", H5L_SAME_LOC, dset_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+     * rename 2nd table
+     *-------------------------------------------------------------------------
+     */
+    if (H5Lmove(loc_id, "new", H5L_SAME_LOC, dset_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the conforming table attributes
-    *-------------------------------------------------------------------------
-    */
+     * attach the conforming table attributes
+     *-------------------------------------------------------------------------
+     */
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
         goto out;
 
     /* open the dataset. */
-    if((did_3 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did_3 = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid_3 = H5Dget_type(did_3)) < 0)
+    if ((tid_3 = H5Dget_type(did_3)) < 0)
         goto out;
 
     /* set the attributes */
-    if(H5TB_attach_attributes(table_title, loc_id, dset_name, nfields, tid_3) < 0)
+    if (H5TB_attach_attributes(table_title, loc_id, dset_name, nfields, tid_3) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the fill attributes from previous table
-    *-------------------------------------------------------------------------
-    */
-    if(has_fill) {
-        if((sid_1 = H5Screate(H5S_SCALAR)) < 0)
+     * attach the fill attributes from previous table
+     *-------------------------------------------------------------------------
+     */
+    if (has_fill) {
+        if ((sid_1 = H5Screate(H5S_SCALAR)) < 0)
             goto out;
 
-        for(i = 0; i < nfields; i++) {
+        for (i = 0; i < nfields; i++) {
             /* get the member type */
-            if((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
+            if ((member_type_id = H5Tget_member_type(tid_3, (unsigned)i)) < 0)
                 goto out;
 
             /* get the member offset */
@@ -2840,24 +2764,24 @@ herr_t H5TBdelete_field(hid_t loc_id,
 
             HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
-            if((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            if ((attr_id = H5Acreate2(did_3, attr_name, member_type_id, sid_1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 goto out;
 
-            if(H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
+            if (H5Awrite(attr_id, member_type_id, tmp_fill_buf + member_offset) < 0)
                 goto out;
 
-            if(H5Aclose(attr_id) < 0)
+            if (H5Aclose(attr_id) < 0)
                 goto out;
             attr_id = H5I_BADID;
 
             /* close the member type */
-            if(H5Tclose(member_type_id) < 0)
+            if (H5Tclose(member_type_id) < 0)
                 goto out;
             member_type_id = H5I_BADID;
         } /* end for */
 
         /* close data space. */
-        if(H5Sclose(sid_1) < 0)
+        if (H5Sclose(sid_1) < 0)
             goto out;
         sid_1 = H5I_BADID;
     } /* end if */
@@ -2865,232 +2789,227 @@ herr_t H5TBdelete_field(hid_t loc_id,
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
-    if(tmp_fill_buf)
+    if (tmp_fill_buf)
         HDfree(tmp_fill_buf);
-    if(tmp_buf)
+    if (tmp_buf)
         HDfree(tmp_buf);
-    if(attr_id > 0)
-        if(H5Aclose(attr_id) < 0)
+    if (attr_id > 0)
+        if (H5Aclose(attr_id) < 0)
             ret_val = -1;
-    if(preserve_id > 0)
-        if(H5Pclose(preserve_id) < 0)
+    if (preserve_id > 0)
+        if (H5Pclose(preserve_id) < 0)
             ret_val = -1;
-    if(member_type_id > 0)
-        if(H5Tclose(member_type_id) < 0)
+    if (member_type_id > 0)
+        if (H5Tclose(member_type_id) < 0)
             ret_val = -1;
-    if(read_type_id > 0)
-        if(H5Tclose(read_type_id) < 0)
+    if (read_type_id > 0)
+        if (H5Tclose(read_type_id) < 0)
             ret_val = -1;
-    if(write_type_id > 0)
-        if(H5Tclose(write_type_id) < 0)
+    if (write_type_id > 0)
+        if (H5Tclose(write_type_id) < 0)
             ret_val = -1;
-    if(tid_1 > 0)
-        if(H5Tclose(tid_1) < 0)
+    if (tid_1 > 0)
+        if (H5Tclose(tid_1) < 0)
             ret_val = -1;
-    if(pid_1 > 0)
-        if(H5Pclose(pid_1) < 0)
+    if (pid_1 > 0)
+        if (H5Pclose(pid_1) < 0)
             ret_val = -1;
-    if(sid_1 > 0)
-        if(H5Sclose(sid_1) < 0)
+    if (sid_1 > 0)
+        if (H5Sclose(sid_1) < 0)
             ret_val = -1;
-    if(did_1 > 0)
-        if(H5Dclose(did_1) < 0)
+    if (did_1 > 0)
+        if (H5Dclose(did_1) < 0)
             ret_val = -1;
-    if(sid_2 > 0)
-        if(H5Sclose(sid_2) < 0)
+    if (sid_2 > 0)
+        if (H5Sclose(sid_2) < 0)
             ret_val = -1;
-    if(tid_2 > 0)
-        if(H5Tclose(tid_2) < 0)
+    if (tid_2 > 0)
+        if (H5Tclose(tid_2) < 0)
             ret_val = -1;
-    if(pid_2 > 0)
-        if(H5Pclose(pid_2) < 0)
+    if (pid_2 > 0)
+        if (H5Pclose(pid_2) < 0)
             ret_val = -1;
-    if(did_2 > 0)
-        if(H5Dclose(did_2) < 0)
+    if (did_2 > 0)
+        if (H5Dclose(did_2) < 0)
             ret_val = -1;
-    if(tid_3 > 0)
-        if(H5Tclose(tid_3) < 0)
+    if (tid_3 > 0)
+        if (H5Tclose(tid_3) < 0)
             ret_val = -1;
-    if(did_3 > 0)
-        if(H5Dclose(did_3) < 0)
+    if (did_3 > 0)
+        if (H5Dclose(did_3) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBdelete_field() */
 
 /*-------------------------------------------------------------------------
-*
-* Table attribute functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Table attribute functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBAget_title
-*
-* Purpose: Read the table title
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: January 30, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBAget_title(hid_t loc_id,
-                      char *table_title)
+ * Function: H5TBAget_title
+ *
+ * Purpose: Read the table title
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: January 30, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBAget_title(hid_t loc_id, char *table_title)
 {
 
     /* Get the TITLE attribute */
-    if(H5LT_get_attribute_disk(loc_id, "TITLE", table_title) < 0)
+    if (H5LT_get_attribute_disk(loc_id, "TITLE", table_title) < 0)
         return -1;
 
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5TBAget_fill
-*
-* Purpose: Read the table attribute fill values
-*
-* Return: Success: TRUE/FALSE, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: January 30, 2002
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-htri_t H5TBAget_fill(hid_t loc_id,
-                     const char *dset_name,
-                     hid_t dset_id,
-                     unsigned char *dst_buf)
+ * Function: H5TBAget_fill
+ *
+ * Purpose: Read the table attribute fill values
+ *
+ * Return: Success: TRUE/FALSE, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: January 30, 2002
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5TBAget_fill(hid_t loc_id, const char *dset_name, hid_t dset_id, unsigned char *dst_buf)
 {
-    hsize_t  nfields;
-    hsize_t  nrecords;
-    hsize_t  i;
-    size_t  *src_offset = NULL;
-    char     attr_name[255];
-    htri_t   has_fill = FALSE;
-    htri_t   ret_val = -1;
+    hsize_t nfields;
+    hsize_t nrecords;
+    hsize_t i;
+    size_t *src_offset = NULL;
+    char    attr_name[255];
+    htri_t  has_fill = FALSE;
+    htri_t  ret_val  = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* get the number of records and fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, &nrecords) < 0)
         goto out;
 
-    if(NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
+    if (NULL == (src_offset = (size_t *)HDmalloc((size_t)nfields * sizeof(size_t))))
         goto out;
 
     /* get field info */
-    if(H5TBget_field_info(loc_id, dset_name, NULL, NULL, src_offset, NULL) < 0)
+    if (H5TBget_field_info(loc_id, dset_name, NULL, NULL, src_offset, NULL) < 0)
         goto out;
 
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i);
 
         /* check if we have the _FILL attribute */
-        if((has_fill = H5LT_find_attribute(dset_id, attr_name)) < 0)
+        if ((has_fill = H5LT_find_attribute(dset_id, attr_name)) < 0)
             goto out;
 
         /* get it */
-        if(has_fill)
-            if(H5LT_get_attribute_disk(dset_id, attr_name, dst_buf + src_offset[i]) < 0)
+        if (has_fill)
+            if (H5LT_get_attribute_disk(dset_id, attr_name, dst_buf + src_offset[i]) < 0)
                 goto out;
     } /* end for */
 
     ret_val = has_fill;
 
 out:
-    if(src_offset)
+    if (src_offset)
         HDfree(src_offset);
-    
+
     return ret_val;
 } /* end H5TBAget_fill() */
 
-
 /*-------------------------------------------------------------------------
-*
-* Inquiry functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Inquiry functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBget_table_info
-*
-* Purpose: Gets the number of records and fields of a table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBget_table_info(hid_t loc_id,
-                           const char *dset_name,
-                           hsize_t *nfields,
-                           hsize_t *nrecords)
+ * Function: H5TBget_table_info
+ *
+ * Purpose: Gets the number of records and fields of a table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBget_table_info(hid_t loc_id, const char *dset_name, hsize_t *nfields, hsize_t *nrecords)
 {
-    hid_t      tid = H5I_BADID;
-    hid_t      sid = H5I_BADID;
-    hid_t      did = H5I_BADID;
-    hsize_t    dims[1];
-    int        num_members;
-    herr_t     ret_val = -1;
+    hid_t   tid = H5I_BADID;
+    hid_t   sid = H5I_BADID;
+    hid_t   did = H5I_BADID;
+    hsize_t dims[1];
+    int     num_members;
+    herr_t  ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
     /* get the number of members */
-    if((num_members = H5Tget_nmembers(tid)) < 0)
+    if ((num_members = H5Tget_nmembers(tid)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get number of nfields
-    *-------------------------------------------------------------------------
-    */
-    if(nfields)
+     * get number of nfields
+     *-------------------------------------------------------------------------
+     */
+    if (nfields)
         *nfields = (hsize_t)num_members;
 
     /*-------------------------------------------------------------------------
-    * get number of records
-    *-------------------------------------------------------------------------
-    */
-    if(nrecords) {
+     * get number of records
+     *-------------------------------------------------------------------------
+     */
+    if (nrecords) {
         /* get the dataspace handle */
-        if((sid = H5Dget_space(did)) < 0)
+        if ((sid = H5Dget_space(did)) < 0)
             goto out;
 
         /* get dimension */
-        if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+        if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
             goto out;
 
         /* terminate access to the dataspace */
-        if(H5Sclose(sid) < 0)
+        if (H5Sclose(sid) < 0)
             goto out;
         sid = H5I_BADID;
 
@@ -3100,106 +3019,103 @@ herr_t H5TBget_table_info(hid_t loc_id,
     ret_val = 0;
 
 out:
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBget_table_info() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TBget_field_info
-*
-* Purpose: Get information about fields
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TBget_field_info(hid_t loc_id,
-                          const char *dset_name,
-                          char *field_names[],
-                          size_t *field_sizes,
-                          size_t *field_offsets,
-                          size_t *type_size)
+ * Function: H5TBget_field_info
+ *
+ * Purpose: Get information about fields
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TBget_field_info(hid_t loc_id, const char *dset_name, char *field_names[], size_t *field_sizes,
+                   size_t *field_offsets, size_t *type_size)
 {
-    hid_t       did = H5I_BADID;    /* dataset ID */
-    hid_t       tid = H5I_BADID;    /* file type ID */
-    hid_t       n_tid = H5I_BADID;  /* native type ID */
-    hid_t       m_tid = H5I_BADID;  /* member type ID */
-    hid_t       nm_tid = H5I_BADID; /* native member ID */
-    hssize_t    nfields;
-    hssize_t    i;
-    herr_t      ret_val = -1;
+    hid_t    did    = H5I_BADID; /* dataset ID */
+    hid_t    tid    = H5I_BADID; /* file type ID */
+    hid_t    n_tid  = H5I_BADID; /* native type ID */
+    hid_t    m_tid  = H5I_BADID; /* member type ID */
+    hid_t    nm_tid = H5I_BADID; /* native member ID */
+    hssize_t nfields;
+    hssize_t i;
+    herr_t   ret_val = -1;
 
     /* check the arguments */
-    if (dset_name == NULL) 
+    if (dset_name == NULL)
         goto out;
 
     /* open the dataset. */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the datatype */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
 
-    if((n_tid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0)
+    if ((n_tid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0)
         goto out;
 
     /* get the type size */
-    if(type_size)
-        if(0 == (*type_size = H5Tget_size(n_tid)))
+    if (type_size)
+        if (0 == (*type_size = H5Tget_size(n_tid)))
             goto out;
 
     /* get the number of members */
-    if((nfields = H5Tget_nmembers(tid)) < 0)
+    if ((nfields = H5Tget_nmembers(tid)) < 0)
         goto out;
 
     /* iterate tru the members */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(field_names) {
-            char   *member_name;
+        if (field_names) {
+            char *member_name;
 
-            if(NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
+            if (NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
                 goto out;
             strcpy(field_names[i], member_name);
             H5free_memory(member_name);
         } /* end if */
 
         /* get the member type */
-        if((m_tid = H5Tget_member_type(tid, (unsigned)i)) < 0)
+        if ((m_tid = H5Tget_member_type(tid, (unsigned)i)) < 0)
             goto out;
-        if((nm_tid = H5Tget_native_type(m_tid, H5T_DIR_DEFAULT)) < 0)
+        if ((nm_tid = H5Tget_native_type(m_tid, H5T_DIR_DEFAULT)) < 0)
             goto out;
 
         /* get the member size */
-        if(field_sizes)
-            if(0 == (field_sizes[i] = H5Tget_size(nm_tid)))
+        if (field_sizes)
+            if (0 == (field_sizes[i] = H5Tget_size(nm_tid)))
                 goto out;
 
         /* get the member offset */
-        if(field_offsets)
-            field_offsets[i] = H5Tget_member_offset(n_tid, (unsigned) i);
+        if (field_offsets)
+            field_offsets[i] = H5Tget_member_offset(n_tid, (unsigned)i);
 
         /* close the member types */
-        if(H5Tclose(m_tid) < 0)
+        if (H5Tclose(m_tid) < 0)
             goto out;
         m_tid = H5I_BADID;
-        if(H5Tclose(nm_tid) < 0)
+        if (H5Tclose(nm_tid) < 0)
             goto out;
         nm_tid = H5I_BADID;
     } /* end for */
@@ -3207,122 +3123,119 @@ herr_t H5TBget_field_info(hid_t loc_id,
     ret_val = 0;
 
 out:
-    if(tid > 0)
-        if(H5Tclose(tid) < 0)
+    if (tid > 0)
+        if (H5Tclose(tid) < 0)
             ret_val = -1;
-    if(n_tid > 0)
-        if(H5Tclose(n_tid) < 0)
+    if (n_tid > 0)
+        if (H5Tclose(n_tid) < 0)
             ret_val = -1;
-    if(m_tid > 0)
-        if(H5Tclose(m_tid) < 0)
+    if (m_tid > 0)
+        if (H5Tclose(m_tid) < 0)
             ret_val = -1;
-    if(nm_tid > 0)
-        if(H5Tclose(nm_tid) < 0)
+    if (nm_tid > 0)
+        if (H5Tclose(nm_tid) < 0)
             ret_val = -1;
-    if(did > 0)
-        if(H5Dclose(did) < 0)
+    if (did > 0)
+        if (H5Dclose(did) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TBget_field_info() */
 
 /*-------------------------------------------------------------------------
-*
-* internal functions
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * internal functions
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TB_find_field
-*
-* Purpose: Find a string field
-*
-* Return: Success: TRUE/FALSE, Failure: N/A
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 19, 2001
-*
-*-------------------------------------------------------------------------
-*/
-H5_ATTR_PURE static
-hbool_t H5TB_find_field(const char *field, const char *field_list)
+ * Function: H5TB_find_field
+ *
+ * Purpose: Find a string field
+ *
+ * Return: Success: TRUE/FALSE, Failure: N/A
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 19, 2001
+ *
+ *-------------------------------------------------------------------------
+ */
+H5_ATTR_PURE static hbool_t
+H5TB_find_field(const char *field, const char *field_list)
 {
     const char *start = field_list;
     const char *end;
 
     /* check the arguments */
-    if (field == NULL) 
-      return FALSE;
-    if (field_list == NULL) 
-      return FALSE;
+    if (field == NULL)
+        return FALSE;
+    if (field_list == NULL)
+        return FALSE;
 
-    while((end = HDstrstr(start, ",")) != 0) {
+    while ((end = HDstrstr(start, ",")) != 0) {
         ptrdiff_t count = end - start;
 
-        if(HDstrncmp(start, field, (size_t)count) == 0 && (size_t)count == HDstrlen(field))
+        if (HDstrncmp(start, field, (size_t)count) == 0 && (size_t)count == HDstrlen(field))
             return TRUE;
         start = end + 1;
     } /* end while */
 
-    if(HDstrncmp(start, field, HDstrlen(field)) == 0)
+    if (HDstrncmp(start, field, HDstrlen(field)) == 0)
         return TRUE;
 
     return FALSE;
 } /* end H5TB_find_field() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TB_attach_attributes
-*
-* Purpose: Private function that creates the conforming table attributes;
-*          Used by H5TBcombine_tables; not used by H5TBmake_table, which does not read
-*          the fill value attributes from an existing table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: December 6, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-static
-herr_t H5TB_attach_attributes(const char *table_title,
-                              hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t nfields,
-                              hid_t tid)
+ * Function: H5TB_attach_attributes
+ *
+ * Purpose: Private function that creates the conforming table attributes;
+ *          Used by H5TBcombine_tables; not used by H5TBmake_table, which does not read
+ *          the fill value attributes from an existing table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: December 6, 2001
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5TB_attach_attributes(const char *table_title, hid_t loc_id, const char *dset_name, hsize_t nfields,
+                       hid_t tid)
 {
-    char     attr_name[255];
-    char    *member_name = NULL;
-    hsize_t  i;
-    herr_t   ret_val = -1;
+    char    attr_name[255];
+    char *  member_name = NULL;
+    hsize_t i;
+    herr_t  ret_val = -1;
 
     /* attach the CLASS attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", TABLE_CLASS) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", TABLE_CLASS) < 0)
         goto out;
 
     /* attach the VERSION attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "VERSION", TABLE_VERSION) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "VERSION", TABLE_VERSION) < 0)
         goto out;
 
     /* attach the TITLE attribute */
-    if(H5LTset_attribute_string(loc_id, dset_name, "TITLE", table_title) < 0)
+    if (H5LTset_attribute_string(loc_id, dset_name, "TITLE", table_title) < 0)
         goto out;
 
     /* attach the FIELD_ name attribute */
-    for(i = 0; i < nfields; i++) {
+    for (i = 0; i < nfields; i++) {
         /* get the member name */
-        if(NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
+        if (NULL == (member_name = H5Tget_member_name(tid, (unsigned)i)))
             goto out;
 
         HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_NAME", (int)i);
 
         /* attach the attribute */
-        if(H5LTset_attribute_string(loc_id, dset_name, attr_name, member_name) < 0)
+        if (H5LTset_attribute_string(loc_id, dset_name, attr_name, member_name) < 0)
             goto out;
 
         H5free_memory(member_name);
@@ -3332,57 +3245,53 @@ herr_t H5TB_attach_attributes(const char *table_title,
     ret_val = 0;
 
 out:
-    if(member_name)
+    if (member_name)
         H5free_memory(member_name);
 
     return ret_val;
 } /* end H5TB_attach_attributes() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TB_create_type
-*
-* Purpose: Private function that creates a memory type ID
-*
-* Return: Success: the memory type ID, Failure: -1
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: March 31, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-static
-hid_t H5TB_create_type(hid_t loc_id,
-                       const char *dset_name,
-                       size_t type_size,
-                       const size_t *field_offset,
-                       const size_t *field_sizes,
-                       hid_t ftype_id)
+ * Function: H5TB_create_type
+ *
+ * Purpose: Private function that creates a memory type ID
+ *
+ * Return: Success: the memory type ID, Failure: -1
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: March 31, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+static hid_t
+H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const size_t *field_offset,
+                 const size_t *field_sizes, hid_t ftype_id)
 {
     hid_t    mem_type_id = H5I_BADID;
-    hid_t    mtype_id = H5I_BADID;
-    hid_t    nmtype_id = H5I_BADID;
+    hid_t    mtype_id    = H5I_BADID;
+    hid_t    nmtype_id   = H5I_BADID;
     size_t   size_native;
     hsize_t  nfields = 0;
-    char   **fnames = NULL;
+    char **  fnames  = NULL;
     unsigned i;
-    hid_t   ret_val = -1;
+    hid_t    ret_val = -1;
 
     /* get the number of fields  */
-    if(H5TBget_table_info(loc_id, dset_name, &nfields, NULL) < 0)
+    if (H5TBget_table_info(loc_id, dset_name, &nfields, NULL) < 0)
         goto out;
 
-    if(NULL == (fnames = (char**)HDcalloc(sizeof(char*), (size_t)nfields)))
+    if (NULL == (fnames = (char **)HDcalloc(sizeof(char *), (size_t)nfields)))
         goto out;
 
-    for(i = 0; i < nfields; i++)
-        if(NULL == (fnames[i] = (char*)HDmalloc(HLTB_MAX_FIELD_LEN)))
+    for (i = 0; i < nfields; i++)
+        if (NULL == (fnames[i] = (char *)HDmalloc(HLTB_MAX_FIELD_LEN)))
             goto out;
 
     /* get field info */
-    if(H5TBget_field_info(loc_id, dset_name, fnames, NULL, NULL, NULL) < 0)
+    if (H5TBget_field_info(loc_id, dset_name, fnames, NULL, NULL, NULL) < 0)
         goto out;
 
     /* create the memory data type */
@@ -3390,22 +3299,22 @@ hid_t H5TB_create_type(hid_t loc_id,
         goto out;
 
     /* get each field ID and adjust its size, if necessary */
-    for(i = 0; i < nfields; i++) {
-        if((mtype_id = H5Tget_member_type(ftype_id, i)) < 0)
+    for (i = 0; i < nfields; i++) {
+        if ((mtype_id = H5Tget_member_type(ftype_id, i)) < 0)
             goto out;
-        if((nmtype_id = H5Tget_native_type(mtype_id, H5T_DIR_DEFAULT)) < 0)
+        if ((nmtype_id = H5Tget_native_type(mtype_id, H5T_DIR_DEFAULT)) < 0)
             goto out;
-        if(0 == (size_native = H5Tget_size(nmtype_id)))
+        if (0 == (size_native = H5Tget_size(nmtype_id)))
             goto out;
-        if(field_sizes[i] != size_native)
-            if(H5Tset_size(nmtype_id, field_sizes[i]) < 0)
+        if (field_sizes[i] != size_native)
+            if (H5Tset_size(nmtype_id, field_sizes[i]) < 0)
                 goto out;
-        if(H5Tinsert(mem_type_id, fnames[i], field_offset[i], nmtype_id) < 0)
+        if (H5Tinsert(mem_type_id, fnames[i], field_offset[i], nmtype_id) < 0)
             goto out;
-        if(H5Tclose(mtype_id) < 0)
+        if (H5Tclose(mtype_id) < 0)
             goto out;
         mtype_id = H5I_BADID;
-        if(H5Tclose(nmtype_id) < 0)
+        if (H5Tclose(nmtype_id) < 0)
             goto out;
         nmtype_id = H5I_BADID;
     } /* end for */
@@ -3413,159 +3322,153 @@ hid_t H5TB_create_type(hid_t loc_id,
     ret_val = mem_type_id;
 
 out:
-    if(fnames) {
-        for(i = 0; i < nfields; i++)
-            if(fnames[i])
+    if (fnames) {
+        for (i = 0; i < nfields; i++)
+            if (fnames[i])
                 HDfree(fnames[i]);
         HDfree(fnames);
     } /* end if */
-    if(mtype_id > 0)
-        if(H5Tclose(mtype_id) < 0)
+    if (mtype_id > 0)
+        if (H5Tclose(mtype_id) < 0)
             ret_val = -1;
-    if(nmtype_id > 0)
-        if(H5Tclose(nmtype_id) < 0)
+    if (nmtype_id > 0)
+        if (H5Tclose(nmtype_id) < 0)
             ret_val = -1;
-    if(ret_val < 0 && mem_type_id > 0)
+    if (ret_val < 0 && mem_type_id > 0)
         H5Tclose(mem_type_id);
 
     return ret_val;
 } /* end H5TB_create_type() */
 
 /*-------------------------------------------------------------------------
-*
-* Functions shared between H5TB and H5PT
-*
-*-------------------------------------------------------------------------
-*/
+ *
+ * Functions shared between H5TB and H5PT
+ *
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
-* Function: H5TB_common_append_records
-*
-* Purpose: Common code for reading records shared between H5PT and H5TB
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
-*             James Laird, jlaird@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments: Called by H5TBappend_records and H5PTappend_records
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TB_common_append_records(hid_t dataset_id,
-                                  hid_t mem_type_id,
-                                  size_t nrecords,
-                                  hsize_t orig_table_size,
-                                  const void *buf)
+ * Function: H5TB_common_append_records
+ *
+ * Purpose: Common code for reading records shared between H5PT and H5TB
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
+ *             James Laird, jlaird@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments: Called by H5TBappend_records and H5PTappend_records
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TB_common_append_records(hid_t dataset_id, hid_t mem_type_id, size_t nrecords, hsize_t orig_table_size,
+                           const void *buf)
 {
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  dims[1];
-    hsize_t  mem_dims[1];
-    herr_t   ret_val = -1;
+    hid_t   sid   = H5I_BADID;
+    hid_t   m_sid = H5I_BADID;
+    hsize_t count[1];
+    hsize_t offset[1];
+    hsize_t dims[1];
+    hsize_t mem_dims[1];
+    herr_t  ret_val = -1;
 
     /* extend the dataset */
     dims[0] = nrecords + orig_table_size;
-    if(H5Dset_extent(dataset_id, dims) < 0)
+    if (H5Dset_extent(dataset_id, dims) < 0)
         goto out;
 
     /* create a simple memory data space */
     mem_dims[0] = nrecords;
-    if((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_dims, NULL)) < 0)
         goto out;
 
     /* get a copy of the new file data space for writing */
-    if((sid = H5Dget_space(dataset_id)) < 0)
+    if ((sid = H5Dget_space(dataset_id)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset */
     offset[0] = orig_table_size;
-    count[0] = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    count[0]  = nrecords;
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* write the records */
-    if(H5Dwrite(dataset_id, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(dataset_id, mem_type_id, m_sid, sid, H5P_DEFAULT, buf) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TB_common_append_records() */
 
 /*-------------------------------------------------------------------------
-* Function: H5TB_common_read_records
-*
-* Purpose: Common code for reading records shared between H5PT and H5TB
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
-*             James Laird, jlaird@ncsa.uiuc.edu
-*
-* Date: March 8, 2004
-*
-* Comments: Called by H5TBread_records and H5PTread_records
-*
-*-------------------------------------------------------------------------
-*/
-herr_t H5TB_common_read_records(hid_t dataset_id,
-                                hid_t mem_type_id,
-                                hsize_t start,
-                                size_t nrecords,
-                                hsize_t table_size,
-                                void *buf)
+ * Function: H5TB_common_read_records
+ *
+ * Purpose: Common code for reading records shared between H5PT and H5TB
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
+ *             James Laird, jlaird@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments: Called by H5TBread_records and H5PTread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5TB_common_read_records(hid_t dataset_id, hid_t mem_type_id, hsize_t start, size_t nrecords,
+                         hsize_t table_size, void *buf)
 {
-    hid_t    sid = H5I_BADID;
-    hid_t    m_sid = H5I_BADID;
-    hsize_t  count[1];
-    hsize_t  offset[1];
-    hsize_t  mem_size[1];
-    herr_t   ret_val = -1;
+    hid_t   sid   = H5I_BADID;
+    hid_t   m_sid = H5I_BADID;
+    hsize_t count[1];
+    hsize_t offset[1];
+    hsize_t mem_size[1];
+    herr_t  ret_val = -1;
 
     /* make sure the read request is in bounds */
-    if(start + nrecords > table_size)
+    if (start + nrecords > table_size)
         goto out;
 
     /* get the dataspace handle */
-    if((sid = H5Dget_space(dataset_id)) < 0)
+    if ((sid = H5Dget_space(dataset_id)) < 0)
         goto out;
 
     /* define a hyperslab in the dataset of the size of the records */
     offset[0] = start;
     count[0]  = nrecords;
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
         goto out;
 
     /* create a memory dataspace handle */
     mem_size[0] = count[0];
-    if((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
+    if ((m_sid = H5Screate_simple(1, mem_size, NULL)) < 0)
         goto out;
-    if((H5Dread(dataset_id, mem_type_id, m_sid, sid, H5P_DEFAULT, buf)) < 0)
+    if ((H5Dread(dataset_id, mem_type_id, m_sid, sid, H5P_DEFAULT, buf)) < 0)
         goto out;
 
     ret_val = 0;
 
 out:
-    if(m_sid > 0)
-        if(H5Sclose(m_sid) < 0)
+    if (m_sid > 0)
+        if (H5Sclose(m_sid) < 0)
             ret_val = -1;
-    if(sid > 0)
-        if(H5Sclose(sid) < 0)
+    if (sid > 0)
+        if (H5Sclose(sid) < 0)
             ret_val = -1;
 
     return ret_val;
 } /* end H5TB_common_read_records() */
-
diff --git a/hl/src/H5TBprivate.h b/hl/src/H5TBprivate.h
index 17306fb..cdddfbc 100644
--- a/hl/src/H5TBprivate.h
+++ b/hl/src/H5TBprivate.h
@@ -20,10 +20,9 @@
 /* public TB prototypes			*/
 #include "H5TBpublic.h"
 
-
-#define TABLE_CLASS         "TABLE"
-#define TABLE_VERSION       "3.0"
-#define HLTB_MAX_FIELD_LEN  255
+#define TABLE_CLASS        "TABLE"
+#define TABLE_VERSION      "3.0"
+#define HLTB_MAX_FIELD_LEN 255
 
 /*-------------------------------------------------------------------------
  *
@@ -32,11 +31,8 @@
  *-------------------------------------------------------------------------
  */
 
-herr_t H5TB_common_append_records( hid_t dataset_id,
-                                  hid_t mem_type_id,
-                                  size_t nrecords,
-                                  hsize_t orig_table_size,
-                                  const void * data);
+herr_t H5TB_common_append_records(hid_t dataset_id, hid_t mem_type_id, size_t nrecords,
+                                  hsize_t orig_table_size, const void *data);
 
 /*-------------------------------------------------------------------------
  *
@@ -45,16 +41,7 @@ herr_t H5TB_common_append_records( hid_t dataset_id,
  *-------------------------------------------------------------------------
  */
 
-
-herr_t H5TB_common_read_records( hid_t dataset_id,
-                                hid_t mem_type_id,
-                                hsize_t start,
-                                size_t nrecords,
-                                hsize_t table_size,
-                                void *data);
-
-
-
+herr_t H5TB_common_read_records(hid_t dataset_id, hid_t mem_type_id, hsize_t start, size_t nrecords,
+                                hsize_t table_size, void *data);
 
 #endif
-
diff --git a/hl/src/H5TBpublic.h b/hl/src/H5TBpublic.h
index 56aa915..3649225 100644
--- a/hl/src/H5TBpublic.h
+++ b/hl/src/H5TBpublic.h
@@ -14,12 +14,10 @@
 #ifndef _H5TBpublic_H
 #define _H5TBpublic_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 /*-------------------------------------------------------------------------
  *
  * Create functions
@@ -27,20 +25,10 @@ extern "C" {
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5TBmake_table( const char *table_title,
-                       hid_t loc_id,
-                       const char *dset_name,
-                       hsize_t nfields,
-                       hsize_t nrecords,
-                       size_t type_size,
-                       const char *field_names[],
-                       const size_t *field_offset,
-                       const hid_t *field_types,
-                       hsize_t chunk_size,
-                       void *fill_data,
-                       int compress,
-                       const void *buf );
-
+H5_HLDLL herr_t H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsize_t nfields,
+                               hsize_t nrecords, size_t type_size, const char *field_names[],
+                               const size_t *field_offset, const hid_t *field_types, hsize_t chunk_size,
+                               void *fill_data, int compress, const void *buf);
 
 /*-------------------------------------------------------------------------
  *
@@ -49,45 +37,21 @@ H5_HLDLL herr_t  H5TBmake_table( const char *table_title,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5TBappend_records( hid_t loc_id,
-                           const char *dset_name,
-                           hsize_t nrecords,
-                           size_t type_size,
-                           const size_t *field_offset,
-                           const size_t *dst_sizes,
-                           const void *buf );
-
-H5_HLDLL herr_t  H5TBwrite_records( hid_t loc_id,
-                          const char *dset_name,
-                          hsize_t start,
-                          hsize_t nrecords,
-                          size_t type_size,
-                          const size_t *field_offset,
-                          const size_t *dst_sizes,
-                          const void *buf );
-
-
-H5_HLDLL herr_t  H5TBwrite_fields_name( hid_t loc_id,
-                              const char *dset_name,
-                              const char *field_names,
-                              hsize_t start,
-                              hsize_t nrecords,
-                              size_t type_size,
-                              const size_t *field_offset,
-                              const size_t *dst_sizes,
-                              const void *buf );
-
-H5_HLDLL herr_t  H5TBwrite_fields_index( hid_t loc_id,
-                               const char *dset_name,
-                               hsize_t nfields,
-                               const int *field_index,
-                               hsize_t start,
-                               hsize_t nrecords,
-                               size_t type_size,
-                               const size_t *field_offset,
-                               const size_t *dst_sizes,
-                               const void *buf );
+H5_HLDLL herr_t H5TBappend_records(hid_t loc_id, const char *dset_name, hsize_t nrecords, size_t type_size,
+                                   const size_t *field_offset, const size_t *dst_sizes, const void *buf);
+
+H5_HLDLL herr_t H5TBwrite_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords,
+                                  size_t type_size, const size_t *field_offset, const size_t *dst_sizes,
+                                  const void *buf);
 
+H5_HLDLL herr_t H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_names,
+                                      hsize_t start, hsize_t nrecords, size_t type_size,
+                                      const size_t *field_offset, const size_t *dst_sizes, const void *buf);
+
+H5_HLDLL herr_t H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields,
+                                       const int *field_index, hsize_t start, hsize_t nrecords,
+                                       size_t type_size, const size_t *field_offset, const size_t *dst_sizes,
+                                       const void *buf);
 
 /*-------------------------------------------------------------------------
  *
@@ -96,46 +60,21 @@ H5_HLDLL herr_t  H5TBwrite_fields_index( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5TBread_table(hid_t loc_id, const char *dset_name, size_t dst_size, const size_t *dst_offset,
+                               const size_t *dst_sizes, void *dst_buf);
+
+H5_HLDLL herr_t H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_names,
+                                     hsize_t start, hsize_t nrecords, size_t type_size,
+                                     const size_t *field_offset, const size_t *dst_sizes, void *buf);
 
+H5_HLDLL herr_t H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields,
+                                      const int *field_index, hsize_t start, hsize_t nrecords,
+                                      size_t type_size, const size_t *field_offset, const size_t *dst_sizes,
+                                      void *buf);
 
-H5_HLDLL herr_t  H5TBread_table( hid_t loc_id,
-                       const char *dset_name,
-                       size_t dst_size,
-                       const size_t *dst_offset,
-                       const size_t *dst_sizes,
-                       void *dst_buf );
-
-
-H5_HLDLL herr_t  H5TBread_fields_name( hid_t loc_id,
-                             const char *dset_name,
-                             const char *field_names,
-                             hsize_t start,
-                             hsize_t nrecords,
-                             size_t type_size,
-                             const size_t *field_offset,
-                             const size_t *dst_sizes,
-                             void *buf );
-
-H5_HLDLL herr_t  H5TBread_fields_index( hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t nfields,
-                              const int *field_index,
-                              hsize_t start,
-                              hsize_t nrecords,
-                              size_t type_size,
-                              const size_t *field_offset,
-                              const size_t *dst_sizes,
-                              void *buf );
-
-
-H5_HLDLL herr_t  H5TBread_records( hid_t loc_id,
-                         const char *dset_name,
-                         hsize_t start,
-                         hsize_t nrecords,
-                         size_t type_size,
-                         const size_t *dst_offset,
-                         const size_t *dst_sizes,
-                         void *buf );
+H5_HLDLL herr_t H5TBread_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords,
+                                 size_t type_size, const size_t *dst_offset, const size_t *dst_sizes,
+                                 void *buf);
 
 /*-------------------------------------------------------------------------
  *
@@ -144,19 +83,10 @@ H5_HLDLL herr_t  H5TBread_records( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5TBget_table_info(hid_t loc_id, const char *dset_name, hsize_t *nfields, hsize_t *nrecords);
 
-H5_HLDLL herr_t  H5TBget_table_info ( hid_t loc_id,
-                            const char *dset_name,
-                            hsize_t *nfields,
-                            hsize_t *nrecords );
-
-H5_HLDLL herr_t  H5TBget_field_info( hid_t loc_id,
-                           const char *dset_name,
-                           char *field_names[],
-                           size_t *field_sizes,
-                           size_t *field_offsets,
-                           size_t *type_size );
-
+H5_HLDLL herr_t H5TBget_field_info(hid_t loc_id, const char *dset_name, char *field_names[],
+                                   size_t *field_sizes, size_t *field_offsets, size_t *type_size);
 
 /*-------------------------------------------------------------------------
  *
@@ -165,47 +95,22 @@ H5_HLDLL herr_t  H5TBget_field_info( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
+H5_HLDLL herr_t H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords);
 
-H5_HLDLL herr_t  H5TBdelete_record( hid_t loc_id,
-                          const char *dset_name,
-                          hsize_t start,
-                          hsize_t nrecords );
-
-
-H5_HLDLL herr_t  H5TBinsert_record( hid_t loc_id,
-                          const char *dset_name,
-                          hsize_t start,
-                          hsize_t nrecords,
-                          size_t dst_size,
-                          const size_t *dst_offset,
-                          const size_t *dst_sizes,
-                          void *buf );
+H5_HLDLL herr_t H5TBinsert_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords,
+                                  size_t dst_size, const size_t *dst_offset, const size_t *dst_sizes,
+                                  void *buf);
 
-H5_HLDLL herr_t  H5TBadd_records_from( hid_t loc_id,
-                             const char *dset_name1,
-                             hsize_t start1,
-                             hsize_t nrecords,
-                             const char *dset_name2,
-                             hsize_t start2 );
+H5_HLDLL herr_t H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize_t nrecords,
+                                     const char *dset_name2, hsize_t start2);
 
-H5_HLDLL herr_t  H5TBcombine_tables( hid_t loc_id1,
-                           const char *dset_name1,
-                           hid_t loc_id2,
-                           const char *dset_name2,
-                           const char *dset_name3 );
+H5_HLDLL herr_t H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2,
+                                   const char *dset_name2, const char *dset_name3);
 
-H5_HLDLL herr_t  H5TBinsert_field( hid_t loc_id,
-                         const char *dset_name,
-                         const char *field_name,
-                         hid_t field_type,
-                         hsize_t position,
-                         const void *fill_data,
-                         const void *buf );
-
-H5_HLDLL herr_t  H5TBdelete_field( hid_t loc_id,
-                         const char *dset_name,
-                         const char *field_name );
+H5_HLDLL herr_t H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name,
+                                 hid_t field_type, hsize_t position, const void *fill_data, const void *buf);
 
+H5_HLDLL herr_t H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name);
 
 /*-------------------------------------------------------------------------
  *
@@ -214,18 +119,12 @@ H5_HLDLL herr_t  H5TBdelete_field( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5TBAget_title( hid_t loc_id,
-                       char *table_title );
+H5_HLDLL herr_t H5TBAget_title(hid_t loc_id, char *table_title);
 
-H5_HLDLL htri_t  H5TBAget_fill(hid_t loc_id,
-                      const char *dset_name,
-                      hid_t dset_id,
-                      unsigned char *dst_buf);
+H5_HLDLL htri_t H5TBAget_fill(hid_t loc_id, const char *dset_name, hid_t dset_id, unsigned char *dst_buf);
 
 #ifdef __cplusplus
 }
 #endif
 
-
 #endif
-
diff --git a/hl/src/hdf5_hl.h b/hl/src/hdf5_hl.h
index 3a7b8ee..51f8ab9 100644
--- a/hl/src/hdf5_hl.h
+++ b/hl/src/hdf5_hl.h
@@ -29,4 +29,3 @@
 #include "H5LDpublic.h" /* lite dataset */
 
 #endif /*H5_INCLUDE_HL*/
-
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 285ab77..0138e19 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -31,9 +31,9 @@
 
 /* prototypes */
 static hid_t open_test_file(const char *fileext);
-herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx);
-herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
-herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
+herr_t       create_long_dataset(hid_t fid, const char *dsname, const char *dsidx);
+herr_t       test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
+herr_t       test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
 herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx);
 herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx);
 
@@ -43,47 +43,46 @@ static int test_long_scalenames(const char *filename);
 static int test_samelong_scalenames(const char *filename);
 static int test_foreign_scaleattached(const char *filename);
 
-
-#define DIM_DATA      12
-#define DIM1_SIZE     3
-#define DIM2_SIZE     4
-#define DIM3_SIZE     12
-#define DIM4_SIZE     2
-#define DIM0          0
-#define DIM1          1
-#define DIM2          2
-#define DIM3          3
-
-#define DATASET_NAME   "dset_"
-#define DS_1_NAME      "ds_1_"
-#define DS_2_NAME      "ds_2_"
-#define DS_3_NAME      "ds_3_"
-#define DS_4_NAME      "ds_4_"
-
-#define SCALE_1_NAME   "scalename_1_"
-#define SCALE_2_NAME   "scalename_2_"
-#define SCALE_3_NAME   "scalename_3_"
-#define SCALE_4_NAME   "scalename_4_"
-
-#define FILENAME       "test_ds_"
-#define FILEEXT        ".h5"
+#define DIM_DATA  12
+#define DIM1_SIZE 3
+#define DIM2_SIZE 4
+#define DIM3_SIZE 12
+#define DIM4_SIZE 2
+#define DIM0      0
+#define DIM1      1
+#define DIM2      2
+#define DIM3      3
+
+#define DATASET_NAME "dset_"
+#define DS_1_NAME    "ds_1_"
+#define DS_2_NAME    "ds_2_"
+#define DS_3_NAME    "ds_3_"
+#define DS_4_NAME    "ds_4_"
+
+#define SCALE_1_NAME "scalename_1_"
+#define SCALE_2_NAME "scalename_2_"
+#define SCALE_3_NAME "scalename_3_"
+#define SCALE_4_NAME "scalename_4_"
+
+#define FILENAME "test_ds_"
+#define FILEEXT  ".h5"
 
 /*-------------------------------------------------------------------------
  * the main program
  *-------------------------------------------------------------------------
  */
-int main(int argc , char **argv)
+int
+main(int argc, char **argv)
 {
-    int nerrors=0;
+    int  nerrors = 0;
     char filename[65];
 
-
     if (argc < 2) {
         HDprintf("Usage: gen_test [le | be]\n");
         return 1;
     }
 
-    if ( argv[1] && (strcmp("le",argv[1])!=0) && (strcmp("be",argv[1])!=0) ) {
+    if (argv[1] && (strcmp("le", argv[1]) != 0) && (strcmp("be", argv[1]) != 0)) {
         HDprintf("Usage: gen_test [le | be]\n");
         return 1;
     }
@@ -92,26 +91,28 @@ int main(int argc , char **argv)
     strcpy(filename, FILENAME);
     strcat(filename, argv[1]);
     strcat(filename, FILEEXT);
-    if(H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT) < 0) {
+    if (H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         nerrors = 1;
         goto error;
     }
-    nerrors += test_long_attachscales(filename) < 0  ? 1 : 0;
-    nerrors += test_duplicatelong_attachscales(filename) < 0  ? 1 : 0;
-    nerrors += test_samelong_scalenames(filename) < 0  ? 1 : 0;
-    nerrors += test_foreign_scaleattached(filename) < 0  ? 1 : 0;
-    nerrors += test_long_scalenames(filename) < 0  ? 1 : 0;
+    nerrors += test_long_attachscales(filename) < 0 ? 1 : 0;
+    nerrors += test_duplicatelong_attachscales(filename) < 0 ? 1 : 0;
+    nerrors += test_samelong_scalenames(filename) < 0 ? 1 : 0;
+    nerrors += test_foreign_scaleattached(filename) < 0 ? 1 : 0;
+    nerrors += test_long_scalenames(filename) < 0 ? 1 : 0;
 
-    if(nerrors) goto error;
+    if (nerrors)
+        goto error;
     HDprintf("Dimension scales file generation passed.\n");
     return 0;
 
 error:
-    HDprintf("***** %d DIMENSION SCALES FILE GENERATION FAILED! *****\n",nerrors);
+    HDprintf("***** %d DIMENSION SCALES FILE GENERATION FAILED! *****\n", nerrors);
     return 1;
 }
 
-static hid_t open_test_file(const char *fileext)
+static hid_t
+open_test_file(const char *fileext)
 {
     char filename[65];
 
@@ -127,191 +128,197 @@ static hid_t open_test_file(const char *fileext)
  *-------------------------------------------------------------------------
  */
 
-herr_t create_long_dataset(hid_t fid, const char *name, const char *dsidx)
+herr_t
+create_long_dataset(hid_t fid, const char *name, const char *dsidx)
 {
-    int     rank = 4;
-    int     rankds = 1;
-    hsize_t dims[4]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE,DIM4_SIZE};
-    long    buf[DIM_DATA*3*2] = {1,2,3,4,5,6,7,8,9,10,11,12,
-            1,2,3,4,5,6,7,8,9,10,11,12,1,2,3,4,5,6,7,8,9,10,11,12,
-            1,2,3,4,5,6,7,8,9,10,11,12,1,2,3,4,5,6,7,8,9,10,11,12,
-            1,2,3,4,5,6,7,8,9,10,11,12};
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    hsize_t s3_dim[1]  = {DIM3_SIZE};
-    hsize_t s4_dim[1]  = {DIM4_SIZE};
-    long    s1_wbuf[DIM1_SIZE] = {10,20,30};
-    long    s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    long    s3_wbuf[DIM3_SIZE] = {10,10,10,20,20,20,30,30,30,40,40,40};
-    long    s4_wbuf[DIM4_SIZE] = {18,18};
+    int     rank                  = 4;
+    int     rankds                = 1;
+    hsize_t dims[4]               = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE, DIM4_SIZE};
+    long    buf[DIM_DATA * 3 * 2] = {1, 2, 3, 4,  5,  6,  7, 8, 9, 10, 11, 12, 1, 2, 3, 4,  5,  6,
+                                  7, 8, 9, 10, 11, 12, 1, 2, 3, 4,  5,  6,  7, 8, 9, 10, 11, 12,
+                                  1, 2, 3, 4,  5,  6,  7, 8, 9, 10, 11, 12, 1, 2, 3, 4,  5,  6,
+                                  7, 8, 9, 10, 11, 12, 1, 2, 3, 4,  5,  6,  7, 8, 9, 10, 11, 12};
+    hsize_t s1_dim[1]             = {DIM1_SIZE};
+    hsize_t s2_dim[1]             = {DIM2_SIZE};
+    hsize_t s3_dim[1]             = {DIM3_SIZE};
+    hsize_t s4_dim[1]             = {DIM4_SIZE};
+    long    s1_wbuf[DIM1_SIZE]    = {10, 20, 30};
+    long    s2_wbuf[DIM2_SIZE]    = {100, 200, 300, 400};
+    long    s3_wbuf[DIM3_SIZE]    = {10, 10, 10, 20, 20, 20, 30, 30, 30, 40, 40, 40};
+    long    s4_wbuf[DIM4_SIZE]    = {18, 18};
 
     /* make a dataset */
-    if(H5LTmake_dataset_long(fid, name, rank, dims, buf) >= 0) {
+    if (H5LTmake_dataset_long(fid, name, rank, dims, buf) >= 0) {
         /* make a DS dataset for the first dimension */
         char dsname[32];
 
         strcpy(dsname, DS_1_NAME);
         strcat(dsname, dsidx);
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_long(fid, dsname, rankds, s1_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, dsname, rankds, s1_dim, s1_wbuf) < 0)
             return FAIL;
 
         strcpy(dsname, DS_2_NAME);
         strcat(dsname, dsidx);
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_long(fid, dsname, rankds, s2_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, dsname, rankds, s2_dim, s2_wbuf) < 0)
             return FAIL;
 
         strcpy(dsname, DS_3_NAME);
         strcat(dsname, dsidx);
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_long(fid, dsname, rankds, s3_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, dsname, rankds, s3_dim, s3_wbuf) < 0)
             return FAIL;
 
         strcpy(dsname, DS_4_NAME);
         strcat(dsname, dsidx);
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_long(fid, dsname, rankds, s4_dim, s4_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, dsname, rankds, s4_dim, s4_wbuf) < 0)
             return FAIL;
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
     return SUCCEED;
 }
 
-herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
+herr_t
+test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 0) {
-            if(H5DSattach_scale(did, dsid, idx) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) > 0) {
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 0) {
+            if (H5DSattach_scale(did, dsid, idx) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) > 0) {
                     /* HDprintf(" scale attached "); */
                     ret_value = SUCCEED;
                 }
-                else if(H5DSis_attached(did, dsid, idx) == 0) {
+                else if (H5DSis_attached(did, dsid, idx) == 0) {
                     HDprintf(" scale not attached ");
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
+herr_t
+test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if(H5DSdetach_scale(did, dsid, idx) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) == 0) {
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if (H5DSdetach_scale(did, dsid, idx) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) == 0) {
                     ret_value = SUCCEED;
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
+herr_t
+test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if(H5DSset_scale(dsid, scalename) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) == 1) {
-                     ret_value = SUCCEED;
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if (H5DSset_scale(dsid, scalename) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) == 1) {
+                    ret_value = SUCCEED;
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
+herr_t
+test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
 {
     herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    hid_t   dsid      = -1;
     ssize_t name_len;
-    char    *name_out=NULL;
-
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) {
-                name_out = (char*)HDmalloc((size_t)name_len * sizeof (char));
-                if(name_out != NULL) {
-                    if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) >= 0) {
-                        if(strcmp(scalename,name_out)==0) {
+    char *  name_out = NULL;
+
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if ((name_len = H5DSget_scale_name(dsid, NULL, (size_t)0)) > 0) {
+                name_out = (char *)HDmalloc((size_t)name_len * sizeof(char));
+                if (name_out != NULL) {
+                    if (H5DSget_scale_name(dsid, name_out, (size_t)name_len) >= 0) {
+                        if (strcmp(scalename, name_out) == 0) {
                             ret_value = SUCCEED;
                         }
                         HDfree(name_out);
-                        name_out=NULL;
+                        name_out = NULL;
                     }
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-static int test_long_attachscales(const char *filename)
+static int
+test_long_attachscales(const char *filename)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al");
 
     HL_TESTING2("test_long_attachscales");
 
-    if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_long_dataset(fid, dsname, "al") < 0)
+    if (create_long_dataset(fid, dsname, "al") < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         strcpy(scalename, DS_2_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         strcpy(scalename, DS_3_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         strcpy(scalename, DS_4_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM3) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -323,56 +330,59 @@ static int test_long_attachscales(const char *filename)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_duplicatelong_attachscales(const char *filename)
+static int
+test_duplicatelong_attachscales(const char *filename)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al2");
 
     HL_TESTING2("test_duplicatelong_attachscales");
 
-    if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
 
     /* make a dataset 2 */
-    if(create_long_dataset(fid, dsname, "al2") < 0)
+    if (create_long_dataset(fid, dsname, "al2") < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         strcpy(scalename, DS_2_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         strcpy(scalename, DS_3_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         strcpy(scalename, DS_4_NAME);
         strcat(scalename, "al");
-        if(test_attach_scale(fid, did, scalename, DIM3) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -384,71 +394,75 @@ static int test_duplicatelong_attachscales(const char *filename)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_long_scalenames(const char *filename) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_long_scalenames(const char *filename)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al");
 
-    if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
 
     HL_TESTING2("set long scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
         strcpy(name, SCALE_1_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         strcpy(scalename, DS_2_NAME);
         strcat(scalename, "al");
         strcpy(name, SCALE_2_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         strcpy(scalename, DS_3_NAME);
         strcat(scalename, "al");
         strcpy(name, SCALE_3_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         strcpy(scalename, DS_4_NAME);
         strcat(scalename, "al");
         strcpy(name, SCALE_4_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -460,72 +474,76 @@ static int test_long_scalenames(const char *filename) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_samelong_scalenames(const char *filename) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_samelong_scalenames(const char *filename)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al2");
 
-    if((fid = open_test_file(filename)) < 0)
+    if ((fid = open_test_file(filename)) < 0)
         goto out;
 
     HL_TESTING2("set same long scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
         strcpy(name, DS_1_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         strcpy(scalename, DS_2_NAME);
         strcat(scalename, "al");
         strcpy(name, DS_2_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         strcpy(scalename, DS_3_NAME);
         strcat(scalename, "al");
         strcpy(name, DS_3_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         strcpy(scalename, DS_4_NAME);
         strcat(scalename, "al");
         strcpy(name, DS_4_NAME);
         strcat(name, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -537,43 +555,46 @@ static int test_samelong_scalenames(const char *filename) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_foreign_scaleattached(const char *filename)
+static int
+test_foreign_scaleattached(const char *filename)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  fid       = -1;
+    hid_t  did       = -1;
+    hid_t  dsid      = -1;
 
     HL_TESTING2("test_foreign_scaleattached");
 
-    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, "/dset_al", H5P_DEFAULT)) >= 0) {
-        if((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) {
-            if(H5DSis_attached(did, dsid, 3) == 1) {
+    if ((did = H5Dopen2(fid, "/dset_al", H5P_DEFAULT)) >= 0) {
+        if ((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) {
+            if (H5DSis_attached(did, dsid, 3) == 1) {
                 ret_value = SUCCEED;
             }
-            if(H5Dclose(dsid) < 0)
+            if (H5Dclose(dsid) < 0)
                 goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
         goto out;
 
-    if(ret_value == FAIL)
+    if (ret_value == FAIL)
         goto out;
 
     PASSED();
@@ -582,10 +603,12 @@ static int test_foreign_scaleattached(const char *filename)
     return 0;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
diff --git a/hl/test/gen_test_ld.c b/hl/test/gen_test_ld.c
index d717a47..2a3beb5 100644
--- a/hl/test/gen_test_ld.c
+++ b/hl/test/gen_test_ld.c
@@ -13,46 +13,46 @@
 #include "H5LDprivate.h"
 
 /*
- *  WATCH.h5: file with various types of datasets for testing--                                   
+ *  WATCH.h5: file with various types of datasets for testing--
  *
- *  The following datasets are chunked, H5D_ALLOC_TIME_INCR, max. dimensional setting:       
- *      DSET_ONE: one-dimensional dataset                                                   
- *      DSET_TWO: two-dimensional dataset                                                  
- *      DSET_CMPD: one-dimensional dataset with compound type                             
+ *  The following datasets are chunked, H5D_ALLOC_TIME_INCR, max. dimensional setting:
+ *      DSET_ONE: one-dimensional dataset
+ *      DSET_TWO: two-dimensional dataset
+ *      DSET_CMPD: one-dimensional dataset with compound type
  *      DSET_CMPD_ESC: one-dimensional dataset with compound type and member names with
- *		       escape/separator characters 
- *      DSET_CMPD_TWO: two-dimensional dataset with compound type                             
- *                                                                                           
- *  The following datasets are one-dimensional, chunked, max. dimension setting:              
- *      DSET_ALLOC_EARLY: dataset with H5D_ALLOC_TIME_EARLY                                  
- *      DSET_ALLOC_LATE: dataset H5D_ALLOC_TIME_LATE                                        
- *                                                                                       
- *  The following datasets are one-dimensional:                                           
- *      DSET_NONE: fixed dimension setting, contiguous, H5D_ALLOC_TIME_LATE              
- *      DSET_NOMAX: fixed dimension setting, chunked, H5D_ALLOC_TIME_INCR      
+ *		       escape/separator characters
+ *      DSET_CMPD_TWO: two-dimensional dataset with compound type
+ *
+ *  The following datasets are one-dimensional, chunked, max. dimension setting:
+ *      DSET_ALLOC_EARLY: dataset with H5D_ALLOC_TIME_EARLY
+ *      DSET_ALLOC_LATE: dataset H5D_ALLOC_TIME_LATE
+ *
+ *  The following datasets are one-dimensional:
+ *      DSET_NONE: fixed dimension setting, contiguous, H5D_ALLOC_TIME_LATE
+ *      DSET_NOMAX: fixed dimension setting, chunked, H5D_ALLOC_TIME_INCR
  */
-#define ONE_DIMS0	10
-#define MAX_ONE_DIMS0	100
+#define ONE_DIMS0     10
+#define MAX_ONE_DIMS0 100
 
-#define DSET_ONE 	"DSET_ONE"
-#define DSET_NONE	"DSET_NONE"
-#define DSET_NOMAX	"DSET_NOMAX"
-#define DSET_ALLOC_LATE "DSET_ALLOC_LATE"
+#define DSET_ONE         "DSET_ONE"
+#define DSET_NONE        "DSET_NONE"
+#define DSET_NOMAX       "DSET_NOMAX"
+#define DSET_ALLOC_LATE  "DSET_ALLOC_LATE"
 #define DSET_ALLOC_EARLY "DSET_ALLOC_EARLY"
-#define DSET_CMPD 	"DSET_CMPD"
-#define DSET_CMPD_ESC 	"DSET_CMPD_ESC"
-#define DSET_NULL 	"DSET_NULL"
-#define DSET_SCALAR 	"DSET_SCALAR"
+#define DSET_CMPD        "DSET_CMPD"
+#define DSET_CMPD_ESC    "DSET_CMPD_ESC"
+#define DSET_NULL        "DSET_NULL"
+#define DSET_SCALAR      "DSET_SCALAR"
 
-#define TWO_DIMS0	4
-#define TWO_DIMS1	10
-#define MAX_TWO_DIMS0	60
-#define MAX_TWO_DIMS1	100
+#define TWO_DIMS0     4
+#define TWO_DIMS1     10
+#define MAX_TWO_DIMS0 60
+#define MAX_TWO_DIMS1 100
 
-#define DSET_TWO 	"DSET_TWO"
-#define DSET_CMPD_TWO 	"DSET_CMPD_TWO"
+#define DSET_TWO      "DSET_TWO"
+#define DSET_CMPD_TWO "DSET_CMPD_TWO"
 
-#define CHUNK_SIZE	2
+#define CHUNK_SIZE 2
 
 #define FILE "test_ld.h5"
 
@@ -65,7 +65,7 @@ typedef struct sub22_t {
 
 typedef struct sub2_t {
     unsigned int a;
-    sub22_t b;
+    sub22_t      b;
     unsigned int c;
 } sub2_t;
 
@@ -76,9 +76,9 @@ typedef struct sub4_t {
 
 typedef struct set_t {
     unsigned int field1;
-    sub2_t field2;
-    double field3;
-    sub4_t field4;
+    sub2_t       field2;
+    double       field3;
+    sub4_t       field4;
 } set_t;
 
 /*
@@ -90,119 +90,119 @@ typedef struct set_t {
  **************************************************************************************
  */
 static int
-generate_dset(hid_t fid, const char *dname, int ndims, hsize_t *dims,
-    hsize_t *maxdims, hid_t dtid, void *data)
+generate_dset(hid_t fid, const char *dname, int ndims, hsize_t *dims, hsize_t *maxdims, hid_t dtid,
+              void *data)
 {
-    hid_t dcpl = -1;	/* Dataset creation property */
-    hid_t did = -1;	/* Dataset id */
-    hid_t sid = -1;	/* Dataspace id */
-    int i;		/* Local index variable */
+    hid_t dcpl = -1; /* Dataset creation property */
+    hid_t did  = -1; /* Dataset id */
+    hid_t sid  = -1; /* Dataspace id */
+    int   i;         /* Local index variable */
 
     /* Create the dataspace */
-    if((sid = H5Screate_simple(ndims, dims, maxdims)) < 0)
-	goto done;
+    if ((sid = H5Screate_simple(ndims, dims, maxdims)) < 0)
+        goto done;
 
     /* Set up dataset's creation properties */
-    if(!HDstrcmp(dname, DSET_NONE))
-	dcpl = H5P_DEFAULT;
+    if (!HDstrcmp(dname, DSET_NONE))
+        dcpl = H5P_DEFAULT;
     else {
-        hsize_t chunk_dims[H5S_MAX_RANK];	/* Dimension sizes for chunks */
-
-	if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-	    goto done;
-	for(i = 0; i < ndims; i++)
-	    chunk_dims[i] = CHUNK_SIZE;
-	if(H5Pset_chunk(dcpl, ndims, chunk_dims) < 0)
-	    goto done;
+        hsize_t chunk_dims[H5S_MAX_RANK]; /* Dimension sizes for chunks */
+
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+            goto done;
+        for (i = 0; i < ndims; i++)
+            chunk_dims[i] = CHUNK_SIZE;
+        if (H5Pset_chunk(dcpl, ndims, chunk_dims) < 0)
+            goto done;
     } /* end else */
 
-    if(!HDstrcmp(dname, DSET_ALLOC_LATE)) {
-	if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0)
-	    goto done;
+    if (!HDstrcmp(dname, DSET_ALLOC_LATE)) {
+        if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0)
+            goto done;
     } /* end if */
-    else if(!HDstrcmp(dname, DSET_ALLOC_EARLY)) {
-	if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
-	    goto done;
+    else if (!HDstrcmp(dname, DSET_ALLOC_EARLY)) {
+        if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+            goto done;
     } /* end if */
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, dname, dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto done;
+    if ((did = H5Dcreate2(fid, dname, dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto done;
 
     /* Write to the dataset */
-    if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
-	goto done;
+    if (H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+        goto done;
 
     /* Closing */
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto done;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto done;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto done;
 
-    return(SUCCEED);
+    return (SUCCEED);
 
 done:
     H5E_BEGIN_TRY
-	H5Sclose(sid);
-	H5Pclose(dcpl);
-	H5Dclose(did);
+    H5Sclose(sid);
+    H5Pclose(dcpl);
+    H5Dclose(did);
     H5E_END_TRY
 
-    return(FAIL);
+    return (FAIL);
 } /* generate_dset() */
 
 int
 main(void)
 {
-    hid_t fid;			/* File id */
-    hid_t fapl;			/* File access property list */
-    hsize_t cur_dims[1];	/* Dimension sizes */
-    hsize_t max_dims[1];	/* Maximum dimension sizes */
-    hsize_t cur2_dims[2];	/* Current dimension sizes */
-    hsize_t max2_dims[2];	/* Maximum dimension sizes */
-    hid_t set_tid, esc_set_tid;	/* Compound type id */
-    hid_t sub22_tid;		/* Compound type id */
-    hid_t sub2_tid, esc_sub2_tid;	/* Compound type id */
-    hid_t sub4_tid, esc_sub4_tid;	/* Compound type id */
-    hid_t null_did, null_sid;		/* H5S_NULL dataset & dataspace ids */
-    hid_t scalar_did, scalar_sid;	/* H5S_SCALAR dataset & dataspace ids */
-    int one_data[ONE_DIMS0];		/* Buffer for data */
-    int two_data[TWO_DIMS0*TWO_DIMS1];	/* Buffer for data */
-    set_t one_cbuf[ONE_DIMS0];		/* Buffer for data with compound type */
-    set_t two_cbuf[TWO_DIMS0*TWO_DIMS1];	/* Buffer for data with compound type */
-    int i;			/* Local index variable */
+    hid_t   fid;                             /* File id */
+    hid_t   fapl;                            /* File access property list */
+    hsize_t cur_dims[1];                     /* Dimension sizes */
+    hsize_t max_dims[1];                     /* Maximum dimension sizes */
+    hsize_t cur2_dims[2];                    /* Current dimension sizes */
+    hsize_t max2_dims[2];                    /* Maximum dimension sizes */
+    hid_t   set_tid, esc_set_tid;            /* Compound type id */
+    hid_t   sub22_tid;                       /* Compound type id */
+    hid_t   sub2_tid, esc_sub2_tid;          /* Compound type id */
+    hid_t   sub4_tid, esc_sub4_tid;          /* Compound type id */
+    hid_t   null_did, null_sid;              /* H5S_NULL dataset & dataspace ids */
+    hid_t   scalar_did, scalar_sid;          /* H5S_SCALAR dataset & dataspace ids */
+    int     one_data[ONE_DIMS0];             /* Buffer for data */
+    int     two_data[TWO_DIMS0 * TWO_DIMS1]; /* Buffer for data */
+    set_t   one_cbuf[ONE_DIMS0];             /* Buffer for data with compound type */
+    set_t   two_cbuf[TWO_DIMS0 * TWO_DIMS1]; /* Buffer for data with compound type */
+    int     i;                               /* Local index variable */
 
     /* Create a file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto done;
 
     /* Set to use latest library format */
-    if((H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST)) < 0)
+    if ((H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST)) < 0)
         goto done;
 
     /* Create a file */
-    if((fid = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto done;
+    if ((fid = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        goto done;
 
     /* Initialization for one-dimensional dataset */
     cur_dims[0] = ONE_DIMS0;
     max_dims[0] = MAX_ONE_DIMS0;
-    for(i = 0; i < ONE_DIMS0; i++)
+    for (i = 0; i < ONE_DIMS0; i++)
         one_data[i] = i;
 
     /* Generate DSET_ONE, DSET_NONE, DSET_NOMAX, DSET_ALLOC_LATE, DSET_EARLY */
-    if(generate_dset(fid, DSET_ONE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
-	goto done;
-    if(generate_dset(fid, DSET_NONE, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
-	goto done;
-    if(generate_dset(fid, DSET_NOMAX, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
-	goto done;
-    if(generate_dset(fid, DSET_ALLOC_LATE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
-	goto done;
-    if(generate_dset(fid, DSET_ALLOC_EARLY, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
-	goto done;
+    if (generate_dset(fid, DSET_ONE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+        goto done;
+    if (generate_dset(fid, DSET_NONE, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
+        goto done;
+    if (generate_dset(fid, DSET_NOMAX, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
+        goto done;
+    if (generate_dset(fid, DSET_ALLOC_LATE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+        goto done;
+    if (generate_dset(fid, DSET_ALLOC_EARLY, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+        goto done;
 
     /* Initialization for two-dimensional dataset */
     cur2_dims[0] = TWO_DIMS0;
@@ -210,99 +210,99 @@ main(void)
     max2_dims[0] = MAX_TWO_DIMS0;
     max2_dims[1] = MAX_TWO_DIMS1;
 
-    for(i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++)
+    for (i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++)
         two_data[i] = i;
 
     /* Generate DSET_TWO */
-    if(generate_dset(fid, DSET_TWO, 2, cur2_dims, max2_dims, H5T_NATIVE_INT, two_data) < 0)
-	goto done;
+    if (generate_dset(fid, DSET_TWO, 2, cur2_dims, max2_dims, H5T_NATIVE_INT, two_data) < 0)
+        goto done;
 
     /* Initialization for one-dimensional compound typed dataset */
     cur_dims[0] = ONE_DIMS0;
     max_dims[0] = MAX_ONE_DIMS0;
 
     for (i = 0; i < ONE_DIMS0; i++) {
-        one_cbuf[i].field1 = 1;
-        one_cbuf[i].field2.a = 2;
-        one_cbuf[i].field2.c = 4;
+        one_cbuf[i].field1     = 1;
+        one_cbuf[i].field2.a   = 2;
+        one_cbuf[i].field2.c   = 4;
         one_cbuf[i].field2.b.a = 20;
         one_cbuf[i].field2.b.b = 40;
         one_cbuf[i].field2.b.c = 80;
-        one_cbuf[i].field3 = 3.0f;
-        one_cbuf[i].field4.a = 4;
-        one_cbuf[i].field4.b = 8;
+        one_cbuf[i].field3     = 3.0f;
+        one_cbuf[i].field4.a   = 4;
+        one_cbuf[i].field4.b   = 8;
     } /* end for */
 
     /* Create the compound type */
-    if((sub22_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub22_t))) < 0)
-	goto done;
-    if(H5Tinsert(sub22_tid, "a", HOFFSET(sub22_t, a), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(sub22_tid, "b", HOFFSET(sub22_t, b), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(sub22_tid, "c", HOFFSET(sub22_t, c), H5T_NATIVE_INT) < 0)
-	goto done;
-
-    if((sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
-	goto done;
-    if(H5Tinsert(sub2_tid, "a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(sub2_tid, "b", HOFFSET(sub2_t, b), sub22_tid) < 0)
-	goto done;
-    if(H5Tinsert(sub2_tid, "c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
-	goto done;
-
-    if((sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
-	goto done;
-    if(H5Tinsert(sub4_tid, "a", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(sub4_tid, "b", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
-	goto done;
-
-    if((set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
-	goto done;
-    if(H5Tinsert(set_tid, "field1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(set_tid, "field2", HOFFSET(set_t, field2), sub2_tid) < 0)
-	goto done;
-    if(H5Tinsert(set_tid, "field3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
-	goto done;
-    if(H5Tinsert(set_tid, "field4", HOFFSET(set_t, field4), sub4_tid) < 0)
-	goto done;
+    if ((sub22_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub22_t))) < 0)
+        goto done;
+    if (H5Tinsert(sub22_tid, "a", HOFFSET(sub22_t, a), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(sub22_tid, "b", HOFFSET(sub22_t, b), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(sub22_tid, "c", HOFFSET(sub22_t, c), H5T_NATIVE_INT) < 0)
+        goto done;
+
+    if ((sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
+        goto done;
+    if (H5Tinsert(sub2_tid, "a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(sub2_tid, "b", HOFFSET(sub2_t, b), sub22_tid) < 0)
+        goto done;
+    if (H5Tinsert(sub2_tid, "c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
+        goto done;
+
+    if ((sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
+        goto done;
+    if (H5Tinsert(sub4_tid, "a", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(sub4_tid, "b", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
+        goto done;
+
+    if ((set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
+        goto done;
+    if (H5Tinsert(set_tid, "field1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(set_tid, "field2", HOFFSET(set_t, field2), sub2_tid) < 0)
+        goto done;
+    if (H5Tinsert(set_tid, "field3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
+        goto done;
+    if (H5Tinsert(set_tid, "field4", HOFFSET(set_t, field4), sub4_tid) < 0)
+        goto done;
 
     /* Create the compound type with escape/separator characters */
-    if((esc_sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
-	goto done;
-    if(H5Tinsert(esc_sub2_tid, ".a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(esc_sub2_tid, ",b", HOFFSET(sub2_t, b), sub22_tid) < 0)
-	goto done;
-    if(H5Tinsert(esc_sub2_tid, "\\c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
-	goto done;
-
-    if((esc_sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
-	goto done;
-    if(H5Tinsert(esc_sub4_tid, "a.", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(esc_sub4_tid, "b,", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
-	goto done;
-
-    if((esc_set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
-	goto done;
-    if(H5Tinsert(esc_set_tid, "field,1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
-	goto done;
-    if(H5Tinsert(esc_set_tid, "field2.", HOFFSET(set_t, field2), esc_sub2_tid) < 0)
-	goto done;
-    if(H5Tinsert(esc_set_tid, "field\\3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
-	goto done;
-    if(H5Tinsert(esc_set_tid, "field4,", HOFFSET(set_t, field4), esc_sub4_tid) < 0)
-	goto done;
+    if ((esc_sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
+        goto done;
+    if (H5Tinsert(esc_sub2_tid, ".a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(esc_sub2_tid, ",b", HOFFSET(sub2_t, b), sub22_tid) < 0)
+        goto done;
+    if (H5Tinsert(esc_sub2_tid, "\\c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
+        goto done;
+
+    if ((esc_sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
+        goto done;
+    if (H5Tinsert(esc_sub4_tid, "a.", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(esc_sub4_tid, "b,", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
+        goto done;
+
+    if ((esc_set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
+        goto done;
+    if (H5Tinsert(esc_set_tid, "field,1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
+        goto done;
+    if (H5Tinsert(esc_set_tid, "field2.", HOFFSET(set_t, field2), esc_sub2_tid) < 0)
+        goto done;
+    if (H5Tinsert(esc_set_tid, "field\\3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
+        goto done;
+    if (H5Tinsert(esc_set_tid, "field4,", HOFFSET(set_t, field4), esc_sub4_tid) < 0)
+        goto done;
 
     /* Generate DSET_CMPD, DSET_CMPD_ESC */
-    if(generate_dset(fid, DSET_CMPD, 1, cur_dims, max_dims, set_tid, one_cbuf) < 0)
-	goto done;
-    if(generate_dset(fid, DSET_CMPD_ESC, 1, cur_dims, max_dims, esc_set_tid, one_cbuf) < 0)
-	goto done;
+    if (generate_dset(fid, DSET_CMPD, 1, cur_dims, max_dims, set_tid, one_cbuf) < 0)
+        goto done;
+    if (generate_dset(fid, DSET_CMPD_ESC, 1, cur_dims, max_dims, esc_set_tid, one_cbuf) < 0)
+        goto done;
 
     /* Initialization for two-dimensional compound typed dataset */
     cur2_dims[0] = TWO_DIMS0;
@@ -311,76 +311,90 @@ main(void)
     max2_dims[0] = MAX_TWO_DIMS1;
 
     for (i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++) {
-        two_cbuf[i].field1 = 1;
-        two_cbuf[i].field2.a = 2;
-        two_cbuf[i].field2.c = 4;
+        two_cbuf[i].field1     = 1;
+        two_cbuf[i].field2.a   = 2;
+        two_cbuf[i].field2.c   = 4;
         two_cbuf[i].field2.b.a = 20;
         two_cbuf[i].field2.b.b = 40;
         two_cbuf[i].field2.b.c = 80;
-        two_cbuf[i].field3 = 3.0f;
-        two_cbuf[i].field4.a = 4;
-        two_cbuf[i].field4.b = 8;
+        two_cbuf[i].field3     = 3.0f;
+        two_cbuf[i].field4.a   = 4;
+        two_cbuf[i].field4.b   = 8;
     } /* end for */
 
     /* Generate DSET_CMPD_TWO */
-    if(generate_dset(fid, DSET_CMPD_TWO, 2, cur2_dims, max2_dims, set_tid, two_cbuf) < 0)
-	goto done;
+    if (generate_dset(fid, DSET_CMPD_TWO, 2, cur2_dims, max2_dims, set_tid, two_cbuf) < 0)
+        goto done;
 
     /* Create NULL dataspace */
-    if((null_sid = H5Screate(H5S_NULL)) < 0)
-	goto done;
+    if ((null_sid = H5Screate(H5S_NULL)) < 0)
+        goto done;
 
     /* Create the NULL dataset */
-    if((null_did = H5Dcreate2(fid, DSET_NULL, H5T_NATIVE_UINT, null_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto done;
+    if ((null_did = H5Dcreate2(fid, DSET_NULL, H5T_NATIVE_UINT, null_sid, H5P_DEFAULT, H5P_DEFAULT,
+                               H5P_DEFAULT)) < 0)
+        goto done;
 
     /* Create SCALAR dataspace */
-    if((scalar_sid = H5Screate(H5S_SCALAR)) < 0)
-	goto done;
+    if ((scalar_sid = H5Screate(H5S_SCALAR)) < 0)
+        goto done;
 
     /* Create the SCALAR dataset */
-    if((scalar_did = H5Dcreate2(fid, DSET_SCALAR, H5T_NATIVE_INT, scalar_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto done;
+    if ((scalar_did = H5Dcreate2(fid, DSET_SCALAR, H5T_NATIVE_INT, scalar_sid, H5P_DEFAULT, H5P_DEFAULT,
+                                 H5P_DEFAULT)) < 0)
+        goto done;
 
     /* Closing */
-    if(H5Dclose(scalar_did) < 0) goto done;
-    if(H5Sclose(scalar_sid) < 0) goto done;
+    if (H5Dclose(scalar_did) < 0)
+        goto done;
+    if (H5Sclose(scalar_sid) < 0)
+        goto done;
 
-    if(H5Dclose(null_did) < 0) goto done;
-    if(H5Sclose(null_sid) < 0) goto done;
+    if (H5Dclose(null_did) < 0)
+        goto done;
+    if (H5Sclose(null_sid) < 0)
+        goto done;
 
-    if(H5Tclose(sub22_tid) < 0) goto done;
-    if(H5Tclose(sub2_tid) < 0) goto done;
-    if(H5Tclose(sub4_tid) < 0) goto done;
-    if(H5Tclose(set_tid) < 0) goto done;
-    if(H5Tclose(esc_sub2_tid) < 0) goto done;
-    if(H5Tclose(esc_sub4_tid) < 0) goto done;
-    if(H5Tclose(esc_set_tid) < 0) goto done;
+    if (H5Tclose(sub22_tid) < 0)
+        goto done;
+    if (H5Tclose(sub2_tid) < 0)
+        goto done;
+    if (H5Tclose(sub4_tid) < 0)
+        goto done;
+    if (H5Tclose(set_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_sub2_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_sub4_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_set_tid) < 0)
+        goto done;
 
-    if(H5Pclose(fapl) < 0) goto done;
-    if(H5Fclose(fid) < 0) goto done;
+    if (H5Pclose(fapl) < 0)
+        goto done;
+    if (H5Fclose(fid) < 0)
+        goto done;
 
     exit(EXIT_SUCCESS);
 
 done:
     H5E_BEGIN_TRY
-	H5Tclose(sub22_tid);
-	H5Tclose(sub2_tid);
-	H5Tclose(sub4_tid);
-	H5Tclose(set_tid);
-	H5Tclose(esc_sub2_tid);
-	H5Tclose(esc_sub4_tid);
-	H5Tclose(esc_set_tid);
-
-	H5Dclose(null_did);
-	H5Sclose(null_sid);
-	H5Dclose(scalar_did);
-	H5Sclose(scalar_sid);
-
-	H5Pclose(fapl);
-	H5Fclose(fid);
+    H5Tclose(sub22_tid);
+    H5Tclose(sub2_tid);
+    H5Tclose(sub4_tid);
+    H5Tclose(set_tid);
+    H5Tclose(esc_sub2_tid);
+    H5Tclose(esc_sub4_tid);
+    H5Tclose(esc_set_tid);
+
+    H5Dclose(null_did);
+    H5Sclose(null_sid);
+    H5Dclose(scalar_did);
+    H5Sclose(scalar_sid);
+
+    H5Pclose(fapl);
+    H5Fclose(fid);
     H5E_END_TRY
 
     exit(EXIT_FAILURE);
 } /* main() */
-
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index 85f47bd..d694f0c 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -28,13 +28,24 @@
 #include "H5HLprivate2.h"
 
 /* Macros used in HL tests */
-#define HL_TESTING2(WHAT)  {HDprintf("Testing %-62s", WHAT); HDfflush(stdout);}
-#define HL_TESTING3(WHAT)  {HDprintf("Testing %-62s", WHAT); HDfflush(stdout);}
+#define HL_TESTING2(WHAT)                                                                                    \
+    {                                                                                                        \
+        HDprintf("Testing %-62s", WHAT);                                                                     \
+        HDfflush(stdout);                                                                                    \
+    }
+#define HL_TESTING3(WHAT)                                                                                    \
+    {                                                                                                        \
+        HDprintf("Testing %-62s", WHAT);                                                                     \
+        HDfflush(stdout);                                                                                    \
+    }
 
 /* Implements verbose 'assert' with 'goto error' exit  */
-#define VERIFY(condition, string) do { if (!(condition)) FAIL_PUTS_ERROR(string) } while(0)
+#define VERIFY(condition, string)                                                                            \
+    do {                                                                                                     \
+        if (!(condition))                                                                                    \
+            FAIL_PUTS_ERROR(string)                                                                          \
+    } while (0)
 
 int test_packet_table_with_varlen(void);
 
 #endif /* _H5HLTEST_H */
-
diff --git a/hl/test/pal_rgb.h b/hl/test/pal_rgb.h
index 4b22bea..a032a77 100644
--- a/hl/test/pal_rgb.h
+++ b/hl/test/pal_rgb.h
@@ -11,261 +11,41 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-const unsigned char pal_rgb[256*3] = {255,255,255,
-0,0,131,
-0,0,135,
-0,0,139,
-0,0,143,
-0,0,147,
-0,0,151,
-0,0,155,
-0,0,159,
-0,0,163,
-0,0,167,
-0,0,171,
-0,0,175,
-0,0,179,
-0,0,183,
-0,0,187,
-0,0,191,
-0,0,195,
-0,0,199,
-0,0,203,
-0,0,207,
-0,0,211,
-0,0,215,
-0,0,219,
-0,0,223,
-0,0,227,
-0,0,231,
-0,0,235,
-0,0,239,
-0,0,243,
-0,0,247,
-0,0,251,
-0,0,255,
-0,0,255,
-0,3,255,
-0,7,255,
-0,11,255,
-0,15,255,
-0,19,255,
-0,23,255,
-0,27,255,
-0,31,255,
-0,35,255,
-0,39,255,
-0,43,255,
-0,47,255,
-0,51,255,
-0,55,255,
-0,59,255,
-0,63,255,
-0,67,255,
-0,71,255,
-0,75,255,
-0,79,255,
-0,83,255,
-0,87,255,
-0,91,255,
-0,95,255,
-0,99,255,
-0,103,255,
-0,107,255,
-0,111,255,
-0,115,255,
-0,119,255,
-0,123,255,
-0,127,255,
-0,131,255,
-0,135,255,
-0,139,255,
-0,143,255,
-0,147,255,
-0,151,255,
-0,155,255,
-0,159,255,
-0,163,255,
-0,167,255,
-0,171,255,
-0,175,255,
-0,179,255,
-0,183,255,
-0,187,255,
-0,191,255,
-0,195,255,
-0,199,255,
-0,203,255,
-0,207,255,
-0,211,255,
-0,215,255,
-0,219,255,
-0,223,255,
-0,227,255,
-0,231,255,
-0,235,255,
-0,239,255,
-0,243,255,
-0,247,255,
-0,251,255,
-0,255,255,
-0,255,255,
-3,255,251,
-7,255,247,
-11,255,243,
-15,255,239,
-19,255,235,
-23,255,231,
-27,255,227,
-31,255,223,
-35,255,219,
-39,255,215,
-43,255,211,
-47,255,207,
-51,255,203,
-55,255,199,
-59,255,195,
-63,255,191,
-67,255,187,
-71,255,183,
-75,255,179,
-79,255,175,
-83,255,171,
-87,255,167,
-91,255,163,
-95,255,159,
-99,255,155,
-103,255,151,
-107,255,147,
-111,255,143,
-115,255,139,
-119,255,135,
-123,255,131,
-127,255,127,
-131,255,123,
-135,255,119,
-139,255,115,
-143,255,111,
-147,255,107,
-151,255,103,
-155,255,99,
-159,255,95,
-163,255,91,
-167,255,87,
-171,255,83,
-175,255,79,
-179,255,75,
-183,255,71,
-187,255,67,
-191,255,63,
-195,255,59,
-199,255,55,
-203,255,51,
-207,255,47,
-211,255,43,
-215,255,39,
-219,255,35,
-223,255,31,
-227,255,27,
-231,255,23,
-235,255,19,
-239,255,15,
-243,255,11,
-247,255,7,
-251,255,3,
-255,255,0,
-255,251,0,
-255,247,0,
-255,243,0,
-255,239,0,
-255,235,0,
-255,231,0,
-255,227,0,
-255,223,0,
-255,219,0,
-255,215,0,
-255,211,0,
-255,207,0,
-255,203,0,
-255,199,0,
-255,195,0,
-255,191,0,
-255,187,0,
-255,183,0,
-255,179,0,
-255,175,0,
-255,171,0,
-255,167,0,
-255,163,0,
-255,159,0,
-255,155,0,
-255,151,0,
-255,147,0,
-255,143,0,
-255,139,0,
-255,135,0,
-255,131,0,
-255,127,0,
-255,123,0,
-255,119,0,
-255,115,0,
-255,111,0,
-255,107,0,
-255,103,0,
-255,99,0,
-255,95,0,
-255,91,0,
-255,87,0,
-255,83,0,
-255,79,0,
-255,75,0,
-255,71,0,
-255,67,0,
-255,63,0,
-255,59,0,
-255,55,0,
-255,51,0,
-255,47,0,
-255,43,0,
-255,39,0,
-255,35,0,
-255,31,0,
-255,27,0,
-255,23,0,
-255,19,0,
-255,15,0,
-255,11,0,
-255,7,0,
-255,3,0,
-255,0,0,
-250,0,0,
-246,0,0,
-241,0,0,
-237,0,0,
-233,0,0,
-228,0,0,
-224,0,0,
-219,0,0,
-215,0,0,
-211,0,0,
-206,0,0,
-202,0,0,
-197,0,0,
-193,0,0,
-189,0,0,
-184,0,0,
-180,0,0,
-175,0,0,
-171,0,0,
-167,0,0,
-162,0,0,
-158,0,0,
-153,0,0,
-149,0,0,
-145,0,0,
-140,0,0,
-136,0,0,
-131,0,0,
-127,0,0
-};
-
+const unsigned char pal_rgb[256 * 3] = {
+    255, 255, 255, 0,   0,   131, 0,   0,   135, 0,   0,   139, 0,   0,   143, 0,   0,   147, 0,   0,   151,
+    0,   0,   155, 0,   0,   159, 0,   0,   163, 0,   0,   167, 0,   0,   171, 0,   0,   175, 0,   0,   179,
+    0,   0,   183, 0,   0,   187, 0,   0,   191, 0,   0,   195, 0,   0,   199, 0,   0,   203, 0,   0,   207,
+    0,   0,   211, 0,   0,   215, 0,   0,   219, 0,   0,   223, 0,   0,   227, 0,   0,   231, 0,   0,   235,
+    0,   0,   239, 0,   0,   243, 0,   0,   247, 0,   0,   251, 0,   0,   255, 0,   0,   255, 0,   3,   255,
+    0,   7,   255, 0,   11,  255, 0,   15,  255, 0,   19,  255, 0,   23,  255, 0,   27,  255, 0,   31,  255,
+    0,   35,  255, 0,   39,  255, 0,   43,  255, 0,   47,  255, 0,   51,  255, 0,   55,  255, 0,   59,  255,
+    0,   63,  255, 0,   67,  255, 0,   71,  255, 0,   75,  255, 0,   79,  255, 0,   83,  255, 0,   87,  255,
+    0,   91,  255, 0,   95,  255, 0,   99,  255, 0,   103, 255, 0,   107, 255, 0,   111, 255, 0,   115, 255,
+    0,   119, 255, 0,   123, 255, 0,   127, 255, 0,   131, 255, 0,   135, 255, 0,   139, 255, 0,   143, 255,
+    0,   147, 255, 0,   151, 255, 0,   155, 255, 0,   159, 255, 0,   163, 255, 0,   167, 255, 0,   171, 255,
+    0,   175, 255, 0,   179, 255, 0,   183, 255, 0,   187, 255, 0,   191, 255, 0,   195, 255, 0,   199, 255,
+    0,   203, 255, 0,   207, 255, 0,   211, 255, 0,   215, 255, 0,   219, 255, 0,   223, 255, 0,   227, 255,
+    0,   231, 255, 0,   235, 255, 0,   239, 255, 0,   243, 255, 0,   247, 255, 0,   251, 255, 0,   255, 255,
+    0,   255, 255, 3,   255, 251, 7,   255, 247, 11,  255, 243, 15,  255, 239, 19,  255, 235, 23,  255, 231,
+    27,  255, 227, 31,  255, 223, 35,  255, 219, 39,  255, 215, 43,  255, 211, 47,  255, 207, 51,  255, 203,
+    55,  255, 199, 59,  255, 195, 63,  255, 191, 67,  255, 187, 71,  255, 183, 75,  255, 179, 79,  255, 175,
+    83,  255, 171, 87,  255, 167, 91,  255, 163, 95,  255, 159, 99,  255, 155, 103, 255, 151, 107, 255, 147,
+    111, 255, 143, 115, 255, 139, 119, 255, 135, 123, 255, 131, 127, 255, 127, 131, 255, 123, 135, 255, 119,
+    139, 255, 115, 143, 255, 111, 147, 255, 107, 151, 255, 103, 155, 255, 99,  159, 255, 95,  163, 255, 91,
+    167, 255, 87,  171, 255, 83,  175, 255, 79,  179, 255, 75,  183, 255, 71,  187, 255, 67,  191, 255, 63,
+    195, 255, 59,  199, 255, 55,  203, 255, 51,  207, 255, 47,  211, 255, 43,  215, 255, 39,  219, 255, 35,
+    223, 255, 31,  227, 255, 27,  231, 255, 23,  235, 255, 19,  239, 255, 15,  243, 255, 11,  247, 255, 7,
+    251, 255, 3,   255, 255, 0,   255, 251, 0,   255, 247, 0,   255, 243, 0,   255, 239, 0,   255, 235, 0,
+    255, 231, 0,   255, 227, 0,   255, 223, 0,   255, 219, 0,   255, 215, 0,   255, 211, 0,   255, 207, 0,
+    255, 203, 0,   255, 199, 0,   255, 195, 0,   255, 191, 0,   255, 187, 0,   255, 183, 0,   255, 179, 0,
+    255, 175, 0,   255, 171, 0,   255, 167, 0,   255, 163, 0,   255, 159, 0,   255, 155, 0,   255, 151, 0,
+    255, 147, 0,   255, 143, 0,   255, 139, 0,   255, 135, 0,   255, 131, 0,   255, 127, 0,   255, 123, 0,
+    255, 119, 0,   255, 115, 0,   255, 111, 0,   255, 107, 0,   255, 103, 0,   255, 99,  0,   255, 95,  0,
+    255, 91,  0,   255, 87,  0,   255, 83,  0,   255, 79,  0,   255, 75,  0,   255, 71,  0,   255, 67,  0,
+    255, 63,  0,   255, 59,  0,   255, 55,  0,   255, 51,  0,   255, 47,  0,   255, 43,  0,   255, 39,  0,
+    255, 35,  0,   255, 31,  0,   255, 27,  0,   255, 23,  0,   255, 19,  0,   255, 15,  0,   255, 11,  0,
+    255, 7,   0,   255, 3,   0,   255, 0,   0,   250, 0,   0,   246, 0,   0,   241, 0,   0,   237, 0,   0,
+    233, 0,   0,   228, 0,   0,   224, 0,   0,   219, 0,   0,   215, 0,   0,   211, 0,   0,   206, 0,   0,
+    202, 0,   0,   197, 0,   0,   193, 0,   0,   189, 0,   0,   184, 0,   0,   180, 0,   0,   175, 0,   0,
+    171, 0,   0,   167, 0,   0,   162, 0,   0,   158, 0,   0,   153, 0,   0,   149, 0,   0,   145, 0,   0,
+    140, 0,   0,   136, 0,   0,   131, 0,   0,   127, 0,   0};
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 79e6f45..e98367f 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -29,27 +29,43 @@ static herr_t op_stop(hid_t did, unsigned dim, hid_t dsid, void *visitor_data);
 /* prototypes */
 static hid_t create_test_file(const char *fileext);
 static hid_t open_test_file(const char *fileext);
-herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims);
-herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims);
-herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims);
-herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims);
-herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims);
-herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf);
-herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf);
-herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf, char *s3_wbuf);
-herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf);
-herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf);
-herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf, short *s3_wbuf);
-herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf);
-herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf);
-herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf, int *s3_wbuf);
-herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf);
-herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf);
-herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf);
-herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf);
-herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf);
-herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf);
-herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf, float *s3_wbuf);
+herr_t       create_char_dataset(hid_t fid, const char *dsidx, int fulldims);
+herr_t       create_short_dataset(hid_t fid, const char *dsidx, int fulldims);
+herr_t       create_int_dataset(hid_t fid, const char *dsidx, int fulldims);
+herr_t       create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims);
+herr_t       create_float_dataset(hid_t fid, const char *dsidx, int fulldims);
+herr_t       create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                                      char *s1_wbuf);
+herr_t       create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                                      char *s1_wbuf, char *s2_wbuf);
+herr_t       create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                                      char *s1_wbuf, char *s2_wbuf, char *s3_wbuf);
+herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                                 short *s1_wbuf);
+herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                                 short *s1_wbuf, short *s2_wbuf);
+herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                                 short *s1_wbuf, short *s2_wbuf, short *s3_wbuf);
+herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf,
+                               int *s1_wbuf);
+herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf,
+                               int *s1_wbuf, int *s2_wbuf);
+herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf,
+                               int *s1_wbuf, int *s2_wbuf, int *s3_wbuf);
+herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                                long *s1_wbuf);
+herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                                long *s1_wbuf, long *s2_wbuf);
+herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                                long *s1_wbuf, long *s2_wbuf, long *s3_wbuf);
+herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                                long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf);
+herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                                 float *s1_wbuf);
+herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                                 float *s1_wbuf, float *s2_wbuf);
+herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                                 float *s1_wbuf, float *s2_wbuf, float *s3_wbuf);
 herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
 herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx);
 herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx);
@@ -78,64 +94,64 @@ static int test_rank(void);
 static int test_types(void);
 static int test_iterators(void);
 static int test_data(void);
-static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf );
+static int read_data(const char *fname, int ndims, hsize_t *dims, float **buf);
 static int test_attach_detach(void);
 
-#define RANK1         1
-#define RANK          2
-#define DIM_DATA      12
-#define DIM1_SIZE     3
-#define DIM2_SIZE     4
-#define DIM3_SIZE     12
-#define DIM4_SIZE     2
-#define DIM0          0
-#define DIM1          1
-#define DIM2          2
-#define DIM3          3
-
-#define DATASET_NAME   "dset_"
-#define DS_1_NAME      "ds_1_"
-#define DS_11_NAME     "ds_11_"
-#define DS_2_NAME      "ds_2_"
-#define DS_21_NAME     "ds_21_"
-#define DS_22_NAME     "ds_22_"
-#define DS_3_NAME      "ds_3_"
-#define DS_31_NAME     "ds_31_"
-#define DS_32_NAME     "ds_32_"
-#define DS_33_NAME     "ds_33_"
-#define DS_4_NAME      "ds_4_"
-#define DS_41_NAME     "ds_41_"
-#define DS_42_NAME     "ds_42_"
-#define DS_43_NAME     "ds_43_"
-#define DS_44_NAME     "ds_44_"
-
-#define SCALE_1_NAME   "scalename_1_"
-#define SCALE_11_NAME  "scalename_11_"
-#define SCALE_2_NAME   "scalename_2_"
-#define SCALE_21_NAME  "scalename_21_"
-#define SCALE_22_NAME  "scalename_22_"
-#define SCALE_3_NAME   "scalename_3_"
-#define SCALE_31_NAME  "scalename_31_"
-#define SCALE_32_NAME  "scalename_32_"
-#define SCALE_33_NAME  "scalename_33_"
-#define SCALE_4_NAME   "scalename_4_"
-
-#define DIM0_LABEL     "Latitude"
-#define DIM1_LABEL     "Longitude"
-
-#define FOREIGN_FILE1       "test_ds_le.h5"
-#define FOREIGN_FILE2       "test_ds_be.h5"
-#define FILENAME       "test_ds"
-#define FILEEXT        ".h5"
-
-#define FILE1          "test_ds3.h5"
-#define FILE2          "test_ds4.h5"
-#define FILE3          "test_ds5.h5"
-#define FILE4          "test_ds6.h5"
-#define FILE5          "test_ds7.h5"
-#define FILE6          "test_ds8.h5"
-#define FILE7          "test_ds9.h5"
-#define FILE8          "test_ds10.h5"
+#define RANK1     1
+#define RANK      2
+#define DIM_DATA  12
+#define DIM1_SIZE 3
+#define DIM2_SIZE 4
+#define DIM3_SIZE 12
+#define DIM4_SIZE 2
+#define DIM0      0
+#define DIM1      1
+#define DIM2      2
+#define DIM3      3
+
+#define DATASET_NAME "dset_"
+#define DS_1_NAME    "ds_1_"
+#define DS_11_NAME   "ds_11_"
+#define DS_2_NAME    "ds_2_"
+#define DS_21_NAME   "ds_21_"
+#define DS_22_NAME   "ds_22_"
+#define DS_3_NAME    "ds_3_"
+#define DS_31_NAME   "ds_31_"
+#define DS_32_NAME   "ds_32_"
+#define DS_33_NAME   "ds_33_"
+#define DS_4_NAME    "ds_4_"
+#define DS_41_NAME   "ds_41_"
+#define DS_42_NAME   "ds_42_"
+#define DS_43_NAME   "ds_43_"
+#define DS_44_NAME   "ds_44_"
+
+#define SCALE_1_NAME  "scalename_1_"
+#define SCALE_11_NAME "scalename_11_"
+#define SCALE_2_NAME  "scalename_2_"
+#define SCALE_21_NAME "scalename_21_"
+#define SCALE_22_NAME "scalename_22_"
+#define SCALE_3_NAME  "scalename_3_"
+#define SCALE_31_NAME "scalename_31_"
+#define SCALE_32_NAME "scalename_32_"
+#define SCALE_33_NAME "scalename_33_"
+#define SCALE_4_NAME  "scalename_4_"
+
+#define DIM0_LABEL "Latitude"
+#define DIM1_LABEL "Longitude"
+
+#define FOREIGN_FILE1 "test_ds_le.h5"
+#define FOREIGN_FILE2 "test_ds_be.h5"
+#define FILENAME      "test_ds"
+#define FILEEXT       ".h5"
+
+#define FILE1 "test_ds3.h5"
+#define FILE2 "test_ds4.h5"
+#define FILE3 "test_ds5.h5"
+#define FILE4 "test_ds6.h5"
+#define FILE5 "test_ds7.h5"
+#define FILE6 "test_ds8.h5"
+#define FILE7 "test_ds9.h5"
+#define FILE8 "test_ds10.h5"
 
 #define DIMENSION_LIST "DIMENSION_LIST"
 #define REFERENCE_LIST "REFERENCE_LIST"
@@ -144,57 +160,57 @@ static int test_attach_detach(void);
  * the main program
  *-------------------------------------------------------------------------
  */
-int main(void)
+int
+main(void)
 {
-    int nerrors=0;
+    int nerrors = 0;
 
     /* create file to be used in following tests */
-    if(create_test_file("1") < 0) {
+    if (create_test_file("1") < 0) {
         nerrors = 1;
         goto error;
     }
-    nerrors += test_char_attachscales("1") < 0  ? 1 : 0;
-    nerrors += test_short_attachscales("1") < 0  ? 1 : 0;
-    nerrors += test_int_attachscales("1") < 0  ? 1 : 0;
-    nerrors += test_long_attachscales("1") < 0  ? 1 : 0;
-    nerrors += test_float_attachscales("1") < 0  ? 1 : 0;
-    nerrors += test_char_scalenames("1") < 0  ? 1 : 0;
-    nerrors += test_short_scalenames("1") < 0  ? 1 : 0;
-    nerrors += test_int_scalenames("1") < 0  ? 1 : 0;
-    nerrors += test_long_scalenames("1") < 0  ? 1 : 0;
-    nerrors += test_float_scalenames("1") < 0  ? 1 : 0;
-    nerrors += test_numberofscales("1") < 0  ? 1 : 0;
-    if(create_test_file("2") < 0) {
+    nerrors += test_char_attachscales("1") < 0 ? 1 : 0;
+    nerrors += test_short_attachscales("1") < 0 ? 1 : 0;
+    nerrors += test_int_attachscales("1") < 0 ? 1 : 0;
+    nerrors += test_long_attachscales("1") < 0 ? 1 : 0;
+    nerrors += test_float_attachscales("1") < 0 ? 1 : 0;
+    nerrors += test_char_scalenames("1") < 0 ? 1 : 0;
+    nerrors += test_short_scalenames("1") < 0 ? 1 : 0;
+    nerrors += test_int_scalenames("1") < 0 ? 1 : 0;
+    nerrors += test_long_scalenames("1") < 0 ? 1 : 0;
+    nerrors += test_float_scalenames("1") < 0 ? 1 : 0;
+    nerrors += test_numberofscales("1") < 0 ? 1 : 0;
+    if (create_test_file("2") < 0) {
         nerrors = 1;
         goto error;
     }
-    nerrors += test_long_attachscales("2") < 0  ? 1 : 0;
-    nerrors += test_duplicatelong_attachscales("2") < 0  ? 1 : 0;
-    nerrors += test_samelong_scalenames("2") < 0  ? 1 : 0;
-    nerrors += test_foreign_scaleattached(FOREIGN_FILE1) < 0  ? 1 : 0;
-    nerrors += test_foreign_scaleattached(FOREIGN_FILE2) < 0  ? 1 : 0;
-    nerrors += test_detachscales() < 0  ? 1 : 0;
-    nerrors += test_attach_detach() < 0  ? 1 : 0;
-/*  the following tests have not been rewritten to match those above */
-    nerrors += test_simple() < 0  ?1:0;
-    nerrors += test_errors() < 0  ?1:0;
-    nerrors += test_errors2() < 0  ?1:0;
-    nerrors += test_rank() < 0  ?1:0;
-    nerrors += test_iterators() < 0  ?1:0;
-    nerrors += test_types() < 0  ?1:0;
-    nerrors += test_data() < 0  ?1:0;
-
-
-    if(nerrors) goto error;
+    nerrors += test_long_attachscales("2") < 0 ? 1 : 0;
+    nerrors += test_duplicatelong_attachscales("2") < 0 ? 1 : 0;
+    nerrors += test_samelong_scalenames("2") < 0 ? 1 : 0;
+    nerrors += test_foreign_scaleattached(FOREIGN_FILE1) < 0 ? 1 : 0;
+    nerrors += test_foreign_scaleattached(FOREIGN_FILE2) < 0 ? 1 : 0;
+    nerrors += test_detachscales() < 0 ? 1 : 0;
+    nerrors += test_attach_detach() < 0 ? 1 : 0;
+    /*  the following tests have not been rewritten to match those above */
+    nerrors += test_simple() < 0 ? 1 : 0;
+    nerrors += test_errors() < 0 ? 1 : 0;
+    nerrors += test_errors2() < 0 ? 1 : 0;
+    nerrors += test_rank() < 0 ? 1 : 0;
+    nerrors += test_iterators() < 0 ? 1 : 0;
+    nerrors += test_types() < 0 ? 1 : 0;
+    nerrors += test_data() < 0 ? 1 : 0;
+
+    if (nerrors)
+        goto error;
     HDprintf("All dimension scales tests passed.\n");
     return 0;
 
 error:
-    HDprintf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * DS API test
  *
@@ -213,7 +229,8 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static hid_t create_test_file(const char *fileext)
+static hid_t
+create_test_file(const char *fileext)
 {
     char filename[65];
 
@@ -222,7 +239,8 @@ static hid_t create_test_file(const char *fileext)
     return H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 }
 
-static hid_t open_test_file(const char *fileext)
+static hid_t
+open_test_file(const char *fileext)
 {
     char filename[65];
 
@@ -235,261 +253,270 @@ static hid_t open_test_file(const char *fileext)
  * create "data" dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims)
+herr_t
+create_char_dataset(hid_t fid, const char *dsidx, int fulldims)
 {
-    int     rank = 3;
-    int     rankds = 1;
-    hsize_t dims[3]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE};
-    char   buf[DIM1_SIZE*DIM2_SIZE*DIM3_SIZE];
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    hsize_t s3_dim[1]  = {DIM3_SIZE};
-    char    s1_wbuf[DIM1_SIZE] = {1,2,3};
-    char    s11_wbuf[DIM1_SIZE] = {10,20,30};
-    char    s2_wbuf[DIM2_SIZE] = {10,20,30,40};
-    char    s21_wbuf[DIM2_SIZE] = {1,2,3,4};
-    char    s22_wbuf[DIM2_SIZE] = {5,10,50,100};
-    char    s3_wbuf[DIM3_SIZE] = {10,10,10,20,20,20,30,30,30,40,40,40};
-    char    s31_wbuf[DIM3_SIZE] = {1,1,1,2,2,2,3,3,3,4,4,4};
-    char    s32_wbuf[DIM3_SIZE] = {5,5,5,10,10,10,50,50,50,100,100,100};
-    char    s33_wbuf[DIM3_SIZE] = {6,6,6,12,12,12,53,53,53,120,120,120};
+    int     rank    = 3;
+    int     rankds  = 1;
+    hsize_t dims[3] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE};
+    char    buf[DIM1_SIZE * DIM2_SIZE * DIM3_SIZE];
+    hsize_t s1_dim[1]           = {DIM1_SIZE};
+    hsize_t s2_dim[1]           = {DIM2_SIZE};
+    hsize_t s3_dim[1]           = {DIM3_SIZE};
+    char    s1_wbuf[DIM1_SIZE]  = {1, 2, 3};
+    char    s11_wbuf[DIM1_SIZE] = {10, 20, 30};
+    char    s2_wbuf[DIM2_SIZE]  = {10, 20, 30, 40};
+    char    s21_wbuf[DIM2_SIZE] = {1, 2, 3, 4};
+    char    s22_wbuf[DIM2_SIZE] = {5, 10, 50, 100};
+    char    s3_wbuf[DIM3_SIZE]  = {10, 10, 10, 20, 20, 20, 30, 30, 30, 40, 40, 40};
+    char    s31_wbuf[DIM3_SIZE] = {1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4};
+    char    s32_wbuf[DIM3_SIZE] = {5, 5, 5, 10, 10, 10, 50, 50, 50, 100, 100, 100};
+    char    s33_wbuf[DIM3_SIZE] = {6, 6, 6, 12, 12, 12, 53, 53, 53, 120, 120, 120};
     char    name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DATASET_NAME, dsidx);
 
     /* make a dataset */
-    if(H5LTmake_dataset_char(fid, name, rank, dims, buf) >= 0) {
-        if(fulldims==0) {
+    if (H5LTmake_dataset_char(fid, name, rank, dims, buf) >= 0) {
+        if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
-            if(create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-             return FAIL;
+            if (create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the second dimension */
-            if(create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the third dimension */
-            if(create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
+                return FAIL;
         }
         else {
-            if(create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-             return FAIL;
+            if (create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-             return FAIL;
+            if (create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0)
-             return FAIL;
+            if (create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) <
+                0)
+                return FAIL;
         }
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
     return SUCCEED;
 }
 
-herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims)
+herr_t
+create_short_dataset(hid_t fid, const char *dsidx, int fulldims)
 {
-    int     rank = 3;
-    int     rankds = 1;
-    hsize_t dims[3]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE};
-    short   buf[DIM1_SIZE*DIM2_SIZE*DIM3_SIZE];
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    hsize_t s3_dim[1]  = {DIM3_SIZE};
-    short   s1_wbuf[DIM1_SIZE] = {10,20,30};
-    short   s11_wbuf[DIM1_SIZE] = {10,100,300};
-    short   s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    short   s21_wbuf[DIM2_SIZE] = {10,20,30,40};
-    short   s22_wbuf[DIM2_SIZE] = {5,10,50,300};
-    short   s3_wbuf[DIM3_SIZE] = {10,10,10,20,20,20,30,30,30,40,40,40};
-    short   s31_wbuf[DIM3_SIZE] = {1,1,1,2,2,2,3,3,3,4,4,4};
-    short   s32_wbuf[DIM3_SIZE] = {5,5,5,10,10,10,50,50,50,100,100,100};
-    short   s33_wbuf[DIM3_SIZE] = {6,6,6,12,12,12,53,53,53,140,140,140};
+    int     rank    = 3;
+    int     rankds  = 1;
+    hsize_t dims[3] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE};
+    short   buf[DIM1_SIZE * DIM2_SIZE * DIM3_SIZE];
+    hsize_t s1_dim[1]           = {DIM1_SIZE};
+    hsize_t s2_dim[1]           = {DIM2_SIZE};
+    hsize_t s3_dim[1]           = {DIM3_SIZE};
+    short   s1_wbuf[DIM1_SIZE]  = {10, 20, 30};
+    short   s11_wbuf[DIM1_SIZE] = {10, 100, 300};
+    short   s2_wbuf[DIM2_SIZE]  = {100, 200, 300, 400};
+    short   s21_wbuf[DIM2_SIZE] = {10, 20, 30, 40};
+    short   s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
+    short   s3_wbuf[DIM3_SIZE]  = {10, 10, 10, 20, 20, 20, 30, 30, 30, 40, 40, 40};
+    short   s31_wbuf[DIM3_SIZE] = {1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4};
+    short   s32_wbuf[DIM3_SIZE] = {5, 5, 5, 10, 10, 10, 50, 50, 50, 100, 100, 100};
+    short   s33_wbuf[DIM3_SIZE] = {6, 6, 6, 12, 12, 12, 53, 53, 53, 140, 140, 140};
     char    name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DATASET_NAME, dsidx);
 
     /* make a dataset */
-    if(H5LTmake_dataset_short(fid, name, rank, dims, buf) >= 0) {
-        if(fulldims==0) {
+    if (H5LTmake_dataset_short(fid, name, rank, dims, buf) >= 0) {
+        if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
-            if(create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-             return FAIL;
+            if (create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the second dimension */
-            if(create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the third dimension */
-            if(create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
+                return FAIL;
         }
         else {
-            if(create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-             return FAIL;
+            if (create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-             return FAIL;
+            if (create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0)
-             return FAIL;
+            if (create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) <
+                0)
+                return FAIL;
         }
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
     return SUCCEED;
 }
 
-herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims)
+herr_t
+create_int_dataset(hid_t fid, const char *dsidx, int fulldims)
 {
-    int     rank = RANK;
-    int     rankds = 1;
-    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};
-    int     buf[DIM1_SIZE*DIM2_SIZE];
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    int     s1_wbuf[DIM1_SIZE] = {10,20,30};
-    int     s11_wbuf[DIM1_SIZE] = {10,100,300};
-    int     s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    int     s21_wbuf[DIM2_SIZE] = {10,20,30,40};
-    int     s22_wbuf[DIM2_SIZE] = {5,10,50,300};
+    int     rank       = RANK;
+    int     rankds     = 1;
+    hsize_t dims[RANK] = {DIM1_SIZE, DIM2_SIZE};
+    int     buf[DIM1_SIZE * DIM2_SIZE];
+    hsize_t s1_dim[1]           = {DIM1_SIZE};
+    hsize_t s2_dim[1]           = {DIM2_SIZE};
+    int     s1_wbuf[DIM1_SIZE]  = {10, 20, 30};
+    int     s11_wbuf[DIM1_SIZE] = {10, 100, 300};
+    int     s2_wbuf[DIM2_SIZE]  = {100, 200, 300, 400};
+    int     s21_wbuf[DIM2_SIZE] = {10, 20, 30, 40};
+    int     s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
     char    name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DATASET_NAME, dsidx);
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid, name, rank, dims, buf) >= 0) {
-        if(fulldims==0) {
+    if (H5LTmake_dataset_int(fid, name, rank, dims, buf) >= 0) {
+        if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
-            if(create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-             return FAIL;
+            if (create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the second dimension */
-            if(create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
+                return FAIL;
         }
         else {
-            if(create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-             return FAIL;
+            if (create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-             return FAIL;
+            if (create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
+                return FAIL;
         }
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
     return SUCCEED;
 }
 
-herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims)
+herr_t
+create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims)
 {
-    int     rank = 4;
-    int     rankds = 1;
-    hsize_t dims[4]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE,DIM4_SIZE};
-    long    *buf;
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    hsize_t s3_dim[1]  = {DIM3_SIZE};
-    hsize_t s4_dim[1]  = {DIM4_SIZE};
-    long    s1_wbuf[DIM1_SIZE] = {10,20,30};
-    long    s11_wbuf[DIM1_SIZE] = {10,100,300};
-    long    s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    long    s21_wbuf[DIM2_SIZE] = {10,20,30,40};
-    long    s22_wbuf[DIM2_SIZE] = {5,10,50,300};
-    long    s3_wbuf[DIM3_SIZE] = {10,10,10,20,20,20,30,30,30,40,40,40};
-    long    s31_wbuf[DIM3_SIZE] = {1,1,1,2,2,2,3,3,3,4,4,4};
-    long    s32_wbuf[DIM3_SIZE] = {5,5,5,10,10,10,50,50,50,100,100,100};
-    long    s33_wbuf[DIM3_SIZE] = {6,6,6,12,12,12,53,53,53,140,140,140};
-    long    s4_wbuf[DIM4_SIZE] = {18,18};
-    long    s41_wbuf[DIM4_SIZE] = {8,8};
-    long    s42_wbuf[DIM4_SIZE] = {80,80};
-    long    s43_wbuf[DIM4_SIZE] = {180,180};
-    long    s44_wbuf[DIM4_SIZE] = {280,280};
+    int     rank    = 4;
+    int     rankds  = 1;
+    hsize_t dims[4] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE, DIM4_SIZE};
+    long *  buf;
+    hsize_t s1_dim[1]           = {DIM1_SIZE};
+    hsize_t s2_dim[1]           = {DIM2_SIZE};
+    hsize_t s3_dim[1]           = {DIM3_SIZE};
+    hsize_t s4_dim[1]           = {DIM4_SIZE};
+    long    s1_wbuf[DIM1_SIZE]  = {10, 20, 30};
+    long    s11_wbuf[DIM1_SIZE] = {10, 100, 300};
+    long    s2_wbuf[DIM2_SIZE]  = {100, 200, 300, 400};
+    long    s21_wbuf[DIM2_SIZE] = {10, 20, 30, 40};
+    long    s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
+    long    s3_wbuf[DIM3_SIZE]  = {10, 10, 10, 20, 20, 20, 30, 30, 30, 40, 40, 40};
+    long    s31_wbuf[DIM3_SIZE] = {1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4};
+    long    s32_wbuf[DIM3_SIZE] = {5, 5, 5, 10, 10, 10, 50, 50, 50, 100, 100, 100};
+    long    s33_wbuf[DIM3_SIZE] = {6, 6, 6, 12, 12, 12, 53, 53, 53, 140, 140, 140};
+    long    s4_wbuf[DIM4_SIZE]  = {18, 18};
+    long    s41_wbuf[DIM4_SIZE] = {8, 8};
+    long    s42_wbuf[DIM4_SIZE] = {80, 80};
+    long    s43_wbuf[DIM4_SIZE] = {180, 180};
+    long    s44_wbuf[DIM4_SIZE] = {280, 280};
 
     /* Allocate buffer */
-    if(NULL == (buf = (long *)HDmalloc(sizeof(long) * DIM1_SIZE * DIM2_SIZE * DIM3_SIZE * DIM4_SIZE)))
-         return FAIL;
+    if (NULL == (buf = (long *)HDmalloc(sizeof(long) * DIM1_SIZE * DIM2_SIZE * DIM3_SIZE * DIM4_SIZE)))
+        return FAIL;
 
     /* make a dataset */
-    if(H5LTmake_dataset_long(fid, dsname, rank, dims, buf) >= 0) {
-        if(fulldims==0) {
+    if (H5LTmake_dataset_long(fid, dsname, rank, dims, buf) >= 0) {
+        if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
-            if(create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-             return FAIL;
+            if (create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the second dimension */
-            if(create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the third dimension */
-            if(create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the fourth dimension */
-            if(create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, NULL, NULL, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, NULL, NULL, NULL, NULL) < 0)
+                return FAIL;
         }
         else {
-            if(create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-             return FAIL;
+            if (create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-             return FAIL;
+            if (create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0)
-             return FAIL;
+            if (create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) <
+                0)
+                return FAIL;
 
-            if(create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, s41_wbuf, s42_wbuf, s43_wbuf, s44_wbuf) < 0)
-             return FAIL;
+            if (create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, s41_wbuf, s42_wbuf, s43_wbuf,
+                                         s44_wbuf) < 0)
+                return FAIL;
         }
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
 
     HDfree(buf);
 
     return SUCCEED;
 }
 
-herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims)
+herr_t
+create_float_dataset(hid_t fid, const char *dsidx, int fulldims)
 {
-    int     rank = RANK;
-    int     rankds = 1;
-    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};
-    float   buf[DIM1_SIZE*DIM2_SIZE];
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    float   s1_wbuf[DIM1_SIZE] = {10,20,30};
-    float   s11_wbuf[DIM1_SIZE] = {10,100,300};
-    float   s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    float   s21_wbuf[DIM2_SIZE] = {10,20,30,40};
-    float   s22_wbuf[DIM2_SIZE] = {5,10,50,300};
+    int     rank       = RANK;
+    int     rankds     = 1;
+    hsize_t dims[RANK] = {DIM1_SIZE, DIM2_SIZE};
+    float   buf[DIM1_SIZE * DIM2_SIZE];
+    hsize_t s1_dim[1]           = {DIM1_SIZE};
+    hsize_t s2_dim[1]           = {DIM2_SIZE};
+    float   s1_wbuf[DIM1_SIZE]  = {10, 20, 30};
+    float   s11_wbuf[DIM1_SIZE] = {10, 100, 300};
+    float   s2_wbuf[DIM2_SIZE]  = {100, 200, 300, 400};
+    float   s21_wbuf[DIM2_SIZE] = {10, 20, 30, 40};
+    float   s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
     char    name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DATASET_NAME, dsidx);
 
     /* make a dataset */
-    if(H5LTmake_dataset_float(fid, name, rank, dims, buf) >= 0) {
-        if(fulldims==0) {
+    if (H5LTmake_dataset_float(fid, name, rank, dims, buf) >= 0) {
+        if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
-            if(create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-             return FAIL;
+            if (create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
+                return FAIL;
 
             /* make a DS dataset for the second dimension */
-            if(create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-             return FAIL;
+            if (create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
+                return FAIL;
         }
         else {
-            if(create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-             return FAIL;
+            if (create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
+                return FAIL;
 
-            if(create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-             return FAIL;
+            if (create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
+                return FAIL;
         }
-     }
-     else
-         return FAIL;
+    }
+    else
+        return FAIL;
     return SUCCEED;
 }
 
@@ -497,21 +524,23 @@ herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims)
  * create 2 dimension scales datasets for first dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf)
+herr_t
+create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                         char *s1_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_11_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
@@ -522,29 +551,31 @@ herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 3 dimension scales datasets for second dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf)
+herr_t
+create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                         char *s1_wbuf, char *s2_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, dsidx);
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_21_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_22_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
@@ -555,37 +586,39 @@ herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 1 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf, char *s3_wbuf)
+herr_t
+create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf,
+                         char *s1_wbuf, char *s2_wbuf, char *s3_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_31_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_32_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_33_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_char(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_char(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
@@ -596,21 +629,23 @@ herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 2 dimension scales datasets for first dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf)
+herr_t
+create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                          short *s1_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_11_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
@@ -621,29 +656,31 @@ herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize
  * create 3 dimension scales datasets for second dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf)
+herr_t
+create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                          short *s1_wbuf, short *s2_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, dsidx);
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_21_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_22_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
@@ -654,37 +691,39 @@ herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize
  * create 1 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf, short *s3_wbuf)
+herr_t
+create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf,
+                          short *s1_wbuf, short *s2_wbuf, short *s3_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_31_NAME, dsidx);
 
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_32_NAME, dsidx);
 
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_33_NAME, dsidx);
 
         /* make a DS dataset for the first dimension */
-        if(H5LTmake_dataset_short(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_short(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
@@ -695,21 +734,22 @@ herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize
  * create 2 dimension scales datasets for first dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf)
+herr_t
+create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_11_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
@@ -720,29 +760,31 @@ herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t
  * create 3 dimension scales datasets for second dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf)
+herr_t
+create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf,
+                        int *s2_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, dsidx);
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_21_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_22_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
@@ -753,37 +795,39 @@ herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t
  * create 1 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf, int *s3_wbuf)
+herr_t
+create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf,
+                        int *s2_wbuf, int *s3_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_31_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_32_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_33_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_int(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_int(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
@@ -794,21 +838,23 @@ herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t
  * create 2 dimension scales datasets for first dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf)
+herr_t
+create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                         long *s1_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_11_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
@@ -819,29 +865,31 @@ herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 3 dimension scales datasets for second dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf)
+herr_t
+create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                         long *s1_wbuf, long *s2_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, dsidx);
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_21_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_22_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
@@ -852,37 +900,39 @@ herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 3 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf)
+herr_t
+create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                         long *s1_wbuf, long *s2_wbuf, long *s3_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_31_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_32_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_33_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
@@ -893,45 +943,47 @@ herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 4 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf)
+herr_t
+create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf,
+                         long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_4_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_41_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_42_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_43_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
-    if(s4_wbuf != NULL) {
+    if (s4_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_44_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_long(fid, name, rankds, s_dim, s4_wbuf) < 0)
+        if (H5LTmake_dataset_long(fid, name, rankds, s_dim, s4_wbuf) < 0)
             return FAIL;
     }
 
@@ -942,21 +994,23 @@ herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_
  * create 2 dimension scales datasets for first dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf)
+herr_t
+create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                          float *s1_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_11_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the first dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
@@ -967,29 +1021,31 @@ herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize
  * create 3 dimension scales datasets for second dimension
  *-------------------------------------------------------------------------
  */
-herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf)
+herr_t
+create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                          float *s1_wbuf, float *s2_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, dsidx);
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_21_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_22_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
@@ -1000,144 +1056,151 @@ herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize
  * create 3 dimension scales datasets for third dimension of dataset
  *-------------------------------------------------------------------------
  */
-herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf, float *s3_wbuf)
+herr_t
+create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf,
+                          float *s1_wbuf, float *s2_wbuf, float *s3_wbuf)
 {
     char name[64];
 
     HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, dsidx);
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
+    if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s_wbuf) < 0)
         return FAIL;
 
-    if(s1_wbuf != NULL) {
+    if (s1_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_31_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s1_wbuf) < 0)
             return FAIL;
     }
 
-    if(s2_wbuf != NULL) {
+    if (s2_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_32_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s2_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s2_wbuf) < 0)
             return FAIL;
     }
 
-    if(s3_wbuf != NULL) {
+    if (s3_wbuf != NULL) {
         HDsnprintf(name, sizeof(name), "%s%s", DS_33_NAME, dsidx);
 
         /* make a DS dataset with an alternate scale for the second dimension  */
-        if(H5LTmake_dataset_float(fid, name, rankds, s_dim, s3_wbuf) < 0)
+        if (H5LTmake_dataset_float(fid, name, rankds, s_dim, s3_wbuf) < 0)
             return FAIL;
     }
 
     return SUCCEED;
 }
 
-herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
+herr_t
+test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 0) {
-            if(H5DSattach_scale(did, dsid, idx) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) > 0) {
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 0) {
+            if (H5DSattach_scale(did, dsid, idx) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) > 0) {
                     ret_value = SUCCEED;
                 }
-                else if(H5DSis_attached(did, dsid, idx) == 0) {
+                else if (H5DSis_attached(did, dsid, idx) == 0) {
                     HDprintf(" scale not attached ");
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
+herr_t
+test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if(H5DSdetach_scale(did, dsid, idx) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) == 0) {
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if (H5DSdetach_scale(did, dsid, idx) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) == 0) {
                     ret_value = SUCCEED;
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
+herr_t
+test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    herr_t ret_value = FAIL;
+    hid_t  dsid      = -1;
 
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if(H5DSset_scale(dsid, scalename) >= 0) {
-                if(H5DSis_attached(did, dsid, idx) == 1) {
-                     ret_value = SUCCEED;
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if (H5DSset_scale(dsid, scalename) >= 0) {
+                if (H5DSis_attached(did, dsid, idx) == 1) {
+                    ret_value = SUCCEED;
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
+herr_t
+test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx)
 {
     herr_t  ret_value = FAIL;
-    hid_t   dsid = -1;
+    hid_t   dsid      = -1;
     ssize_t name_len;
-    char    *name_out=NULL;
-
-    if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
-        if(H5DSis_attached(did, dsid, idx) == 1) {
-            if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) {
-                name_out = (char*)HDmalloc(((size_t)name_len+1) * sizeof (char));
-                if(name_out != NULL) {
-                    if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) >= 0) {
-                        if(HDstrncmp(scalename, name_out, (size_t)name_len)==0) {
+    char *  name_out = NULL;
+
+    if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
+        if (H5DSis_attached(did, dsid, idx) == 1) {
+            if ((name_len = H5DSget_scale_name(dsid, NULL, (size_t)0)) > 0) {
+                name_out = (char *)HDmalloc(((size_t)name_len + 1) * sizeof(char));
+                if (name_out != NULL) {
+                    if (H5DSget_scale_name(dsid, name_out, (size_t)name_len + 1) >= 0) {
+                        if (HDstrncmp(scalename, name_out, (size_t)name_len) == 0) {
                             ret_value = SUCCEED;
                         }
                         HDfree(name_out);
-                        name_out=NULL;
+                        name_out = NULL;
                     }
                 }
             }
         }
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             ret_value = FAIL;
     }
 
     return ret_value;
 }
 
-static int test_detachscales(void)
+static int
+test_detachscales(void)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    hid_t   dsid = -1;
-    int     rank1 = 1;
-    int     rank3 = 3;
-    hsize_t dims[] = {1,2,3}; /*some bogus numbers, not important for the test*/
-    int     *buf = NULL;
+    hid_t   fid    = -1;
+    hid_t   did    = -1;
+    hid_t   dsid   = -1;
+    int     rank1  = 1;
+    int     rank3  = 3;
+    hsize_t dims[] = {1, 2, 3}; /*some bogus numbers, not important for the test*/
+    int *   buf    = NULL;
     char    dname[16];
     int     i;
 
@@ -1148,52 +1211,52 @@ static int test_detachscales(void)
 
     HL_TESTING2("test_detachscales");
 
-    if((fid = H5Fcreate("test_detach.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate("test_detach.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* make datasets; they are three dimensional*/
-    for (i=0; i < 2; i++) {
-        HDsprintf(dname,"D%d", i);
-        if(H5LTmake_dataset_int(fid, dname, rank3, dims, buf) < 0)
+    for (i = 0; i < 2; i++) {
+        HDsprintf(dname, "D%d", i);
+        if (H5LTmake_dataset_int(fid, dname, rank3, dims, buf) < 0)
             goto out;
     }
     /* create datasets and make them dim. scales */
 
-    for (i=0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
         HDsprintf(dname, "DS%d", i);
-        if(H5LTmake_dataset_int(fid, dname, rank1, dims, buf) < 0)
+        if (H5LTmake_dataset_int(fid, dname, rank1, dims, buf) < 0)
             goto out;
     }
     /* attach scales to the first dataset; first dimension will have
        two scales attached  */
-    if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
-        for (i=0; i<4; i++) {
-           HDsprintf(dname, "DS%d", i);
-           if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-               goto out;
-           if(H5DSattach_scale(did, dsid, (unsigned int) i%3) < 0)
-               goto out;
-           if(H5Dclose(dsid) < 0)
-               goto out;
+    if ((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
+        for (i = 0; i < 4; i++) {
+            HDsprintf(dname, "DS%d", i);
+            if ((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+                goto out;
+            if (H5DSattach_scale(did, dsid, (unsigned int)i % 3) < 0)
+                goto out;
+            if (H5Dclose(dsid) < 0)
+                goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
         goto out;
 
-   /* attach scales to the second dataset */
-    if((did = H5Dopen2(fid, "D1", H5P_DEFAULT)) >= 0) {
-        for (i=0; i<3; i++) {
-           HDsprintf(dname, "DS%d", i);
-           if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-               goto out;
-           if(H5DSattach_scale(did, dsid, (unsigned int) i) < 0)
-               goto out;
-           if(H5Dclose(dsid) < 0)
-               goto out;
+    /* attach scales to the second dataset */
+    if ((did = H5Dopen2(fid, "D1", H5P_DEFAULT)) >= 0) {
+        for (i = 0; i < 3; i++) {
+            HDsprintf(dname, "DS%d", i);
+            if ((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+                goto out;
+            if (H5DSattach_scale(did, dsid, (unsigned int)i) < 0)
+                goto out;
+            if (H5Dclose(dsid) < 0)
+                goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1202,107 +1265,109 @@ static int test_detachscales(void)
     /* detach DS0 from first dimension of D0 and D1; then check
        that DS0 doesn't have attribute REFERENCE _LIST */
 
-    if((dsid = H5Dopen2(fid, "DS0", H5P_DEFAULT)) < 0)
-               goto out;
+    if ((dsid = H5Dopen2(fid, "DS0", H5P_DEFAULT)) < 0)
+        goto out;
 
-    for (i=0; i<2; i++) {
+    for (i = 0; i < 2; i++) {
         HDsprintf(dname, "D%d", i);
-        if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+        if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
             goto out;
-        if(H5DSdetach_scale(did, dsid, (unsigned int)0) < 0)
+        if (H5DSdetach_scale(did, dsid, (unsigned int)0) < 0)
             goto out;
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     /* Check that attribute "REFERENCE_LIST" doesn't exist anymore */
-    if(H5Aexists(dsid, REFERENCE_LIST)!= 0)
+    if (H5Aexists(dsid, REFERENCE_LIST) != 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* Check that DS3 is the only dim. scale attached to the first
        dimension of D0 */
-    if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid, "DS3", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "DS3", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSis_attached(did, dsid, (unsigned int) 0) <= 0)
+    if (H5DSis_attached(did, dsid, (unsigned int)0) <= 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* Detach the rest of the scales DS3, DS1, DS2 from D0 and make
        sure that attribute "DIMENSION_LIST" doesn't exist anymore */
-    if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
-        for (i=1; i<4; i++) {
-           HDsprintf(dname, "DS%d", i);
-           if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-               goto out;
-           if(H5DSdetach_scale(did, dsid, (unsigned int) i%3) < 0)
-               goto out;
-           if(H5Dclose(dsid) < 0)
-               goto out;
+    if ((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
+        for (i = 1; i < 4; i++) {
+            HDsprintf(dname, "DS%d", i);
+            if ((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+                goto out;
+            if (H5DSdetach_scale(did, dsid, (unsigned int)i % 3) < 0)
+                goto out;
+            if (H5Dclose(dsid) < 0)
+                goto out;
         }
         /* Check that attribute "DIMENSION_LIST" doesn't exist anymore */
-        if(H5Aexists(did, DIMENSION_LIST)!= 0)
+        if (H5Aexists(did, DIMENSION_LIST) != 0)
             goto out;
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
         goto out;
 
-
     PASSED();
 
     H5Fclose(fid);
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Dclose(dsid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_char_attachscales(const char *fileext)
+static int
+test_char_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "ac");
 
     HL_TESTING2("test_char_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_char_dataset(fid, "ac", 0) < 0)
+    if (create_char_dataset(fid, "ac", 0) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "ac");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "ac");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "ac");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1314,72 +1379,75 @@ static int test_char_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_short_attachscales(const char *fileext)
+static int
+test_short_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "as");
 
     HL_TESTING2("test_short_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_short_dataset(fid, "as", 1) < 0)
+    if (create_short_dataset(fid, "as", 1) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_31_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_32_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_33_NAME, "as");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1391,56 +1459,59 @@ static int test_short_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_int_attachscales(const char *fileext)
+static int
+test_int_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "a");
 
     HL_TESTING2("test_int_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_int_dataset(fid, "a", 1) < 0)
+    if (create_int_dataset(fid, "a", 1) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "a");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "a");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "a");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "a");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "a");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1452,52 +1523,55 @@ static int test_int_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_long_attachscales(const char *fileext)
+static int
+test_long_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al");
 
     HL_TESTING2("test_long_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_long_dataset(fid, dsname, "al", 0) < 0)
+    if (create_long_dataset(fid, dsname, "al", 0) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_4_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM3) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1509,52 +1583,55 @@ static int test_long_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_duplicatelong_attachscales(const char *fileext)
+static int
+test_duplicatelong_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al2");
 
     HL_TESTING2("test_duplicatelong_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset 2 */
-    if(create_long_dataset(fid, dsname, "al2", 0) < 0)
+    if (create_long_dataset(fid, dsname, "al2", 0) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM2) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_4_NAME, "al");
-        if(test_attach_scale(fid, did, scalename, DIM3) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1566,56 +1643,59 @@ static int test_duplicatelong_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_float_attachscales(const char *fileext)
+static int
+test_float_attachscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "af");
 
     HL_TESTING2("test_float_attachscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     /* make a dataset */
-    if(create_float_dataset(fid, "af", 1) < 0)
+    if (create_float_dataset(fid, "af", 1) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "af");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "af");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "af");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "af");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "af");
-        if(test_attach_scale(fid, did, scalename, DIM1) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM1) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1627,45 +1707,48 @@ static int test_float_attachscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_numberofscales(const char *fileext)
+static int
+test_numberofscales(const char *fileext)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    int     nscales;                                          /* number of scales in DIM */
-    char dsname[32];
-    char scalename[32];
+    hid_t fid = -1;
+    hid_t did = -1;
+    int   nscales; /* number of scales in DIM */
+    char  dsname[32];
+    char  scalename[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "a");
 
     HL_TESTING2("test_numberofscales");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
-        if((nscales = H5DSget_num_scales(did, 0)) < 0)
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+        if ((nscales = H5DSget_num_scales(did, 0)) < 0)
             goto out;
 
-        if(nscales != 2)
+        if (nscales != 2)
             goto out;
 
-        if((nscales = H5DSget_num_scales(did, 1)) < 0)
+        if ((nscales = H5DSget_num_scales(did, 1)) < 0)
             goto out;
 
-        if(nscales != 3)
+        if (nscales != 3)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1674,28 +1757,28 @@ static int test_numberofscales(const char *fileext)
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "b");
 
     /* make a dataset */
-    if(create_int_dataset(fid, "b", 1) < 0)
+    if (create_int_dataset(fid, "b", 1) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "b");
-        if(test_attach_scale(fid, did, scalename, DIM0) < 0)
+        if (test_attach_scale(fid, did, scalename, DIM0) < 0)
             goto out;
 
-        if((nscales = H5DSget_num_scales(did, 0)) < 0)
+        if ((nscales = H5DSget_num_scales(did, 0)) < 0)
             goto out;
 
-        if(nscales != 1)
+        if (nscales != 1)
             goto out;
 
-        if((nscales = H5DSget_num_scales(did, 1)) < 0)
+        if ((nscales = H5DSget_num_scales(did, 1)) < 0)
             goto out;
 
-        if(nscales != 0)
+        if (nscales != 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1707,55 +1790,59 @@ static int test_numberofscales(const char *fileext)
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_char_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_char_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "ac");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set char scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "ac");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "ac");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "ac");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_2_NAME, "ac");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "ac");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_3_NAME, "ac");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1767,103 +1854,107 @@ static int test_char_scalenames(const char *fileext) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_short_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_short_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "as");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set short scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_11_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_2_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_21_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_22_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_3_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_31_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_31_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_32_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_32_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_33_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_33_NAME, "as");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1875,71 +1966,75 @@ static int test_short_scalenames(const char *fileext) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_int_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_int_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "a");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set int scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "a");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_11_NAME, "a");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_2_NAME, "a");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_21_NAME, "a");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_22_NAME, "a");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -1951,63 +2046,67 @@ static int test_int_scalenames(const char *fileext) {
     return 0;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_long_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_long_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set long scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_2_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_3_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_4_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_4_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -2019,63 +2118,67 @@ static int test_long_scalenames(const char *fileext) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_samelong_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_samelong_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al2");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set same long scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", DS_2_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_3_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", DS_3_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM2) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_4_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", DS_4_NAME, "al");
-        if(test_set_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM3) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -2087,71 +2190,75 @@ static int test_samelong_scalenames(const char *fileext) {
     return SUCCEED;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_float_scalenames(const char *fileext) {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    char    dsname[32];
-    char    scalename[32];
-    char    name[32];
+static int
+test_float_scalenames(const char *fileext)
+{
+    hid_t fid = -1;
+    hid_t did = -1;
+    char  dsname[32];
+    char  scalename[32];
+    char  name[32];
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "af");
 
-    if((fid = open_test_file(fileext)) < 0)
+    if ((fid = open_test_file(fileext)) < 0)
         goto out;
 
     HL_TESTING2("set float scale/cmp scale name");
-    if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
+    if ((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "af");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_11_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_11_NAME, "af");
-        if(test_set_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM0) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_2_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_2_NAME, "af");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_21_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_21_NAME, "af");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_22_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_22_NAME, "af");
-        if(test_set_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_set_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
+        if (test_cmp_scalename(fid, did, scalename, name, DIM1) < 0)
             goto out;
 
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
@@ -2163,44 +2270,47 @@ static int test_float_scalenames(const char *fileext) {
     return 0;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_foreign_scaleattached(const char *fileforeign)
+static int
+test_foreign_scaleattached(const char *fileforeign)
 {
-    herr_t  ret_value = FAIL;
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    hid_t   dsid = -1;
-    const char *filename = H5_get_srcdir_filename(fileforeign);
+    herr_t      ret_value = FAIL;
+    hid_t       fid       = -1;
+    hid_t       did       = -1;
+    hid_t       dsid      = -1;
+    const char *filename  = H5_get_srcdir_filename(fileforeign);
 
     HL_TESTING2("test_foreign_scaleattached");
 
-    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         goto out;
 
-    if((did = H5Dopen2(fid, "/dset_al", H5P_DEFAULT)) >= 0) {
-        if((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) {
-            if(H5DSis_attached(did, dsid, 3) == 1) {
+    if ((did = H5Dopen2(fid, "/dset_al", H5P_DEFAULT)) >= 0) {
+        if ((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) {
+            if (H5DSis_attached(did, dsid, 3) == 1) {
                 ret_value = SUCCEED;
             }
-            if(H5Dclose(dsid) < 0)
+            if (H5Dclose(dsid) < 0)
                 goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
     else
         goto out;
 
-    if(ret_value == FAIL)
+    if (ret_value == FAIL)
         goto out;
 
     PASSED();
@@ -2209,1225 +2319,1206 @@ static int test_foreign_scaleattached(const char *fileforeign)
     return 0;
 
 out:
-    H5E_BEGIN_TRY  {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
 
     return FAIL;
 }
 
-static int test_simple(void)
+static int
+test_simple(void)
 {
-    hid_t   fid = -1;
-    hid_t   did = -1;
-    hid_t   dsid = -1;
-    hid_t   sid = -1;
-    hid_t   gid = -1;
-    int     rank = RANK;
-    int     rankds = 1;
-    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};
-    int     buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};
-    hsize_t s1_dim[1]  = {DIM1_SIZE};
-    hsize_t s2_dim[1]  = {DIM2_SIZE};
-    char sname[30];
-    char dname[30];
-    int     s1_wbuf[DIM1_SIZE] = {10,20,30};
-    int     s11_wbuf[DIM1_SIZE] = {10,100,300};
-    int     s2_wbuf[DIM2_SIZE] = {100,200,300,400};
-    int     s21_wbuf[DIM2_SIZE] = {10,20,30,40};
-    int     s22_wbuf[DIM2_SIZE] = {5,10,50,300};
-    char dim0_label[16];
-    char dim1_label[16];
-    char *dim0_labeld;
-    char *dim1_labeld;
-    char dim0_labels[3];
-    char dim1_labels[3];
-    ssize_t dim0_label_size;
-    ssize_t dim1_label_size;
+    hid_t        fid           = -1;
+    hid_t        did           = -1;
+    hid_t        dsid          = -1;
+    hid_t        sid           = -1;
+    hid_t        gid           = -1;
+    int          rank          = RANK;
+    int          rankds        = 1;
+    hsize_t      dims[RANK]    = {DIM1_SIZE, DIM2_SIZE};
+    int          buf[DIM_DATA] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+    hsize_t      s1_dim[1]     = {DIM1_SIZE};
+    hsize_t      s2_dim[1]     = {DIM2_SIZE};
+    char         sname[30];
+    char         dname[30];
+    int          s1_wbuf[DIM1_SIZE]  = {10, 20, 30};
+    int          s11_wbuf[DIM1_SIZE] = {10, 100, 300};
+    int          s2_wbuf[DIM2_SIZE]  = {100, 200, 300, 400};
+    int          s21_wbuf[DIM2_SIZE] = {10, 20, 30, 40};
+    int          s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
+    char         dim0_label[16];
+    char         dim1_label[16];
+    char *       dim0_labeld;
+    char *       dim1_labeld;
+    char         dim0_labels[3];
+    char         dim1_labels[3];
+    ssize_t      dim0_label_size;
+    ssize_t      dim1_label_size;
     unsigned int dim;
-    int scale_idx;
-    int nscales;
-    ssize_t name_len;
-    char    *name_out=NULL;
-    char snames[3];
-    int i, j;
+    int          scale_idx;
+    int          nscales;
+    ssize_t      name_len;
+    char *       name_out = NULL;
+    char         snames[3];
+    int          i, j;
 
     HDprintf("Testing API functions\n");
 
     /*-------------------------------------------------------------------------
-    * create a file for the test
-    *-------------------------------------------------------------------------
-    */
+     * create a file for the test
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    if((fid=H5Fcreate(FILE1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create datasets: 1 "data" dataset and 4 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: 1 "data" dataset and 4 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_a", rank, dims, buf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_int(fid,"ds_a_1",rankds,s1_dim,s1_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_1", rankds, s1_dim, s1_wbuf) < 0)
         goto out;
 
     /* make a DS dataset with an alternate scale for the 2nd dimension  */
-    if(H5LTmake_dataset_int(fid,"ds_a_11",rankds,s1_dim,s11_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_11", rankds, s1_dim, s11_wbuf) < 0)
         goto out;
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_int(fid,"ds_a_2",rankds,s2_dim,s2_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_2", rankds, s2_dim, s2_wbuf) < 0)
         goto out;
 
     /* make a DS dataset with an alternate scale for the 2nd dimension  */
-    if(H5LTmake_dataset_int(fid,"ds_a_21",rankds,s2_dim,s21_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_21", rankds, s2_dim, s21_wbuf) < 0)
         goto out;
 
     /* make a DS dataset with an alternate scale for the 2nd dimension  */
-    if(H5LTmake_dataset_int(fid,"ds_a_22",rankds,s2_dim,s22_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_22", rankds, s2_dim, s22_wbuf) < 0)
         goto out;
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the DS_1_NAME dimension scale to "dset_a"
-    *-------------------------------------------------------------------------
-    */
+     * attach the DS_1_NAME dimension scale to "dset_a"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_a_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_1", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the DS_11_NAME dimension scale to "dset_a"
-    *-------------------------------------------------------------------------
-    */
+     * attach the DS_11_NAME dimension scale to "dset_a"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_a_11", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_11", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach the DS_11_NAME dimension scale to "dset_a" at dimension 0 */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach the DS_2_NAME dimension scale to "dset_a"
-    *-------------------------------------------------------------------------
-    */
+     * attach the DS_2_NAME dimension scale to "dset_a"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_a_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_2", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach the "ds2" dimension scale to "dset_a" as the 2nd dimension  */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    *  attach the DS_21_NAME dimension scale to "dset_a"
-    *-------------------------------------------------------------------------
-    */
+     *  attach the DS_21_NAME dimension scale to "dset_a"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_a_21", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_21", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach the DS_21_NAME dimension scale to "dset_a" as the 2nd dimension  */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    *  attach the DS_22_NAME dimension scale to "dset_a"
-    *-------------------------------------------------------------------------
-    */
+     *  attach the DS_22_NAME dimension scale to "dset_a"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_a_22", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_22", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach the "ds22" dimension scale to "dset_a" as the 2nd dimension  */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_a" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create datasets: 1 "data" dataset and 1 dimension scale
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: 1 "data" dataset and 1 dimension scale
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_b", rank, dims, buf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_int(fid,"ds_b_1",rankds,s1_dim,s1_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_b_1", rankds, s1_dim, s1_wbuf) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    *  attach the scale to "dset_b"
-    *-------------------------------------------------------------------------
-    */
+     *  attach the scale to "dset_b"
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_b", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did,dsid,0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_b" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
-
-
     /*-------------------------------------------------------------------------
-    * H5DSdetach_scale
-    *-------------------------------------------------------------------------
-    */
+     * H5DSdetach_scale
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("detach scales ");
 
-
     /*-------------------------------------------------------------------------
-    * create datasets: one "data" dataset and 4 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: one "data" dataset and 4 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid, "dset_c", rank, dims, buf) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_c", rank, dims, buf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_int(fid, "ds_c_1", rankds, s1_dim, s1_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_c_1", rankds, s1_dim, s1_wbuf) < 0)
         goto out;
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_int(fid, "ds_c_2", rankds, s2_dim, s2_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_c_2", rankds, s2_dim, s2_wbuf) < 0)
         goto out;
 
     /* make a DS dataset with an alternate scale for the 2nd dimension  */
-    if(H5LTmake_dataset_int(fid, "ds_c_21", rankds, s2_dim, s2_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_c_21", rankds, s2_dim, s2_wbuf) < 0)
         goto out;
 
     /* make a DS dataset with an alternate scale for the 2nd dimension  */
-    if(H5LTmake_dataset_int(fid, "ds_c_22", rankds, s2_dim, s2_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_c_22", rankds, s2_dim, s2_wbuf) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    *  attach the scales to "dset_c"
-    *-------------------------------------------------------------------------
-    */
+     *  attach the scales to "dset_c"
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_c_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_2", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 1) < 0)
+    if (H5DSattach_scale(did, dsid, 1) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_21", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 1) < 0)
+    if (H5DSattach_scale(did, dsid, 1) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_22", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 1) < 0)
+    if (H5DSattach_scale(did, dsid, 1) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * verify if "dset_c" has dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * verify if "dset_c" has dimension scales
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
     /* verify that "dset_c" has 1 dimension scale at DIM 0   */
-    if((nscales = H5DSget_num_scales(did, 0)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 0)) < 0)
         goto out;
 
-    if(nscales != 1)
+    if (nscales != 1)
         goto out;
     /* verify that "dset_c" has 3 dimension scales at DIM 1   */
-    if((nscales = H5DSget_num_scales(did, 1)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 1)) < 0)
         goto out;
 
-    if(nscales != 3)
+    if (nscales != 3)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * detach the "ds_c_21" dimension scale to "dset_c"
-    *-------------------------------------------------------------------------
-    */
+     * detach the "ds_c_21" dimension scale to "dset_c"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_c" */
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_21", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach the "ds_c_21" dimension scale to "dset_c" in DIM 1  */
-    if(H5DSdetach_scale(did, dsid, 1) < 0)
+    if (H5DSdetach_scale(did, dsid, 1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_c" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * "dset_c" must have now 2 dimension scales at DIM 1
-    *-------------------------------------------------------------------------
-    */
+     * "dset_c" must have now 2 dimension scales at DIM 1
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
     /* verify that "dset_c" has 2 dimension scales at DIM 1  */
-    if((nscales = H5DSget_num_scales(did, 1)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 1)) < 0)
         goto out;
 
-    if(nscales != 2)
+    if (nscales != 2)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * detach the "ds_c_22" dimension scale to "dset_c"
-    *-------------------------------------------------------------------------
-    */
+     * detach the "ds_c_22" dimension scale to "dset_c"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_c" */
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_22", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach the "ds_c_22" dimension scale to "dset_c" in DIM 1  */
-    if(H5DSdetach_scale(did, dsid, 1) < 0)
+    if (H5DSdetach_scale(did, dsid, 1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_c" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * "dset_c" must have now 1 dimension scale at DIM 1
-    *-------------------------------------------------------------------------
-    */
+     * "dset_c" must have now 1 dimension scale at DIM 1
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
     /* verify that "dset_c" has 1 dimension scale at DIM 1  */
-    if((nscales = H5DSget_num_scales(did, 1)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 1)) < 0)
         goto out;
 
-    if(nscales != 1)
+    if (nscales != 1)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * detach the "ds_c_2" dimension scale to "dset_c"
-    *-------------------------------------------------------------------------
-    */
+     * detach the "ds_c_2" dimension scale to "dset_c"
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_c" */
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_c_2", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach the "ds_c_2" dimension scale to "dset_c" in DIM 1  */
-    if(H5DSdetach_scale(did, dsid, 1) < 0)
+    if (H5DSdetach_scale(did, dsid, 1) < 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_c" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * "dset_c" must have now 0 dimension scales at DIM 1
-    *-------------------------------------------------------------------------
-    */
+     * "dset_c" must have now 0 dimension scales at DIM 1
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_c", H5P_DEFAULT)) < 0)
         goto out;
     /* verify that "dset_c" has 1 dimension scale at DIM 1  */
-    if((nscales = H5DSget_num_scales(did, 1)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 1)) < 0)
         goto out;
 
-    if(nscales != 0)
+    if (nscales != 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * create 3 datasets: 1 "data" dataset and 2 dimension scales
-    *-------------------------------------------------------------------------
-    */
-    if(H5LTmake_dataset_int(fid,"dset_d",rank,dims,NULL) < 0)
+     * create 3 datasets: 1 "data" dataset and 2 dimension scales
+     *-------------------------------------------------------------------------
+     */
+    if (H5LTmake_dataset_int(fid, "dset_d", rank, dims, NULL) < 0)
         goto out;
-    if(H5LTmake_dataset_int(fid,"ds_d_1",rankds,s1_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_d_1", rankds, s1_dim, NULL) < 0)
         goto out;
-    if(H5LTmake_dataset_int(fid,"ds_d_2",rankds,s2_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_d_2", rankds, s2_dim, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach them
-    *-------------------------------------------------------------------------
-    */
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+     * attach them
+     *-------------------------------------------------------------------------
+     */
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_2", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 1) < 0)
+    if (H5DSattach_scale(did, dsid, 1) < 0)
         goto out;
 
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * verify
-    *-------------------------------------------------------------------------
-    */
+     * verify
+     *-------------------------------------------------------------------------
+     */
 
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSis_attached(did,dsid,DIM0)<=0)
+    if (H5DSis_attached(did, dsid, DIM0) <= 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_2", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSis_attached(did,dsid,DIM1)<=0)
+    if (H5DSis_attached(did, dsid, DIM1) <= 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * detach
-    *-------------------------------------------------------------------------
-    */
+     * detach
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_d" */
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_1", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach the dimension scale to "dset_d" in DIM 0  */
-    if(H5DSdetach_scale(did,dsid,DIM0) < 0)
+    if (H5DSdetach_scale(did, dsid, DIM0) < 0)
         goto out;
 
     /* verify attach, it must return 0 for no attach */
-    if(H5DSis_attached(did,dsid,DIM0)!=0)
+    if (H5DSis_attached(did, dsid, DIM0) != 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_d" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach again
-    *-------------------------------------------------------------------------
-    */
+     * attach again
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_d" */
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_1", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach "ds_d_1" again in DIM 0  */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
 
     /* verify attach, it must return 1 for attach */
-    if(H5DSis_attached(did,dsid,DIM0)!=1)
+    if (H5DSis_attached(did, dsid, DIM0) != 1)
         goto out;
 
     /* verify that "ds_d_1" has only 1 scale at DIM0  */
-    if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
+    if ((nscales = H5DSget_num_scales(did, DIM0)) < 0)
         goto out;
-    if(nscales != 1)
+    if (nscales != 1)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_d" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * detach/detach
-    *-------------------------------------------------------------------------
-    */
+     * detach/detach
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_d" */
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_2", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach the "ds_d_2" dimension scale to "dset_d" in DIM 1  */
-    if(H5DSdetach_scale(did,dsid,DIM1) < 0)
+    if (H5DSdetach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* detach again, it should fail */
-    if(H5DSdetach_scale(did,dsid,DIM1)==SUCCEED)
+    if (H5DSdetach_scale(did, dsid, DIM1) == SUCCEED)
         goto out;
 
     /* verify attach, it must return 0 for no attach */
-    if(H5DSis_attached(did,dsid,DIM1)!=0)
+    if (H5DSis_attached(did, dsid, DIM1) != 0)
         goto out;
 
     /* verify that "ds_d_1" has no scale at DIM1  */
-    if((nscales = H5DSget_num_scales(did,DIM1)) < 0)
+    if ((nscales = H5DSget_num_scales(did, DIM1)) < 0)
         goto out;
-    if(nscales != 0)
+    if (nscales != 0)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_d" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach twice
-    *-------------------------------------------------------------------------
-    */
+     * attach twice
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_d" */
-    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_d", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_d_2", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach "ds_d_2" in DIM 1  */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* verify attach, it must return 1 for attach */
-    if(H5DSis_attached(did,dsid,DIM1)!=1)
+    if (H5DSis_attached(did, dsid, DIM1) != 1)
         goto out;
 
     /* verify that "ds_d_2" has only 1 scale at DIM1  */
-    if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
+    if ((nscales = H5DSget_num_scales(did, DIM0)) < 0)
         goto out;
-    if(nscales != 1)
+    if (nscales != 1)
         goto out;
 
     /* attach "ds_d_2" again in DIM 1  */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
 
     /* verify attach, it must return 1 for attach */
-    if(H5DSis_attached(did,dsid,DIM1)!=1)
+    if (H5DSis_attached(did, dsid, DIM1) != 1)
         goto out;
 
     /* verify that "ds_d_2" has only 1 scale at DIM1  */
-    if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
+    if ((nscales = H5DSget_num_scales(did, DIM0)) < 0)
         goto out;
-    if(nscales != 1)
+    if (nscales != 1)
         goto out;
 
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     /* close dataset ID of "dset_d" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create 10 datasets: 5 "data" dataset and 5 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create 10 datasets: 5 "data" dataset and 5 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* create a group */
-    if((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* create the data space for the dataset */
-    if((sid = H5Screate_simple(rank,dims,NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
-    for(i = 0; i < 5; i++) {
-        HDsprintf(dname,"dset_%d",i);
-        if((did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    for (i = 0; i < 5; i++) {
+        HDsprintf(dname, "dset_%d", i);
+        if ((did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        HDsprintf(sname,"ds_%d",i);
-        if((dsid = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        HDsprintf(sname, "ds_%d", i);
+        if ((dsid = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        if(H5DSset_scale(dsid,"scale") < 0)
+        if (H5DSset_scale(dsid, "scale") < 0)
             goto out;
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             goto out;
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
 
     /*-------------------------------------------------------------------------
-    * attach for DIM 0
-    *-------------------------------------------------------------------------
-    */
+     * attach for DIM 0
+     *-------------------------------------------------------------------------
+     */
 
-    for(i = 0; i < 5; i++) {
+    for (i = 0; i < 5; i++) {
         HDsprintf(dname, "dset_%d", i);
-        if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
+        if ((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
-        for(j = 0; j < 5; j++) {
+        for (j = 0; j < 5; j++) {
             HDsprintf(sname, "ds_%d", j);
-            if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
+            if ((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
                 goto out;
-            if(H5DSattach_scale(did, dsid, DIM0) < 0)
+            if (H5DSattach_scale(did, dsid, DIM0) < 0)
                 goto out;
-            if(H5Dclose(dsid) < 0)
+            if (H5Dclose(dsid) < 0)
                 goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
 
     /*-------------------------------------------------------------------------
-    * dettach for DIM0
-    *-------------------------------------------------------------------------
-    */
+     * dettach for DIM0
+     *-------------------------------------------------------------------------
+     */
 
-    for(i = 0; i < 5; i++) {
+    for (i = 0; i < 5; i++) {
         HDsprintf(dname, "dset_%d", i);
-        if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
+        if ((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
-        for(j = 0; j < 5; j++) {
+        for (j = 0; j < 5; j++) {
             HDsprintf(sname, "ds_%d", j);
-            if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
+            if ((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
                 goto out;
-            if(H5DSdetach_scale(did, dsid, DIM0) < 0)
+            if (H5DSdetach_scale(did, dsid, DIM0) < 0)
                 goto out;
-            if(H5Dclose(dsid) < 0)
+            if (H5Dclose(dsid) < 0)
                 goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
 
-
     /*-------------------------------------------------------------------------
-    * attach again for DIM0
-    *-------------------------------------------------------------------------
-    */
+     * attach again for DIM0
+     *-------------------------------------------------------------------------
+     */
 
-    for(i=0; i<5; i++) {
-        HDsprintf(dname,"dset_%d",i);
-        if((did = H5Dopen2(gid,dname, H5P_DEFAULT)) < 0)
+    for (i = 0; i < 5; i++) {
+        HDsprintf(dname, "dset_%d", i);
+        if ((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
-        for(j=0; j<5; j++) {
-            HDsprintf(sname,"ds_%d",j);
-            if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT)) < 0)
+        for (j = 0; j < 5; j++) {
+            HDsprintf(sname, "ds_%d", j);
+            if ((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
                 goto out;
-            if(H5DSattach_scale(did,dsid,DIM0) < 0)
+            if (H5DSattach_scale(did, dsid, DIM0) < 0)
                 goto out;
-            if(H5Dclose(dsid) < 0)
+            if (H5Dclose(dsid) < 0)
                 goto out;
         }
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             goto out;
     }
 
     /* close */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
-
-
     /*-------------------------------------------------------------------------
-    * create a dataset and attach only to 1 dimension
-    *-------------------------------------------------------------------------
-    */
+     * create a dataset and attach only to 1 dimension
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_e",rank,dims,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_e", rank, dims, NULL) < 0)
         goto out;
 
     /* make a scale */
-    if(H5LTmake_dataset_int(fid,"ds_e_1",rankds,s1_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_e_1", rankds, s1_dim, NULL) < 0)
         goto out;
 
     /* attach the DS to dimension 1 */
-    if((did = H5Dopen2(fid,"dset_e", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_e", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_e_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_e_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
-    if(H5DSis_attached(did,dsid,DIM1)<=0)
+    if (H5DSis_attached(did, dsid, DIM1) <= 0)
         goto out;
 
-
     /* try to detach all dimensions. for dimensions 0 and 2, it is an error */
-    for(i=0; i<rank; i++) {
-        if( i==1 ) {
-            if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
+    for (i = 0; i < rank; i++) {
+        if (i == 1) {
+            if (H5DSdetach_scale(did, dsid, (unsigned)i) < 0)
                 goto out;
         }
         else {
-            if(H5DSdetach_scale(did,dsid,(unsigned)i)!=FAIL)
+            if (H5DSdetach_scale(did, dsid, (unsigned)i) != FAIL)
                 goto out;
         }
     }
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
-
     /*-------------------------------------------------------------------------
-    * H5DSset_label, H5DSget_label
-    *-------------------------------------------------------------------------
-    */
+     * H5DSset_label, H5DSget_label
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("set/get label");
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * set label
-    *-------------------------------------------------------------------------
-    */
+     * set label
+     *-------------------------------------------------------------------------
+     */
 
-    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+    if (H5DSset_label(did, DIM0, DIM0_LABEL) < 0)
         goto out;
 
     /* check getting a label which does not exist */
-    if(H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label)) != 0)
+    if (H5DSget_label(did, DIM1, dim1_label, sizeof(dim1_label)) != 0)
         goto out;
 
-    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+    if (H5DSset_label(did, DIM1, DIM1_LABEL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a static buffer
-    *-------------------------------------------------------------------------
-    */
+     * get the scale name using a static buffer
+     *-------------------------------------------------------------------------
+     */
 
-    if(H5DSget_label(did,DIM0,dim0_label,sizeof(dim0_label)) < 0)
+    if (H5DSget_label(did, DIM0, dim0_label, sizeof(dim0_label)) < 0)
         goto out;
-    if(H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label)) < 0)
+    if (H5DSget_label(did, DIM1, dim1_label, sizeof(dim1_label)) < 0)
         goto out;
-    if(HDstrncmp(DIM0_LABEL,dim0_label,sizeof(dim0_label))!=0)
+    if (HDstrncmp(DIM0_LABEL, dim0_label, sizeof(dim0_label)) != 0)
         goto out;
-    if(HDstrncmp(DIM1_LABEL,dim1_label,sizeof(dim1_label))!=0)
+    if (HDstrncmp(DIM1_LABEL, dim1_label, sizeof(dim1_label)) != 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a dynamic buffer
-    *-------------------------------------------------------------------------
-    */
+     * get the scale name using a dynamic buffer
+     *-------------------------------------------------------------------------
+     */
 
-    if((dim0_label_size=H5DSget_label(did,DIM0,NULL,(size_t)0)) < 0)
+    if ((dim0_label_size = H5DSget_label(did, DIM0, NULL, (size_t)0)) < 0)
         goto out;
-    if((dim1_label_size=H5DSget_label(did,DIM1,NULL,(size_t)0)) < 0)
+    if ((dim1_label_size = H5DSget_label(did, DIM1, NULL, (size_t)0)) < 0)
         goto out;
 
     /* allocate */
-    dim0_labeld = (char*)HDmalloc((size_t)dim0_label_size * sizeof (char));
-    dim1_labeld = (char*)HDmalloc((size_t)dim1_label_size * sizeof (char));
-    if( dim0_labeld==NULL || dim1_labeld==NULL)
+    dim0_labeld = (char *)HDmalloc((size_t)dim0_label_size * sizeof(char));
+    dim1_labeld = (char *)HDmalloc((size_t)dim1_label_size * sizeof(char));
+    if (dim0_labeld == NULL || dim1_labeld == NULL)
         goto out;
-    if(H5DSget_label(did,DIM0,dim0_labeld,(size_t)dim0_label_size) < 0)
+    if (H5DSget_label(did, DIM0, dim0_labeld, (size_t)dim0_label_size) < 0)
         goto out;
-    if(H5DSget_label(did,DIM1,dim1_labeld,(size_t)dim1_label_size) < 0)
+    if (H5DSget_label(did, DIM1, dim1_labeld, (size_t)dim1_label_size) < 0)
         goto out;
-    if(HDstrncmp(DIM0_LABEL,dim0_labeld,(size_t)(dim0_label_size-1))!=0)
+    if (HDstrncmp(DIM0_LABEL, dim0_labeld, (size_t)(dim0_label_size - 1)) != 0)
         goto out;
-    if(HDstrncmp(DIM1_LABEL,dim1_labeld,(size_t)(dim1_label_size-1))!=0)
+    if (HDstrncmp(DIM1_LABEL, dim1_labeld, (size_t)(dim1_label_size - 1)) != 0)
         goto out;
-    if(dim0_labeld) {
+    if (dim0_labeld) {
         HDfree(dim0_labeld);
-        dim0_labeld=NULL;
+        dim0_labeld = NULL;
     }
-    if(dim1_labeld) {
+    if (dim1_labeld) {
         HDfree(dim1_labeld);
-        dim1_labeld=NULL;
+        dim1_labeld = NULL;
     }
 
-
     /*-------------------------------------------------------------------------
-    * get the label using a static buffer smaller than the string length
-    *-------------------------------------------------------------------------
-    */
+     * get the label using a static buffer smaller than the string length
+     *-------------------------------------------------------------------------
+     */
 
-    if(H5DSget_label(did,DIM0,dim0_labels,sizeof(dim0_labels)) < 0)
+    if (H5DSget_label(did, DIM0, dim0_labels, sizeof(dim0_labels)) < 0)
         goto out;
-    if(H5DSget_label(did,DIM1,dim1_labels,sizeof(dim1_labels)) < 0)
+    if (H5DSget_label(did, DIM1, dim1_labels, sizeof(dim1_labels)) < 0)
         goto out;
-    if(HDstrncmp(DIM0_LABEL,dim0_labels,sizeof(dim0_labels)-1)!=0)
+    if (HDstrncmp(DIM0_LABEL, dim0_labels, sizeof(dim0_labels) - 1) != 0)
         goto out;
-    if(HDstrncmp(DIM1_LABEL,dim1_labels,sizeof(dim1_labels)-1)!=0)
+    if (HDstrncmp(DIM1_LABEL, dim1_labels, sizeof(dim1_labels) - 1) != 0)
         goto out;
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5DSget_scale_name, H5DSget_scale_name
-    *-------------------------------------------------------------------------
-    */
-
+     * H5DSget_scale_name, H5DSget_scale_name
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("set scale/get scale name");
-    if((dsid = H5Dopen2(fid,"ds_a_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSset_scale(dsid,"Latitude set 0") < 0)
+    if (H5DSset_scale(dsid, "Latitude set 0") < 0)
         goto out;
 
     /* verify that DS_1_NAME is a dimension scale dataset  */
-    if((H5DSis_scale(dsid)) == 0)
+    if ((H5DSis_scale(dsid)) == 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a dynamic buffer
-    *-------------------------------------------------------------------------
-    */
+     * get the scale name using a dynamic buffer
+     *-------------------------------------------------------------------------
+     */
 
     /* get the length of the scale name (pass NULL in name) */
-    if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) < 0)
+    if ((name_len = H5DSget_scale_name(dsid, NULL, (size_t)0)) < 0)
         goto out;
 
     /* allocate a  buffer */
-    name_out = (char*)HDmalloc(((size_t)name_len+1) * sizeof (char));
-    if(name_out == NULL)
+    name_out = (char *)HDmalloc(((size_t)name_len + 1) * sizeof(char));
+    if (name_out == NULL)
         goto out;
 
     /* get the scale name using this buffer */
-    if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) < 0)
+    if (H5DSget_scale_name(dsid, name_out, (size_t)name_len + 1) < 0)
         goto out;
 
-    if(HDstrncmp("Latitude set 0",name_out, (size_t)name_len)!=0)
+    if (HDstrncmp("Latitude set 0", name_out, (size_t)name_len) != 0)
         goto out;
-    if(name_out) {
+    if (name_out) {
         HDfree(name_out);
-        name_out=NULL;
+        name_out = NULL;
     }
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a static buffer
-    *-------------------------------------------------------------------------
-    */
+     * get the scale name using a static buffer
+     *-------------------------------------------------------------------------
+     */
 
     /* get the scale name using this buffer */
-    if(H5DSget_scale_name(dsid, sname, sizeof(sname)) < 0)
+    if (H5DSget_scale_name(dsid, sname, sizeof(sname)) < 0)
         goto out;
 
-    if(HDstrncmp("Latitude set 0", sname, sizeof(sname))!=0)
+    if (HDstrncmp("Latitude set 0", sname, sizeof(sname)) != 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a static buffer smaller than the string length
-    *-------------------------------------------------------------------------
-    */
+     * get the scale name using a static buffer smaller than the string length
+     *-------------------------------------------------------------------------
+     */
 
     /* get the scale name using this buffer */
-    if(H5DSget_scale_name(dsid, snames, sizeof (snames)) < 0)
+    if (H5DSget_scale_name(dsid, snames, sizeof(snames)) < 0)
         goto out;
 
-    if(HDstrncmp("Latitude set 0",snames,sizeof(snames)-1)!=0)
+    if (HDstrncmp("Latitude set 0", snames, sizeof(snames) - 1) != 0)
         goto out;
-    if(H5Dclose(dsid))
+    if (H5Dclose(dsid))
         goto out;
 
     /*-------------------------------------------------------------------------
-    * add scale names
-    *-------------------------------------------------------------------------
-    */
+     * add scale names
+     *-------------------------------------------------------------------------
+     */
 
-    if((dsid = H5Dopen2(fid,"ds_a_11", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_11", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSset_scale(dsid,"Latitude set 1") < 0)
+    if (H5DSset_scale(dsid, "Latitude set 1") < 0)
         goto out;
-    if(H5Dclose(dsid))
+    if (H5Dclose(dsid))
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_a_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_2", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSset_scale(dsid,"Longitude set 0") < 0)
+    if (H5DSset_scale(dsid, "Longitude set 0") < 0)
         goto out;
-    if(H5Dclose(dsid))
+    if (H5Dclose(dsid))
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_a_21", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_21", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSset_scale(dsid,"Longitude set 1") < 0)
+    if (H5DSset_scale(dsid, "Longitude set 1") < 0)
         goto out;
-    if(H5Dclose(dsid))
+    if (H5Dclose(dsid))
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_a_22", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a_22", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSset_scale(dsid,"Longitude set 2") < 0)
+    if (H5DSset_scale(dsid, "Longitude set 2") < 0)
         goto out;
-    if(H5Dclose(dsid))
+    if (H5Dclose(dsid))
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5DSiterate_scales
-    *-------------------------------------------------------------------------
-    */
-
+     * H5DSiterate_scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate scales");
 
-
     /*-------------------------------------------------------------------------
-    * test 6: test iterate scales with a function verify_scale
-    *-------------------------------------------------------------------------
-    */
+     * test 6: test iterate scales with a function verify_scale
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
     dim = 0;
 
     /* iterate trough the 1st dimension of "dset_a" and verify that its DS is valid  */
-    if(H5DSiterate_scales(did,dim,NULL,verify_scale,NULL) < 0)
+    if (H5DSiterate_scales(did, dim, NULL, verify_scale, NULL) < 0)
         goto out;
 
     /* iterate trough the 2nd dimension of "dset_a" and verify that its DS is valid
     start at DS index 2 */
-    dim = 1;
+    dim       = 1;
     scale_idx = 2;
-    if(H5DSiterate_scales(did,dim,&scale_idx,verify_scale,NULL) < 0)
+    if (H5DSiterate_scales(did, dim, &scale_idx, verify_scale, NULL) < 0)
         goto out;
 
     /* close dataset ID of "dset_a" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * test iterate scales with a function read_scale
-    *-------------------------------------------------------------------------
-    */
-
+     * test iterate scales with a function read_scale
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
     dim = 0;
 
     /* iterate trough the 1st dimension of "dset_a" and read the DS  */
-    if(H5DSiterate_scales(did,dim,NULL,read_scale,s1_wbuf) < 0)
+    if (H5DSiterate_scales(did, dim, NULL, read_scale, s1_wbuf) < 0)
         goto out;
 
     /* iterate trough the 2nd dimension of "dset_a" and read the DS
     start at DS index 2 */
-    dim = 1;
+    dim       = 1;
     scale_idx = 2;
-    if(H5DSiterate_scales(did, dim, &scale_idx, read_scale, s22_wbuf) < 0)
+    if (H5DSiterate_scales(did, dim, &scale_idx, read_scale, s22_wbuf) < 0)
         goto out;
 
     /* close dataset ID of "dset_a" */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * test iterate scales with a function match_dim_scale
-    *-------------------------------------------------------------------------
-    */
+     * test iterate scales with a function match_dim_scale
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get dataset space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get rank */
-    if((rank = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* get dimensions of dataset */
-    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
     {
-        int match_size;   /* does this scale size matches the dataset DIM size */
-        int idx = 0;      /* scale index to start iterating, on return, index where iterator stoped */
+        int match_size; /* does this scale size matches the dataset DIM size */
+        int idx = 0;    /* scale index to start iterating, on return, index where iterator stoped */
 
         /* iterate trough all the dimensions  */
-        for(dim=0; dim<(unsigned)rank; dim++) {
-            if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
+        for (dim = 0; dim < (unsigned)rank; dim++) {
+            if ((match_size = H5DSiterate_scales(did, dim, &idx, match_dim_scale, NULL)) < 0)
                 goto out;
 
             /* "dset_a" was defined with all dimension scales size matching the size of its dimensions */
-            if(match_size==0)
+            if (match_size == 0)
                 goto out;
 
             /* both DS_1_NAME and DS_2_NAME are the on the first index */
-            if(idx!=0)
+            if (idx != 0)
                 goto out;
         }
     }
 
-
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * test iterate scales with a function match_dim_scale
-    *-------------------------------------------------------------------------
-    */
+     * test iterate scales with a function match_dim_scale
+     *-------------------------------------------------------------------------
+     */
 
     /*-------------------------------------------------------------------------
-    * create 3 datasets: 1 "data" dataset and dimension scales (some are empty)
-    *-------------------------------------------------------------------------
-    */
-    if(H5LTmake_dataset_int(fid, "dset_f", rank, dims, buf) < 0)
+     * create 3 datasets: 1 "data" dataset and dimension scales (some are empty)
+     *-------------------------------------------------------------------------
+     */
+    if (H5LTmake_dataset_int(fid, "dset_f", rank, dims, buf) < 0)
         goto out;
 
-    if(H5LTmake_dataset_int(fid,"ds_f_1",rankds,s1_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_f_1", rankds, s1_dim, NULL) < 0)
         goto out;
-    if(H5LTmake_dataset_int(fid, "ds_f_11", rankds, s1_dim, s1_wbuf) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_f_11", rankds, s1_dim, s1_wbuf) < 0)
         goto out;
 
-    if(H5LTmake_dataset_int(fid,"ds_f_2",rankds,s2_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_f_2", rankds, s2_dim, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach them
-    *-------------------------------------------------------------------------
-    */
-    if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
+     * attach them
+     *-------------------------------------------------------------------------
+     */
+    if ((did = H5Dopen2(fid, "dset_f", H5P_DEFAULT)) < 0)
         goto out;
-    if((dsid = H5Dopen2(fid,"ds_f_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_f_1", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_f_11", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_f_11", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((dsid = H5Dopen2(fid,"ds_f_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_f_2", H5P_DEFAULT)) < 0)
         goto out;
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * verify match
-    *-------------------------------------------------------------------------
-    */
+     * verify match
+     *-------------------------------------------------------------------------
+     */
     /* get the dataset id for "dset_f" */
-    if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_f", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get dataset space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get rank */
-    if((rank = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
         goto out;
 
     /* get dimensions of dataset */
-    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
     {
         int match_size; /* does this scale size matches the dataset DIM size */
         int idx;        /* scale index to start iterating, on return, index where iterator stoped */
 
         /* iterate trough all the dimensions  */
-        for(dim=0; dim<(unsigned)rank; dim++) {
+        for (dim = 0; dim < (unsigned)rank; dim++) {
             /* always start at 1st scale */
-            idx=0;
+            idx = 0;
 
-            if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
+            if ((match_size = H5DSiterate_scales(did, dim, &idx, match_dim_scale, NULL)) < 0)
                 goto out;
 
             /* "dset_e" was defined with :
             dim 0: 2 scales, first is empty
             dim 1: 1 scale, empty */
-            switch(dim) {
-            case 0: /* for DIM 0, we get a valid scale at IDX 1 */
-                if(match_size!=1 && idx!=1)
-                    goto out;
-                break;
-            case 1: /* for DIM 1, we get no valid scales */
-                if(match_size!=0 && idx!=0)
-                    goto out;
-                break;
-            default:
-                HDassert(0);
-                break;
-            }/*switch*/
-        }/*for*/
+            switch (dim) {
+                case 0: /* for DIM 0, we get a valid scale at IDX 1 */
+                    if (match_size != 1 && idx != 1)
+                        goto out;
+                    break;
+                case 1: /* for DIM 1, we get no valid scales */
+                    if (match_size != 0 && idx != 0)
+                        goto out;
+                    break;
+                default:
+                    HDassert(0);
+                    break;
+            } /*switch*/
+        }     /*for*/
     }
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * end
-    *-------------------------------------------------------------------------
-    */
+     * end
+     *-------------------------------------------------------------------------
+     */
 
     /* close */
     H5Fclose(fid);
     return 0;
 
-    /* error zone */
-    out:
+/* error zone */
+out:
     H5E_BEGIN_TRY
     {
         H5Dclose(did);
@@ -3435,13 +3526,12 @@ static int test_simple(void)
         H5Fclose(fid);
         H5Sclose(sid);
         H5Gclose(gid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function: verify_scale
  *
@@ -3459,29 +3549,29 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
-static herr_t verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
+static herr_t
+verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
     /* define a default zero value for return. This will cause the iterator to continue */
     int ret = 0;
 
     /* unused */
-    dset=dset;
-    dim=dim;
-    visitor_data=visitor_data;
+    dset         = dset;
+    dim          = dim;
+    visitor_data = visitor_data;
 
     /* define a positive value for return value. This will cause the iterator to
     immediately return that positive value, indicating short-circuit success
     */
 
     /* the parameter DS dataset must be a valid DS dataset */
-    if((H5DSis_scale(scale_id))==1) {
+    if ((H5DSis_scale(scale_id)) == 1) {
         ret = 1;
     }
 
     return ret;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: read_scale
  *
@@ -3500,47 +3590,48 @@ static herr_t verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visit
  *-------------------------------------------------------------------------
  */
 
-static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
+static herr_t
+read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
-    int      ret = 0;   /* define a default zero value for return. This will cause the iterator to continue */
-    hid_t    sid = -1;  /* space ID */
-    hid_t    tid = -1;  /* file type ID */
+    int      ret  = 0;  /* define a default zero value for return. This will cause the iterator to continue */
+    hid_t    sid  = -1; /* space ID */
+    hid_t    tid  = -1; /* file type ID */
     hid_t    mtid = -1; /* memory type ID */
     hssize_t nelmts;    /* number of data elements */
-    char     *buf=NULL; /* data buffer */
+    char *   buf = NULL; /* data buffer */
     size_t   size;
     int      i;
-    char     *data = (char*) visitor_data;
+    char *   data = (char *)visitor_data;
 
     /* unused */
-    dset=dset;
-    dim=dim;
+    dset = dset;
+    dim  = dim;
 
     /* get space */
-    if((sid = H5Dget_space(scale_id)) < 0)
+    if ((sid = H5Dget_space(scale_id)) < 0)
         goto out;
     /* get type */
-    if((tid = H5Dget_type(scale_id)) < 0)
+    if ((tid = H5Dget_type(scale_id)) < 0)
         goto out;
     /* get size of the DS array */
-    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+    if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
         goto out;
     /* get type */
-    if((mtid=H5Tget_native_type(tid,H5T_DIR_DEFAULT)) < 0)
+    if ((mtid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0)
         goto out;
     /* get type size */
-    if((size=H5Tget_size(mtid))==0)
+    if ((size = H5Tget_size(mtid)) == 0)
         goto out;
 
-    if(nelmts) {
-        buf=(char *)HDmalloc(((size_t)nelmts*size));
-        if(buf==NULL)
+    if (nelmts) {
+        buf = (char *)HDmalloc(((size_t)nelmts * size));
+        if (buf == NULL)
             goto out;
-        if(H5Dread(scale_id,mtid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0)
+        if (H5Dread(scale_id, mtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
 
-        for(i=0; i<nelmts; i++) {
-            if(buf[i] != data[i]) {
+        for (i = 0; i < nelmts; i++) {
+            if (buf[i] != data[i]) {
                 HDprintf("read and write buffers differ\n");
                 goto out;
             }
@@ -3548,33 +3639,33 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
 
     } /* if */
 
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
-    if(H5Tclose(tid) < 0)
+    if (H5Tclose(tid) < 0)
         goto out;
-    if(H5Tclose(mtid) < 0)
+    if (H5Tclose(mtid) < 0)
         goto out;
-    if(buf)
+    if (buf)
         HDfree(buf);
 
-
     return ret;
 
     /* error zone */
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
         H5Tclose(tid);
         H5Tclose(mtid);
-        if(buf) {
+        if (buf) {
             HDfree(buf);
         }
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: match_dim_scale
  *
@@ -3592,71 +3683,73 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static herr_t match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
+static herr_t
+match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
 {
-    int       ret = 0;              /* define a default zero value for return. This will cause the iterator to continue */
-    hid_t     sid;                  /* space ID */
-    hssize_t  nelmts;               /* size of a dimension scale array */
-    hsize_t   dims[H5S_MAX_RANK];   /* dimensions of dataset */
-    hsize_t   storage_size;
+    int      ret = 0; /* define a default zero value for return. This will cause the iterator to continue */
+    hid_t    sid;     /* space ID */
+    hssize_t nelmts;  /* size of a dimension scale array */
+    hsize_t  dims[H5S_MAX_RANK]; /* dimensions of dataset */
+    hsize_t  storage_size;
 
     /* Stop compiler from whining about "unused parameters" */
     visitor_data = visitor_data;
 
     /*-------------------------------------------------------------------------
-    * get DID (dataset) space info
-    *-------------------------------------------------------------------------
-    */
+     * get DID (dataset) space info
+     *-------------------------------------------------------------------------
+     */
 
     /* get dataset space */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto out;
 
     /* get dimensions of dataset */
-    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
         goto out;
 
     /* close the dataspace id */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get DSID (scale) space info
-    *-------------------------------------------------------------------------
-    */
+     * get DSID (scale) space info
+     *-------------------------------------------------------------------------
+     */
 
     /* get the space for the scale */
-    if((sid = H5Dget_space(dsid)) < 0)
+    if ((sid = H5Dget_space(dsid)) < 0)
         goto out;
 
     /* get size of the DS array */
-    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+    if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
         goto out;
 
     /* close */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /* the size of the DS array must match the dimension of the dataset */
-    if(nelmts == (hssize_t)dims[dim])
+    if (nelmts == (hssize_t)dims[dim])
         ret = 1;
 
     /* if the scale is empty assume it cannot be used */
-    storage_size=H5Dget_storage_size(dsid);
+    storage_size = H5Dget_storage_size(dsid);
 
-    if(storage_size==0)
+    if (storage_size == 0)
         ret = 0;
 
     return ret;
 
 out:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: op_continue
  *
@@ -3674,14 +3767,15 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static herr_t op_continue(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
+static herr_t
+op_continue(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
     /* Stop compiler from whining about "unused parameters" */
-    dset = dset;
-    dim = dim;
+    dset     = dset;
+    dim      = dim;
     scale_id = scale_id;
 
-    if ( visitor_data != NULL ) {
+    if (visitor_data != NULL) {
         (*(int *)visitor_data)++;
     }
 
@@ -3706,14 +3800,15 @@ static herr_t op_continue(hid_t dset, unsigned dim, hid_t scale_id, void *visito
  *-------------------------------------------------------------------------
  */
 
-static herr_t op_stop(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
+static herr_t
+op_stop(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
     /* Stop compiler from whining about "unused parameters" */
-    dset = dset;
-    dim = dim;
+    dset     = dset;
+    dim      = dim;
     scale_id = scale_id;
 
-    if ( visitor_data != NULL ) {
+    if (visitor_data != NULL) {
         (*(int *)visitor_data)++;
     }
 
@@ -3726,360 +3821,356 @@ static herr_t op_stop(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_da
  *-------------------------------------------------------------------------
  */
 
-static int test_errors(void)
+static int
+test_errors(void)
 {
-    hid_t   fid;                                              /* file ID */
-    int     rank     = RANK;                                  /* rank of data dataset */
-    int     rankds   = 1;                                     /* rank of DS dataset */
-    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
-    hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
-    hid_t   did = -1;                                         /* dataset ID */
-    hid_t   dsid = -1;                                        /* scale ID */
-    hid_t   gid = -1;                                         /* group ID */
-    hid_t   sid = -1;                                         /* space ID */
-    hid_t   sidds = -1;                                       /* space ID */
-    hsize_t pal_dims[] = {9,3};
+    hid_t   fid;                                 /* file ID */
+    int     rank       = RANK;                   /* rank of data dataset */
+    int     rankds     = 1;                      /* rank of DS dataset */
+    hsize_t dims[RANK] = {DIM1_SIZE, DIM2_SIZE}; /* size of data dataset */
+    hsize_t s1_dim[1]  = {DIM1_SIZE};            /* size of DS 1 dataset */
+    hid_t   did        = -1;                     /* dataset ID */
+    hid_t   dsid       = -1;                     /* scale ID */
+    hid_t   gid        = -1;                     /* group ID */
+    hid_t   sid        = -1;                     /* space ID */
+    hid_t   sidds      = -1;                     /* space ID */
+    hsize_t pal_dims[] = {9, 3};
 
     HDprintf("Testing error conditions\n");
 
     /*-------------------------------------------------------------------------
-    * create a file, spaces, dataset and group ids
-    *-------------------------------------------------------------------------
-    */
+     * create a file, spaces, dataset and group ids
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    if((fid = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* create a group */
-    if((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* create the data space for the dataset */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
     /* create the data space for the scale */
-    if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
+    if ((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
         goto out;
     /* create a dataset */
-    if((did = H5Dcreate2(fid, "dset_a", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "dset_a", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* create a dataset for the scale */
-    if((dsid = H5Dcreate2(fid, "ds_a", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dcreate2(fid, "ds_a", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attempt to attach a dataset to itself, it should fail
-    *-------------------------------------------------------------------------
-    */
+     * attempt to attach a dataset to itself, it should fail
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach a dataset to itself");
 
-    if(H5DSattach_scale(did, did, 0) == SUCCEED)
+    if (H5DSattach_scale(did, did, 0) == SUCCEED)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * attempt to attach a group with a dataset, it should fail
-    *-------------------------------------------------------------------------
-    */
+     * attempt to attach a group with a dataset, it should fail
+     *-------------------------------------------------------------------------
+     */
     HL_TESTING2("attach a group with a dataset");
 
-    if(H5DSattach_scale(gid,dsid,0)==SUCCEED)
+    if (H5DSattach_scale(gid, dsid, 0) == SUCCEED)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * attempt to attach a dataset with a group, it should fail
-    *-------------------------------------------------------------------------
-    */
+     * attempt to attach a dataset with a group, it should fail
+     *-------------------------------------------------------------------------
+     */
     HL_TESTING2("attach a dataset with a group");
 
-    if(H5DSattach_scale(did,gid,0)==SUCCEED)
+    if (H5DSattach_scale(did, gid, 0) == SUCCEED)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * attempt to set scale for a group, it should fail
-    *-------------------------------------------------------------------------
-    */
+     * attempt to set scale for a group, it should fail
+     *-------------------------------------------------------------------------
+     */
     HL_TESTING2("set scale for a group");
 
-    if(H5DSset_scale(gid,"scale 1")==SUCCEED)
+    if (H5DSset_scale(gid, "scale 1") == SUCCEED)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * close IDs for this set
-    *-------------------------------------------------------------------------
-    */
+     * close IDs for this set
+     *-------------------------------------------------------------------------
+     */
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
-    if(H5Sclose(sidds) < 0)
+    if (H5Sclose(sidds) < 0)
         goto out;
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * try to attach a scale that has scales
-    *-------------------------------------------------------------------------
-    */
+     * try to attach a scale that has scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach a scale that has scales");
 
     /* create the data space for the scale */
-    if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
+    if ((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
         goto out;
 
     /* create a dataset "ds_b" for the scale */
-    if((dsid = H5Dcreate2(fid, "ds_b", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dcreate2(fid, "ds_b", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the previous written "ds_a" */
-    if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* attach "ds_b" to "ds_a", valid */
-    if(H5DSattach_scale(did, dsid, 0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Sclose(sidds) < 0)
+    if (H5Sclose(sidds) < 0)
         goto out;
 
     /* open the previous written "dset_a" */
-    if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the previous written "ds_a" */
-    if((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to attach "ds_a" to "dset_a", not valid */
-    if(H5DSattach_scale(did,dsid,0)==SUCCEED)
+    if (H5DSattach_scale(did, dsid, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /* open the previous written "ds_a" */
-    if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the previous written "ds_b" */
-    if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b", H5P_DEFAULT)) < 0)
         goto out;
 
     /* detach "ds_b" to "ds_a" */
-    if(H5DSdetach_scale(did,dsid,0) < 0)
+    if (H5DSdetach_scale(did, dsid, 0) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * try to attach a dataset that is a scale
-    *-------------------------------------------------------------------------
-    */
+     * try to attach a dataset that is a scale
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach to a dataset that is a scale");
 
     /* open the previous written "ds_b", that is a scale */
-    if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the previous written "ds_a" */
-    if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to attach "ds_a" to "ds_b", not valid */
-    if(H5DSattach_scale(dsid,did,0)==SUCCEED)
+    if (H5DSattach_scale(dsid, did, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * try to attach a scale to an image, pallete or table
-    *-------------------------------------------------------------------------
-    */
+     * try to attach a scale to an image, pallete or table
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach to a dataset that is a reserved class dataset");
 
     /* make an image */
-    if(H5IMmake_image_8bit(fid,"image",(hsize_t)100,(hsize_t)50,NULL) < 0)
+    if (H5IMmake_image_8bit(fid, "image", (hsize_t)100, (hsize_t)50, NULL) < 0)
         goto out;
 
     /* make a palette */
-    if(H5IMmake_palette(fid,"pallete",pal_dims,NULL) < 0)
+    if (H5IMmake_palette(fid, "pallete", pal_dims, NULL) < 0)
         goto out;
 
     /* open the previous written "ds_b" */
-    if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the image dataset */
-    if((did = H5Dopen2(fid,"image", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "image", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to attach "ds_a" to the image, not valid */
-    if(H5DSattach_scale(did,dsid,0)==SUCCEED)
+    if (H5DSattach_scale(did, dsid, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * is scale
-    *-------------------------------------------------------------------------
-    */
+     * is scale
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("is scale");
 
     /* open a non scale dataset */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* verify that it is not a dimension scale dataset  */
-    if((H5DSis_scale(did))==1)
+    if ((H5DSis_scale(did)) == 1)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     /* open the group. */
-    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
         goto out;
 
     /* verify that it is not a dimension scale dataset  */
-    if((H5DSis_scale(gid))==1)
+    if ((H5DSis_scale(gid)) == 1)
         goto out;
 
     /* close */
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * detach
-    *-------------------------------------------------------------------------
-    */
+     * detach
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("detach scale from dataset it is not attached to");
 
     /* open the previous written "ds_a" */
-    if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the previous written "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to detach "ds_a" from "dset_a" */
-    if(H5DSdetach_scale(did,dsid,0)==SUCCEED)
+    if (H5DSdetach_scale(did, dsid, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * detach
-    *-------------------------------------------------------------------------
-    */
+     * detach
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("detach scale from group");
 
     /* open the previous written "ds_a" */
-    if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the group. */
-    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to detach "ds_a" from "grp" */
-    if(H5DSdetach_scale(gid,dsid,0)==SUCCEED)
+    if (H5DSdetach_scale(gid, dsid, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * detach
-    *-------------------------------------------------------------------------
-    */
+     * detach
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("detach scale when scale is group");
 
     /* open the previous written "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* open the group. */
-    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to detach "grp" from "dset_a" */
-    if(H5DSdetach_scale(did,gid,0)==SUCCEED)
+    if (H5DSdetach_scale(did, gid, 0) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
     PASSED();
 
-
     /* close */
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto out;
 
     return 0;
@@ -4094,183 +4185,180 @@ out:
         H5Dclose(dsid);
         H5Gclose(gid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
 
-
-
 /*-------------------------------------------------------------------------
  * test iterators
  *-------------------------------------------------------------------------
  */
 
-static int test_iterators(void)
+static int
+test_iterators(void)
 {
-    hid_t   fid;                                              /* file ID */
-    int     rank     = RANK;                                  /* rank of data dataset */
-    int     rankds   = 1;                                     /* rank of DS dataset */
-    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
-    hsize_t s1_dim[1]   = {DIM1_SIZE};                        /* size of DS 1 dataset */
-    hid_t   gid = -1;                                         /* group ID */
-    hid_t   did = -1;                                         /* dataset ID */
-    hid_t   dsid = -1;                                        /* scale ID */
-    char    dname[30];                                        /* dataset name */
+    hid_t   fid;                                 /* file ID */
+    int     rank       = RANK;                   /* rank of data dataset */
+    int     rankds     = 1;                      /* rank of DS dataset */
+    hsize_t dims[RANK] = {DIM1_SIZE, DIM2_SIZE}; /* size of data dataset */
+    hsize_t s1_dim[1]  = {DIM1_SIZE};            /* size of DS 1 dataset */
+    hid_t   gid        = -1;                     /* group ID */
+    hid_t   did        = -1;                     /* dataset ID */
+    hid_t   dsid       = -1;                     /* scale ID */
+    char    dname[30];                           /* dataset name */
     int     i;
 
     HDprintf("Testing iterators\n");
 
     /*-------------------------------------------------------------------------
-    * create a file, spaces, dataset and group ids
-    *-------------------------------------------------------------------------
-    */
+     * create a file, spaces, dataset and group ids
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    if((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* create a group */
-    if((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* close */
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_a", rank, dims, NULL) < 0)
         goto out;
     /* make a DS dataset */
-    if(H5LTmake_dataset_int(fid,"ds_a",rankds,s1_dim,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a", rankds, s1_dim, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * iterate when the dataset has no scales
-    *-------------------------------------------------------------------------
-    */
+     * iterate when the dataset has no scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate when the dataset has no scales ");
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to iterate trough the 1st dimension of "dset_a", return error */
-    if(H5DSiterate_scales(did,0,NULL,verify_scale,NULL) < 0)
+    if (H5DSiterate_scales(did, 0, NULL, verify_scale, NULL) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * iterate on dimension that is outside the rank
-    *-------------------------------------------------------------------------
-    */
+     * iterate on dimension that is outside the rank
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate on dimension that is outside the rank ");
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to iterate trough the 3rd dimension of "dset_a", return error */
-    if(H5DSiterate_scales(did,3,NULL,verify_scale,NULL)==SUCCEED)
+    if (H5DSiterate_scales(did, 3, NULL, verify_scale, NULL) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * iterate for dimension with many scales
-    *-------------------------------------------------------------------------
-    */
+     * iterate for dimension with many scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate for dimension with many scales ");
 
     /* open the previously written "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
-    for(i=0; i<100; i++) {
+    for (i = 0; i < 100; i++) {
         /* make a DS */
-        HDsprintf(dname,"ds_%d",i);
-        if(H5LTmake_dataset_int(fid,dname,rankds,s1_dim,NULL) < 0)
+        HDsprintf(dname, "ds_%d", i);
+        if (H5LTmake_dataset_int(fid, dname, rankds, s1_dim, NULL) < 0)
             goto out;
         /* open */
-        if((dsid = H5Dopen2(fid,dname, H5P_DEFAULT)) < 0)
+        if ((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
             goto out;
         /* attach */
-        if(H5DSattach_scale(did,dsid,0) < 0)
+        if (H5DSattach_scale(did, dsid, 0) < 0)
             goto out;
         /* close */
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             goto out;
     }
 
     /* iterate trough the 1st dimension of "dset_a" */
-    if(H5DSiterate_scales(did,0,NULL,op_continue,NULL) < 0)
+    if (H5DSiterate_scales(did, 0, NULL, op_continue, NULL) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * iterate on group
-    *-------------------------------------------------------------------------
-    */
+     * iterate on group
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate on group ");
 
     /* open */
-    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
         goto out;
 
     /* try to iterate, return error */
-    if(H5DSiterate_scales(gid,0,NULL,verify_scale,NULL)==SUCCEED)
+    if (H5DSiterate_scales(gid, 0, NULL, verify_scale, NULL) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * iterate in deleted scales
-    *-------------------------------------------------------------------------
-    */
+     * iterate in deleted scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("iterate in deleted scales ");
 
-    if(H5Ldelete(fid, "ds_0", H5P_DEFAULT) < 0)
+    if (H5Ldelete(fid, "ds_0", H5P_DEFAULT) < 0)
         goto out;
 
     /* open the previously written "dset_a" */
-    if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* iterate  */
-    if(H5DSiterate_scales(did, 0, NULL, op_continue, NULL) == SUCCEED)
+    if (H5DSiterate_scales(did, 0, NULL, op_continue, NULL) == SUCCEED)
         goto out;
 
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
     /* close */
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto out;
 
     return 0;
@@ -4282,201 +4370,202 @@ out:
         H5Gclose(gid);
         H5Dclose(did);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  * test several ranks
  *-------------------------------------------------------------------------
  */
 
-static int test_rank(void)
+static int
+test_rank(void)
 {
-    hid_t   fid;                                              /* file ID */
-    hid_t   did = -1;                                         /* dataset ID */
-    hid_t   dsid = -1;                                        /* scale ID */
-    hid_t   sid = -1;                                         /* space ID */
-    hid_t   sidds = -1;                                       /* space ID */
-    hsize_t dims1[1]  = {DIM1_SIZE};                          /* size of data dataset */
-    hsize_t dims2[2]  = {DIM1_SIZE,DIM2_SIZE};                /* size of data dataset */
-    hsize_t dims3[3]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE};      /* size of data dataset */
-    hsize_t dimss[2]  = {1,1};                                /* size of data dataset */
-    char    name[30];                                         /* dataset name buffer */
-    char    names[30];                                        /* dataset scale name buffer */
-    char    namel[30];                                        /* dataset label name buffer */
-    int     bufi[1]={2};
-    float   buff[1]={1};
+    hid_t   fid;                                          /* file ID */
+    hid_t   did      = -1;                                /* dataset ID */
+    hid_t   dsid     = -1;                                /* scale ID */
+    hid_t   sid      = -1;                                /* space ID */
+    hid_t   sidds    = -1;                                /* space ID */
+    hsize_t dims1[1] = {DIM1_SIZE};                       /* size of data dataset */
+    hsize_t dims2[2] = {DIM1_SIZE, DIM2_SIZE};            /* size of data dataset */
+    hsize_t dims3[3] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE}; /* size of data dataset */
+    hsize_t dimss[2] = {1, 1};                            /* size of data dataset */
+    char    name[30];                                     /* dataset name buffer */
+    char    names[30];                                    /* dataset scale name buffer */
+    char    namel[30];                                    /* dataset label name buffer */
+    int     bufi[1] = {2};
+    float   buff[1] = {1};
     int     i;
 
     HDprintf("Testing ranks\n");
 
     /*-------------------------------------------------------------------------
-    * create a file, a dataset, scales
-    *-------------------------------------------------------------------------
-    */
+     * create a file, a dataset, scales
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    if((fid=H5Fcreate(FILE4,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* make a dataset a 3D data dataset */
-    if(H5LTmake_dataset_int(fid,"dset_a",3,dims3,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_a", 3, dims3, NULL) < 0)
         goto out;
 
     /* make a 1D scale dataset  */
-    if(H5LTmake_dataset_int(fid,"ds_a_0",1,dims1,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_0", 1, dims1, NULL) < 0)
         goto out;
 
     /* make a 2D scale dataset  */
-    if(H5LTmake_dataset_int(fid,"ds_a_1",2,dims2,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_1", 2, dims2, NULL) < 0)
         goto out;
 
     /* make a 3D scale dataset  */
-    if(H5LTmake_dataset_int(fid,"ds_a_2",3,dims3,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds_a_2", 3, dims3, NULL) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach
-    *-------------------------------------------------------------------------
-    */
+     * attach
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach");
 
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
-    for(i=0; i<3; i++) {
-        HDsprintf(name,"ds_a_%d",i);
-        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+    for (i = 0; i < 3; i++) {
+        HDsprintf(name, "ds_a_%d", i);
+        if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
             goto out;
-        if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
+        if (H5DSattach_scale(did, dsid, (unsigned)i) < 0)
             goto out;
-        if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
+        if (H5DSis_attached(did, dsid, (unsigned)i) <= 0)
             goto out;
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             goto out;
     }
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * detach
-    *-------------------------------------------------------------------------
-    */
+     * detach
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("detach");
 
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
-    for(i=0; i<3; i++) {
-        HDsprintf(name,"ds_a_%d",i);
-        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+    for (i = 0; i < 3; i++) {
+        HDsprintf(name, "ds_a_%d", i);
+        if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
             goto out;
-        if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
+        if (H5DSdetach_scale(did, dsid, (unsigned)i) < 0)
             goto out;
-        if(H5DSis_attached(did,dsid,(unsigned)i)!=0)
+        if (H5DSis_attached(did, dsid, (unsigned)i) != 0)
             goto out;
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             goto out;
     }
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * attach, set, get names, labels
-    *-------------------------------------------------------------------------
-    */
+     * attach, set, get names, labels
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach, set, get names, labels");
 
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
-    for(i=0; i<3; i++) {
-        HDsprintf(name,"ds_a_%d",i);
-        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+    for (i = 0; i < 3; i++) {
+        HDsprintf(name, "ds_a_%d", i);
+        if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
             goto out;
-        if(H5DSset_scale(dsid,name) < 0)
+        if (H5DSset_scale(dsid, name) < 0)
             goto out;
-        if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
+        if (H5DSattach_scale(did, dsid, (unsigned)i) < 0)
             goto out;
-        if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
+        if (H5DSis_attached(did, dsid, (unsigned)i) <= 0)
             goto out;
-        if(H5DSget_scale_name(dsid,names,sizeof(names)) < 0)
+        if (H5DSget_scale_name(dsid, names, sizeof(names)) < 0)
             goto out;
-        if(H5Dclose(dsid) < 0)
+        if (H5Dclose(dsid) < 0)
             goto out;
-        if(H5DSset_label(did,(unsigned)i,name) < 0)
+        if (H5DSset_label(did, (unsigned)i, name) < 0)
             goto out;
-        if(H5DSget_label(did,(unsigned)i,namel,sizeof(namel)) < 0)
+        if (H5DSget_label(did, (unsigned)i, namel, sizeof(namel)) < 0)
             goto out;
-        if(HDstrncmp(name, names, sizeof(names))!=0)
+        if (HDstrncmp(name, names, sizeof(names)) != 0)
             goto out;
-        if(HDstrncmp(name, namel, sizeof(namel))!=0)
+        if (HDstrncmp(name, namel, sizeof(namel)) != 0)
             goto out;
     }
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * attach a scalar scale
-    *-------------------------------------------------------------------------
-    */
+     * attach a scalar scale
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attach a scalar scale");
 
     /* create the data space for the dataset */
-    if((sid = H5Screate_simple(2, dimss, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dimss, NULL)) < 0)
         goto out;
     /* create a dataset of rank 2 */
-    if((did = H5Dcreate2(fid, "dset_b", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "dset_b", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
     /* create a scalar space */
-    if((sidds = H5Screate(H5S_SCALAR)) < 0)
+    if ((sidds = H5Screate(H5S_SCALAR)) < 0)
         goto out;
     /* create a dataset of scalar rank for the scale */
-    if((dsid = H5Dcreate2(fid, "ds_b_1", H5T_NATIVE_FLOAT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dcreate2(fid, "ds_b_1", H5T_NATIVE_FLOAT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
         goto out;
     /* write */
-    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bufi) < 0)
+    if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bufi) < 0)
         goto out;
-    if(H5Dwrite(dsid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buff) < 0)
+    if (H5Dwrite(dsid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buff) < 0)
         goto out;
     /* attach */
-    if(H5DSattach_scale(did, dsid, 0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
-    if(H5DSattach_scale(did, dsid, 1) < 0)
+    if (H5DSattach_scale(did, dsid, 1) < 0)
         goto out;
     /* close */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
-    if(H5Sclose(sidds) < 0)
+    if (H5Sclose(sidds) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if(H5Fclose(fid) < 0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     return 0;
@@ -4490,173 +4579,174 @@ out:
         H5Sclose(sidds);
         H5Sclose(sid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
  * attach scales with several datatypes
  *-------------------------------------------------------------------------
  */
 
-static int test_types(void)
+static int
+test_types(void)
 {
-    hid_t          fid;                                              /* file ID */
-    hid_t          did = -1;                                         /* dataset ID */
-    hid_t          dsid = -1;                                        /* DS dataset ID */
-    int            rank     = RANK;                                  /* rank of data dataset */
-    int            rankds   = 1;                                     /* rank of DS dataset */
-    hsize_t        dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
-    int            buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
-    hsize_t        s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
-    hsize_t        s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
-    float          s1_float[DIM1_SIZE] = {10,20,30};                 /* data of DS 1 dataset */
-    unsigned short s2_ushort[DIM2_SIZE] = {10,20,30,40};             /* data of DS 2 dataset */
-    const char     *s1_str = "ABC";
-    const char     *s2_str = "ABCD";
+    hid_t          fid;                                                            /* file ID */
+    hid_t          did                  = -1;                                      /* dataset ID */
+    hid_t          dsid                 = -1;                                      /* DS dataset ID */
+    int            rank                 = RANK;                                    /* rank of data dataset */
+    int            rankds               = 1;                                       /* rank of DS dataset */
+    hsize_t        dims[RANK]           = {DIM1_SIZE, DIM2_SIZE};                  /* size of data dataset */
+    int            buf[DIM_DATA]        = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; /* data of data dataset */
+    hsize_t        s1_dim[1]            = {DIM1_SIZE};                             /* size of DS 1 dataset */
+    hsize_t        s2_dim[1]            = {DIM2_SIZE};                             /* size of DS 2 dataset */
+    float          s1_float[DIM1_SIZE]  = {10, 20, 30};                            /* data of DS 1 dataset */
+    unsigned short s2_ushort[DIM2_SIZE] = {10, 20, 30, 40};                        /* data of DS 2 dataset */
+    const char *   s1_str               = "ABC";
+    const char *   s2_str               = "ABCD";
 
     HDprintf("Testing scales with several datatypes\n");
 
     /*-------------------------------------------------------------------------
-    * create a file for the test
-    *-------------------------------------------------------------------------
-    */
+     * create a file for the test
+     *-------------------------------------------------------------------------
+     */
     /* create a file using default properties */
-    if((fid=H5Fcreate(FILE5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create datasets: 1 "data" dataset and 2 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: 1 "data" dataset and 2 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_a", rank, dims, buf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_float(fid,DS_1_NAME,rankds,s1_dim,s1_float) < 0)
+    if (H5LTmake_dataset_float(fid, DS_1_NAME, rankds, s1_dim, s1_float) < 0)
         goto out;
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset(fid,DS_2_NAME,rankds,s2_dim,H5T_NATIVE_USHORT,s2_ushort) < 0)
+    if (H5LTmake_dataset(fid, DS_2_NAME, rankds, s2_dim, H5T_NATIVE_USHORT, s2_ushort) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * floating point and short scales
-    *-------------------------------------------------------------------------
-    */
+     * floating point and short scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("floating point and short scales");
 
     /* get the dataset id for "dset_a" */
-    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, DS_1_NAME, H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_1_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, DS_2_NAME, H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_2_NAME dimension scale to "dset_a" at dimension 1 */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_2_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* set a label */
-    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+    if (H5DSset_label(did, DIM0, DIM0_LABEL) < 0)
         goto out;
-    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+    if (H5DSset_label(did, DIM1, DIM1_LABEL) < 0)
         goto out;
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * create datasets: 1 "data" dataset and 2 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: 1 "data" dataset and 2 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* make a dataset */
-    if(H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf) < 0)
+    if (H5LTmake_dataset_int(fid, "dset_b", rank, dims, buf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_string(fid,"ds_b_1",s1_str) < 0)
+    if (H5LTmake_dataset_string(fid, "ds_b_1", s1_str) < 0)
         goto out;
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_string(fid,"ds_b_2",s2_str) < 0)
+    if (H5LTmake_dataset_string(fid, "ds_b_2", s2_str) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * floating point and short scales
-    *-------------------------------------------------------------------------
-    */
+     * floating point and short scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("string scales");
 
     /* get the dataset id for "dset_b" */
-    if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset_b", H5P_DEFAULT)) < 0)
         goto out;
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b_1", H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_1_NAME dimension scale to "dset_b" at dimension 0 */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_1_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"ds_b_2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds_b_2", H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_2_NAME dimension scale to "dset_b" at dimension 1 */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_2_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* set a label */
-    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+    if (H5DSset_label(did, DIM0, DIM0_LABEL) < 0)
         goto out;
-    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+    if (H5DSset_label(did, DIM1, DIM1_LABEL) < 0)
         goto out;
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if(H5Fclose(fid) < 0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     return 0;
@@ -4668,7 +4758,8 @@ out:
         H5Dclose(did);
         H5Dclose(dsid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
@@ -4678,144 +4769,142 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int test_data(void)
+static int
+test_data(void)
 {
-    hid_t   fid;                         /* file ID */
-    hid_t   did = -1;                    /* dataset ID */
-    hid_t   dsid = -1;                   /* DS dataset ID */
-    hid_t   dcpl;                        /* dataset creation property list */
-    hid_t   sid;                         /* dataspace ID */
-    float   *vals=NULL;                  /* array to hold data values */
-    float   *latbuf=NULL;                /* array to hold the latitude values */
-    float   *lonbuf=NULL;                /* array to hold the longitude values */
-    hsize_t dims[2];                     /* array to hold dimensions */
-    hsize_t latdims[1];                  /* array to hold dimensions */
-    hsize_t londims[1];                  /* array to hold dimensions */
-    float   fill=-99;                    /* fill value */
-
+    hid_t   fid;           /* file ID */
+    hid_t   did  = -1;     /* dataset ID */
+    hid_t   dsid = -1;     /* DS dataset ID */
+    hid_t   dcpl;          /* dataset creation property list */
+    hid_t   sid;           /* dataspace ID */
+    float * vals   = NULL; /* array to hold data values */
+    float * latbuf = NULL; /* array to hold the latitude values */
+    float * lonbuf = NULL; /* array to hold the longitude values */
+    hsize_t dims[2];       /* array to hold dimensions */
+    hsize_t latdims[1];    /* array to hold dimensions */
+    hsize_t londims[1];    /* array to hold dimensions */
+    float   fill = -99;    /* fill value */
 
     HDprintf("Testing reading ASCII data and generate HDF5 data with scales\n");
 
     /*-------------------------------------------------------------------------
-    * create a file for the test
-    *-------------------------------------------------------------------------
-    */
+     * create a file for the test
+     *-------------------------------------------------------------------------
+     */
     /* create a file using default properties */
-    if((fid=H5Fcreate(FILE6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * generating scales
-    *-------------------------------------------------------------------------
-    */
+     * generating scales
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("generating scales");
 
     /*-------------------------------------------------------------------------
-    * create datasets: 1 "data" dataset and 2 dimension scales
-    *-------------------------------------------------------------------------
-    */
+     * create datasets: 1 "data" dataset and 2 dimension scales
+     *-------------------------------------------------------------------------
+     */
 
     /* read the latitude */
-    if(read_data("dslat.txt",1,latdims,&latbuf) < 0)
+    if (read_data("dslat.txt", 1, latdims, &latbuf) < 0)
         goto out;
 
     /* make a DS dataset for the first dimension */
-    if(H5LTmake_dataset_float(fid, "lat", 1, latdims, latbuf) < 0)
+    if (H5LTmake_dataset_float(fid, "lat", 1, latdims, latbuf) < 0)
         goto out;
 
-    HDfree( latbuf );
+    HDfree(latbuf);
     latbuf = NULL;
 
-     /* read the longitude */
-    if(read_data("dslon.txt",1,londims,&lonbuf) < 0)
+    /* read the longitude */
+    if (read_data("dslon.txt", 1, londims, &lonbuf) < 0)
         goto out;
 
     /* make a DS dataset for the second dimension */
-    if(H5LTmake_dataset_float(fid, "lon", 1, londims, lonbuf) < 0)
+    if (H5LTmake_dataset_float(fid, "lon", 1, londims, lonbuf) < 0)
         goto out;
 
-    HDfree( lonbuf );
+    HDfree(lonbuf);
     lonbuf = NULL;
 
     /* make a dataset for the data. a fill value is set */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
-    if(H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0)
+    if (H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0)
         goto out;
 
     /* read ASCII bathymetry data and dimensions to create dataset */
-    if(read_data("dsdata.txt",2,dims,&vals) < 0)
+    if (read_data("dsdata.txt", 2, dims, &vals) < 0)
         goto out;
 
-    if((sid = H5Screate_simple(2, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims, NULL)) < 0)
         goto out;
-    if((did = H5Dcreate2(fid, "data", H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "data", H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, vals) < 0)
+    if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, vals) < 0)
         goto out;
 
-    HDfree ( vals );
+    HDfree(vals);
     vals = NULL;
 
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto out;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * attach
-    *-------------------------------------------------------------------------
-    */
+     * attach
+     *-------------------------------------------------------------------------
+     */
 
     /* get the dataset id for "data" */
-    if((did = H5Dopen2(fid,"data", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "data", H5P_DEFAULT)) < 0)
         goto out;
 
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"lat", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "lat", H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_1_NAME dimension scale to "data" at dimension 0 */
-    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_1_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* get the DS dataset id */
-    if((dsid = H5Dopen2(fid,"lon", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "lon", H5P_DEFAULT)) < 0)
         goto out;
     /* attach the DS_2_NAME dimension scale to "data" at dimension 1 */
-    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
         goto out;
     /* set name */
-    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+    if (H5DSset_scale(dsid, SCALE_2_NAME) < 0)
         goto out;
     /* close DS id */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         goto out;
     /* set a label */
-    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+    if (H5DSset_label(did, DIM0, DIM0_LABEL) < 0)
         goto out;
-    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+    if (H5DSset_label(did, DIM1, DIM1_LABEL) < 0)
         goto out;
     /* close */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
 
     PASSED();
 
-
-
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if(H5Fclose(fid) < 0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     return 0;
@@ -4827,20 +4916,19 @@ out:
         H5Dclose(did);
         H5Dclose(dsid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
 
     if (latbuf)
-        HDfree( latbuf );
+        HDfree(latbuf);
     if (lonbuf)
-        HDfree( lonbuf );
+        HDfree(lonbuf);
     if (vals)
-        HDfree( vals );
+        HDfree(vals);
     return FAIL;
 }
 
-
-
 /*-------------------------------------------------------------------------
  * read_data
  * utility function to read ASCII data
@@ -4854,34 +4942,32 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int read_data( const char* fname,
-                      int ndims,
-                      hsize_t *dims,
-                      float **buf )
+static int
+read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
 {
-    int      i, n;
-    unsigned j;
-    char     str[20];
-    size_t   nelms;
-    FILE     *f;
-    float    val;
+    int         i, n;
+    unsigned    j;
+    char        str[20];
+    size_t      nelms;
+    FILE *      f;
+    float       val;
     const char *data_file = H5_get_srcdir_filename(fname);
 
     /* read first data file */
     f = HDfopen(data_file, "r");
-    if( f == NULL ) {
-        HDprintf( "Could not open file %s\n", data_file );
+    if (f == NULL) {
+        HDprintf("Could not open file %s\n", data_file);
         return -1;
     }
 
-    for(i=0, nelms=1; i < ndims; i++) {
-        if(fscanf( f, "%s %u", str, &j) && HDferror(f)) {
-            HDprintf( "fscanf error in file %s\n", data_file );
+    for (i = 0, nelms = 1; i < ndims; i++) {
+        if (fscanf(f, "%s %u", str, &j) && HDferror(f)) {
+            HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
         } /* end if */
-        if(fscanf( f, "%d",&n ) < 0 && HDferror(f)) {
-            HDprintf( "fscanf error in file %s\n", data_file );
+        if (fscanf(f, "%d", &n) < 0 && HDferror(f)) {
+            HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
         } /* end if */
@@ -4889,17 +4975,17 @@ static int read_data( const char* fname,
         nelms *= (size_t)n;
     }
 
-    *buf = (float*) HDmalloc (nelms * sizeof( float ));
+    *buf = (float *)HDmalloc(nelms * sizeof(float));
 
-    if ( *buf == NULL ) {
-        HDprintf( "memory allocation failed\n" );
+    if (*buf == NULL) {
+        HDprintf("memory allocation failed\n");
         HDfclose(f);
         return -1;
     }
 
-    for(j = 0; j < nelms; j++) {
-        if(fscanf( f, "%f",&val ) < 0 && HDferror(f)) {
-            HDprintf( "fscanf error in file %s\n", data_file );
+    for (j = 0; j < nelms; j++) {
+        if (fscanf(f, "%f", &val) < 0 && HDferror(f)) {
+            HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
         } /* end if */
@@ -4908,67 +4994,64 @@ static int read_data( const char* fname,
     HDfclose(f);
 
     return 1;
-
 }
 
-
 /*-------------------------------------------------------------------------
  * test parameter errors
  *-------------------------------------------------------------------------
  */
 
-static int test_errors2(void)
+static int
+test_errors2(void)
 {
-    hid_t   fid;                              /* file ID */
-    hid_t   did = -1;                         /* dataset ID */
-    hid_t   dsid = -1;                        /* scale ID */
-    hsize_t dimd[2]  = {3,3};                 /* size of data dataset */
-    hsize_t dims[1]  = {3};                   /* size of scale dataset */
-    char    lbuf[255];                        /* label buffer */
-    ssize_t label_len;                        /* label length */
-    int     scale_idx;                        /* scale index */
-    int     nscales;                          /* number of scales in DIM */
-    int     count;                            /* visitor data */
+    hid_t   fid;              /* file ID */
+    hid_t   did     = -1;     /* dataset ID */
+    hid_t   dsid    = -1;     /* scale ID */
+    hsize_t dimd[2] = {3, 3}; /* size of data dataset */
+    hsize_t dims[1] = {3};    /* size of scale dataset */
+    char    lbuf[255];        /* label buffer */
+    ssize_t label_len;        /* label length */
+    int     scale_idx;        /* scale index */
+    int     nscales;          /* number of scales in DIM */
+    int     count;            /* visitor data */
 
     HDprintf("Testing parameter errors\n");
 
     /*-------------------------------------------------------------------------
-    * create a file, a dataset, scales
-    *-------------------------------------------------------------------------
-    */
+     * create a file, a dataset, scales
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    if ((fid=H5Fcreate(FILE7,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(FILE7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* make a dataset */
-    if (H5LTmake_dataset_int(fid,"dset",2,dimd,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "dset", 2, dimd, NULL) < 0)
         goto out;
 
     /* make a scale dataset  */
-    if(H5LTmake_dataset_int(fid,"ds1",1,dims,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds1", 1, dims, NULL) < 0)
         goto out;
 
     /* make a scale dataset  */
-    if(H5LTmake_dataset_int(fid,"ds2",1,dims,NULL) < 0)
+    if (H5LTmake_dataset_int(fid, "ds2", 1, dims, NULL) < 0)
         goto out;
 
-
     HL_TESTING2("attach scales");
 
-
     /*-------------------------------------------------------------------------
-    * attach with invalid indices
-    *-------------------------------------------------------------------------
-    */
+     * attach with invalid indices
+     *-------------------------------------------------------------------------
+     */
 
-    if ((did = H5Dopen2(fid,"dset", H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, "dset", H5P_DEFAULT)) < 0)
         goto out;
-    if ((dsid = H5Dopen2(fid,"ds1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds1", H5P_DEFAULT)) < 0)
         goto out;
-    if (H5DSattach_scale(did,dsid,2) == SUCCEED)
+    if (H5DSattach_scale(did, dsid, 2) == SUCCEED)
         goto out;
-    if (H5DSattach_scale(did,dsid,0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
     if (H5Dclose(dsid) < 0)
         goto out;
@@ -4980,16 +5063,16 @@ static int test_errors2(void)
     HL_TESTING2("detach scales");
 
     /*-------------------------------------------------------------------------
-    * detach with invalid indices
-    *-------------------------------------------------------------------------
-    */
-    if ((did = H5Dopen2(fid,"dset", H5P_DEFAULT)) < 0)
+     * detach with invalid indices
+     *-------------------------------------------------------------------------
+     */
+    if ((did = H5Dopen2(fid, "dset", H5P_DEFAULT)) < 0)
         goto out;
-    if ((dsid = H5Dopen2(fid,"ds1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds1", H5P_DEFAULT)) < 0)
         goto out;
-    if (H5DSdetach_scale(did,dsid,2) == SUCCEED)
+    if (H5DSdetach_scale(did, dsid, 2) == SUCCEED)
         goto out;
-    if (H5DSdetach_scale(did,dsid,0) < 0)
+    if (H5DSdetach_scale(did, dsid, 0) < 0)
         goto out;
     if (H5Dclose(dsid) < 0)
         goto out;
@@ -5001,22 +5084,22 @@ static int test_errors2(void)
     HL_TESTING2("set/get label");
 
     /*-------------------------------------------------------------------------
-    * set/get label invalid indices
-    *-------------------------------------------------------------------------
-    */
-    if ((did = H5Dopen2(fid,"dset", H5P_DEFAULT)) < 0)
+     * set/get label invalid indices
+     *-------------------------------------------------------------------------
+     */
+    if ((did = H5Dopen2(fid, "dset", H5P_DEFAULT)) < 0)
         goto out;
-    if (H5DSset_label(did,2,"label")== SUCCEED)
+    if (H5DSset_label(did, 2, "label") == SUCCEED)
         goto out;
-    if (H5DSset_label(did,0,"label") < 0)
+    if (H5DSset_label(did, 0, "label") < 0)
         goto out;
-    if (H5DSget_label(did,2,lbuf,sizeof(lbuf)) == SUCCEED)
+    if (H5DSget_label(did, 2, lbuf, sizeof(lbuf)) == SUCCEED)
         goto out;
-    if ((label_len=H5DSget_label(did,0,NULL,0)) < 0)
+    if ((label_len = H5DSget_label(did, 0, NULL, 0)) < 0)
         goto out;
-    if ( label_len != HDstrlen("label") )
+    if (label_len != HDstrlen("label"))
         goto out;
-    if (H5DSget_label(did,0,lbuf,sizeof(lbuf)) < 0)
+    if (H5DSget_label(did, 0, lbuf, sizeof(lbuf)) < 0)
         goto out;
     if (H5Dclose(did) < 0)
         goto out;
@@ -5025,70 +5108,68 @@ static int test_errors2(void)
 
     HL_TESTING2("iterate scales");
 
-
     /*-------------------------------------------------------------------------
-    * iterate_scales invalid indices and return DS_IDX and visitor data
-    *-------------------------------------------------------------------------
-    */
-    if ((did = H5Dopen2(fid,"dset", H5P_DEFAULT)) < 0)
+     * iterate_scales invalid indices and return DS_IDX and visitor data
+     *-------------------------------------------------------------------------
+     */
+    if ((did = H5Dopen2(fid, "dset", H5P_DEFAULT)) < 0)
         goto out;
 
-    if ((dsid = H5Dopen2(fid,"ds1", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds1", H5P_DEFAULT)) < 0)
         goto out;
-    if (H5DSattach_scale(did,dsid,0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
     if (H5Dclose(dsid) < 0)
         goto out;
 
-    if ((dsid = H5Dopen2(fid,"ds2", H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, "ds2", H5P_DEFAULT)) < 0)
         goto out;
-    if (H5DSattach_scale(did,dsid,0) < 0)
+    if (H5DSattach_scale(did, dsid, 0) < 0)
         goto out;
     if (H5Dclose(dsid) < 0)
         goto out;
 
-    if((nscales = H5DSget_num_scales(did,0)) < 0)
+    if ((nscales = H5DSget_num_scales(did, 0)) < 0)
         goto out;
-    if(nscales!=2)
+    if (nscales != 2)
         goto out;
 
     /* invalid DIM */
-    if (H5DSiterate_scales(did,2,NULL,op_continue,NULL)== SUCCEED)
+    if (H5DSiterate_scales(did, 2, NULL, op_continue, NULL) == SUCCEED)
         goto out;
     /* invalid DS_IDX */
     scale_idx = 2;
-    if (H5DSiterate_scales(did,0,&scale_idx,op_continue,NULL)== SUCCEED)
+    if (H5DSiterate_scales(did, 0, &scale_idx, op_continue, NULL) == SUCCEED)
         goto out;
 
     /* continue iteration */
     scale_idx = 0;
-    count = 0;
-    if (H5DSiterate_scales(did,0,&scale_idx,op_continue,(void *)&count) < 0)
+    count     = 0;
+    if (H5DSiterate_scales(did, 0, &scale_idx, op_continue, (void *)&count) < 0)
         goto out;
 
-    if ( scale_idx != 1 && count != nscales ) {
+    if (scale_idx != 1 && count != nscales) {
         goto out;
     }
 
     /* stop iteration */
     scale_idx = 0;
-    count = 0;
-    if (H5DSiterate_scales(did,0,&scale_idx,op_stop,(void *)&count) < 0)
+    count     = 0;
+    if (H5DSiterate_scales(did, 0, &scale_idx, op_stop, (void *)&count) < 0)
         goto out;
 
-    if ( scale_idx != 0 && count != 1 ) {
+    if (scale_idx != 0 && count != 1) {
         goto out;
     }
 
-
     if (H5Dclose(did) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if(H5Fclose(fid) < 0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     PASSED();
@@ -5102,7 +5183,8 @@ out:
         H5Dclose(did);
         H5Dclose(dsid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
@@ -5112,220 +5194,219 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int test_attach_detach(void)
+static int
+test_attach_detach(void)
 {
-    hid_t          fid;                                              /* file ID */
-    hid_t          gid;                                              /* group ID */
-    hid_t          sid;                                              /* dataspace ID */
-    hid_t          dcpl_id;                                          /* dataset creation property */
-    hid_t          dsid = -1;                                        /* DS dataset ID */
-    hid_t          var1_id, var2_id, var3_id;                        /* DS component name */
-    hsize_t        dims[RANK1] = {DIM1};
+    hid_t   fid;                       /* file ID */
+    hid_t   gid;                       /* group ID */
+    hid_t   sid;                       /* dataspace ID */
+    hid_t   dcpl_id;                   /* dataset creation property */
+    hid_t   dsid = -1;                 /* DS dataset ID */
+    hid_t   var1_id, var2_id, var3_id; /* DS component name */
+    hsize_t dims[RANK1] = {DIM1};
 
     HL_TESTING2("permutations of attaching and detaching");
 
-    if((fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-      goto out;
+    if ((fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
-      goto out;
+    if ((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
+        goto out;
 
     /* Create dimension scale. */
 
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-      goto out;
+    if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
 
-    if((sid = H5Screate_simple(1, dims, dims)) < 0)
-      goto out;
+    if ((sid = H5Screate_simple(1, dims, dims)) < 0)
+        goto out;
 
-    if((dsid = H5Dcreate2(gid, DS_3_NAME, H5T_IEEE_F32BE, sid,
-         H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
-      goto out;
+    if ((dsid = H5Dcreate2(gid, DS_3_NAME, H5T_IEEE_F32BE, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0)
-      goto out;
-    if(H5Pclose(dcpl_id) < 0)
-      goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (H5Pclose(dcpl_id) < 0)
+        goto out;
 
-    if(H5DSset_scale(dsid, DS_3_NAME) < 0)
-      goto out;
+    if (H5DSset_scale(dsid, DS_3_NAME) < 0)
+        goto out;
 
     /* Create a variable that uses this dimension scale. */
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
-      goto out;
+    if ((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
-    if((var1_id = H5Dcreate2(gid, DS_31_NAME, H5T_NATIVE_FLOAT, sid,
-            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-      goto out;
+    if ((var1_id =
+             H5Dcreate2(gid, DS_31_NAME, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0)
-      goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Create another variable that uses this dimension scale. */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-      goto out;
+    if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
 
-    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
-      goto out;
+    if (H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
+        goto out;
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
-      goto out;
+    if ((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
-    if((var2_id = H5Dcreate2(gid, DS_32_NAME, H5T_NATIVE_FLOAT, sid,
-           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0)
-      goto out;
+    if ((var2_id =
+             H5Dcreate2(gid, DS_32_NAME, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Pclose(dcpl_id) < 0)
-      goto out;
+    if (H5Pclose(dcpl_id) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0)
-      goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
 
     /* Create 3rd variable that uses this dimension scale. */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-      goto out;
+    if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
 
-    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
-      goto out;
+    if (H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
+        goto out;
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
-      goto out;
+    if ((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
-    if((var3_id = H5Dcreate2(gid, DS_33_NAME, H5T_NATIVE_FLOAT, sid,
-           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0)
-      goto out;
+    if ((var3_id =
+             H5Dcreate2(gid, DS_33_NAME, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Pclose(dcpl_id) < 0)
-      goto out;
+    if (H5Pclose(dcpl_id) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0)
-      goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
 
     /* Attached var2 scale */
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Detach the var2 scale */
-    if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
-    if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
 
     /* Detach the var1 scale */
-    if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
-    if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
 
     /* Attach the DS again and remove them in the opposite order */
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Detach the var1 scale */
-    if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
 
-    if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) == 0) /* should still be attached */
+        goto out;
 
     /* Detach the var2 scale */
-    if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
-    if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
 
     /***************************************************
      * Attach Three DS and remove the middle one first
      *****************************************************/
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
-      goto out;
-
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var3_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
+    if (H5DSattach_scale(var3_id, dsid, 0) < 0)
+        goto out;
 
     /* Detach the var2 scale */
-    if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
 
-    if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var3_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var3_id, dsid, 0) == 0) /* should still be attached */
+        goto out;
 
     /* Detach the var3 scale */
-    if(H5DSdetach_scale(var3_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var3_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
-    if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
 
     /* Detach the var1 scale */
-    if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+    if (H5DSdetach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
-    if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
-    if(H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+    if (H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
+    if (H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
+        goto out;
 
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
+     * close
+     *-------------------------------------------------------------------------
+     */
 
-    if(H5Dclose(var1_id) < 0)
-      goto out;
-    if(H5Dclose(var2_id) < 0)
-      goto out;
-    if(H5Dclose(var3_id) < 0)
-      goto out;
-    if(H5Dclose(dsid) < 0)
-      goto out;
-    if(H5Gclose(gid) < 0)
-      goto out;
-    if(H5Fclose(fid) < 0)
-      goto out;
+    if (H5Dclose(var1_id) < 0)
+        goto out;
+    if (H5Dclose(var2_id) < 0)
+        goto out;
+    if (H5Dclose(var3_id) < 0)
+        goto out;
+    if (H5Dclose(dsid) < 0)
+        goto out;
+    if (H5Gclose(gid) < 0)
+        goto out;
+    if (H5Fclose(fid) < 0)
+        goto out;
 
     PASSED();
 
@@ -5335,13 +5416,14 @@ static int test_attach_detach(void)
 out:
     H5E_BEGIN_TRY
     {
-  H5Dclose(var1_id);
-  H5Dclose(var2_id);
-  H5Dclose(var3_id);
+        H5Dclose(var1_id);
+        H5Dclose(var2_id);
+        H5Dclose(var3_id);
         H5Dclose(dsid);
         H5Gclose(gid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index 1914a08..c5cffca 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <math.h>
 #include <stdlib.h>
@@ -19,21 +19,21 @@
 #include "H5DOpublic.h"
 
 #if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
-# define H5_ZLIB_HEADER "zlib.h"
+#define H5_ZLIB_HEADER "zlib.h"
 #endif
 #if defined(H5_ZLIB_HEADER)
-#include H5_ZLIB_HEADER     /* "zlib.h" */
+#include H5_ZLIB_HEADER /* "zlib.h" */
 #endif
 
-#define FILENAME            "test_append.h5"
-#define DNAME_NOTSET        "dataset_notset"
-#define DNAME_UNLIM         "dataset_unlim"
-#define DNAME_LESS          "dataset_less"
-#define DNAME_VARY          "dataset_vary"
-#define DNAME_ROW           "dataset_row"
-#define DNAME_COLUMN        "dataset_column"
-#define DBUGNAME1           "dataset_bug1"
-#define DBUGNAME2           "dataset_bug2"
+#define FILENAME     "test_append.h5"
+#define DNAME_NOTSET "dataset_notset"
+#define DNAME_UNLIM  "dataset_unlim"
+#define DNAME_LESS   "dataset_less"
+#define DNAME_VARY   "dataset_vary"
+#define DNAME_ROW    "dataset_row"
+#define DNAME_COLUMN "dataset_column"
+#define DBUGNAME1    "dataset_bug1"
+#define DBUGNAME2    "dataset_bug2"
 
 /*-------------------------------------------------------------------------
  * Function:    test_dataset_append_notset
@@ -52,67 +52,67 @@
 static int
 test_dataset_append_notset(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {H5S_UNLIMITED, 20};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                /* Chunk dimension sizes */
-    int lbuf[10];                        /* The data buffers */
-    int i, j;                                /* Local index variables */
-    h5_stat_t  sb1, sb2;                /* File info */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t   dims[2]       = {0, 10};             /* Current dimension sizes */
+    hsize_t   maxdims[2]    = {H5S_UNLIMITED, 20}; /* Maximum dimension sizes */
+    hsize_t   chunk_dims[2] = {2, 5};              /* Chunk dimension sizes */
+    int       lbuf[10];                            /* The data buffers */
+    int       i, j;                                /* Local index variables */
+    h5_stat_t sb1, sb2;                            /* File info */
 
     HL_TESTING2("Append flush with H5DOappend()--append rows with default dapl");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_NOTSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_NOTSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Append 6 rows to the dataset */
-    for(i = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++)
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++)
             lbuf[j] = (i * 10) + (j + 1);
         /* Append without boundary, callback and flush */
-        if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
 
     /* File size when not flushed */
-    if(HDstat(FILENAME, &sb1) < 0)
+    if (HDstat(FILENAME, &sb1) < 0)
         TEST_ERROR;
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* File size after flushing */
-    if(HDstat(FILENAME, &sb2) < 0)
+    if (HDstat(FILENAME, &sb2) < 0)
         TEST_ERROR;
 
     /* File size before flushing should be less */
-    if(sb1.st_size > sb2.st_size)
+    if (sb1.st_size > sb2.st_size)
         TEST_ERROR;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -120,12 +120,14 @@ test_dataset_append_notset(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_notset() */
@@ -134,7 +136,7 @@ error:
 static herr_t
 flush_func(hid_t H5_ATTR_UNUSED obj_id, void *_udata)
 {
-    unsigned *flush_ct = (unsigned*)_udata;
+    unsigned *flush_ct = (unsigned *)_udata;
     ++(*flush_ct);
     return 0;
 }
@@ -165,125 +167,125 @@ append_func(hid_t H5_ATTR_UNUSED dset_id, hsize_t H5_ATTR_UNUSED *cur_dims, void
 static int
 test_dataset_append_rows_columns(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t dapl = -1;                        /* A copy of dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t dapl  = -1; /* A copy of dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
 
-    hsize_t dims[2] = {0, 10};                                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                                /* Chunk dimension sizes */
-    int lbuf[10], cbuf[6];                /* The data buffers */
-    int buf[6][13], rbuf[6][13];        /* The data buffers */
+    hsize_t dims[2]       = {0, 10};                        /* Current dimension sizes */
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};                         /* Chunk dimension sizes */
+    int     lbuf[10], cbuf[6];                              /* The data buffers */
+    int     buf[6][13], rbuf[6][13];                        /* The data buffers */
 
-    hsize_t boundary[2] = {1, 1};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hsize_t   boundary[2] = {1, 1}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
-    int i, j;                                /* Local index variables */
+    int i, j; /* Local index variables */
 
     HL_TESTING2("Append flush with H5DOappend()--append rows & columns");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_UNLIM, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_UNLIM, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
-    for(i = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++)
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++)
             lbuf[j] = buf[i][j] = (i * 10) + (j + 1);
-        if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 6)
+    if (append_ct != 6)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 6)
+    if (*flush_ptr != 6)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset */
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 6; j++)
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 6; j++)
             cbuf[j] = buf[j][i + 10] = ((i * 6) + (j + 1)) * -1;
-        if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 9)
+    if (append_ct != 9)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 9)
+    if (*flush_ptr != 9)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Clear the buffer */
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DNAME_UNLIM, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DNAME_UNLIM, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -291,13 +293,15 @@ test_dataset_append_rows_columns(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl);
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_rows_columns() */
@@ -319,105 +323,105 @@ error:
 static int
 test_dataset_append_rows(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t dapl = -1;                        /* A copy of dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {H5S_UNLIMITED, 10};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                /* Chunk dimension sizes */
-    int lbuf[10];                        /* The data buffer */
-    int buf[6][10], rbuf[6][10];        /* The data buffers */
-    int i, j;                                /* Local index variables */
-
-    hsize_t boundary[2] = {1, 0};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t dapl  = -1; /* A copy of dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {0, 10};             /* Current dimension sizes */
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, 10}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};              /* Chunk dimension sizes */
+    int     lbuf[10];                            /* The data buffer */
+    int     buf[6][10], rbuf[6][10];             /* The data buffers */
+    int     i, j;                                /* Local index variables */
+
+    hsize_t   boundary[2] = {1, 0}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append rows");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 1 extendible dimension */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_ROW, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_ROW, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
-    for(i = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++)
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++)
             lbuf[j] = buf[i][j] = (i * 10) + (j + 1);
-        if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 6)
+    if (append_ct != 6)
         TEST_ERROR;
 
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 6)
+    if (*flush_ptr != 6)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 10; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 10; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Clear the buffer */
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DNAME_ROW, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DNAME_ROW, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 10; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 10; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -425,13 +429,15 @@ test_dataset_append_rows(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl);
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_rows() */
@@ -453,106 +459,106 @@ error:
 static int
 test_dataset_append_columns(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t dapl = -1;                        /* A copy of dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {6, 0};                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {6, H5S_UNLIMITED};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                /* Chunk dimension sizes */
-    int cbuf[6];                                /* The data buffer */
-    int buf[6][3], rbuf[6][3];                        /* The data buffers */
-    int i, j;                                        /* Local index variable */
-
-    hsize_t boundary[2] = {0, 1};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t dapl  = -1; /* A copy of dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {6, 0};             /* Current dimension sizes */
+    hsize_t maxdims[2]    = {6, H5S_UNLIMITED}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};             /* Chunk dimension sizes */
+    int     cbuf[6];                            /* The data buffer */
+    int     buf[6][3], rbuf[6][3];              /* The data buffers */
+    int     i, j;                               /* Local index variable */
+
+    hsize_t   boundary[2] = {0, 1}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append columns");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 1 extendible dimension */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_COLUMN, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_COLUMN, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset */
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 6; j++)
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 6; j++)
             cbuf[j] = buf[j][i] = ((i * 6) + (j + 1)) * -1;
-        if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 3)
+    if (append_ct != 3)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 3)
+    if (*flush_ptr != 3)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 3; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 3; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Clear the buffer */
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DNAME_COLUMN, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DNAME_COLUMN, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 3; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 3; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -560,13 +566,15 @@ test_dataset_append_columns(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl);
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_columns() */
@@ -597,123 +605,123 @@ error:
 static int
 test_dataset_append_BUG1(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* Dataset creation property */
-    hid_t dapl = -1;                        /* Dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {H5S_UNLIMITED, 50};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                /* Chunk dimension sizes */
-    int lbuf[10], cbuf[6];                /* The data buffers */
-    int buf[6][13], rbuf[6][13];        /* The data buffers */
-    int i, j;                                /* Local index variables */
-
-    hsize_t boundary[2] = {1, 1};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* Dataset creation property */
+    hid_t dapl  = -1; /* Dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {0, 10};             /* Current dimension sizes */
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, 50}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};              /* Chunk dimension sizes */
+    int     lbuf[10], cbuf[6];                   /* The data buffers */
+    int     buf[6][13], rbuf[6][13];             /* The data buffers */
+    int     i, j;                                /* Local index variables */
+
+    hsize_t   boundary[2] = {1, 1}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append rows & columns--BUG1");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DBUGNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DBUGNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
-    for(i = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++)
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++)
             lbuf[j] = buf[i][j] = (i * 10) + (j + 1);
-        if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 6)
+    if (append_ct != 6)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 6)
+    if (*flush_ptr != 6)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset */
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 6; j++)
-            cbuf[j] = buf[j][i+10] = ((i * 6) + (j + 1)) * -1;
-        if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 6; j++)
+            cbuf[j] = buf[j][i + 10] = ((i * 6) + (j + 1)) * -1;
+        if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 9)
+    if (append_ct != 9)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 9)
+    if (*flush_ptr != 9)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DBUGNAME1, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DBUGNAME1, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -721,13 +729,15 @@ test_dataset_append_BUG1(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Pclose(dapl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_BUG1() */
@@ -758,124 +768,123 @@ error:
 static int
 test_dataset_append_BUG2(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* Dataset creation property */
-    hid_t dapl = -1;                        /* Dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {50, H5S_UNLIMITED};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                /* Chunk dimension sizes */
-    int lbuf[10], cbuf[6];                        /* Data buffers */
-    int buf[6][13], rbuf[6][13];                /* Data buffers */
-    int i, j;                                        /* Local index variables */
-
-    hsize_t boundary[2] = {1, 1};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* Dataset creation property */
+    hid_t dapl  = -1; /* Dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {0, 10};             /* Current dimension sizes */
+    hsize_t maxdims[2]    = {50, H5S_UNLIMITED}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};              /* Chunk dimension sizes */
+    int     lbuf[10], cbuf[6];                   /* Data buffers */
+    int     buf[6][13], rbuf[6][13];             /* Data buffers */
+    int     i, j;                                /* Local index variables */
+
+    hsize_t   boundary[2] = {1, 1}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append rows & columns--BUG2");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DBUGNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DBUGNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
-    for(i = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++)
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++)
             lbuf[j] = buf[i][j] = (i * 10) + (j + 1);
-        if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
+        if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)1, H5T_NATIVE_INT, lbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 6)
+    if (append_ct != 6)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 6)
+    if (*flush_ptr != 6)
         TEST_ERROR;
 
-
     /* Append 3 columns to the dataset */
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 6; j++)
-            cbuf[j] = buf[j][i+10] = ((i * 6) + (j + 1)) * -1;
-        if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 6; j++)
+            cbuf[j] = buf[j][i + 10] = ((i * 6) + (j + 1)) * -1;
+        if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)1, H5T_NATIVE_INT, cbuf) < 0)
             TEST_ERROR;
     } /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 9)
+    if (append_ct != 9)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 9)
+    if (*flush_ptr != 9)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DBUGNAME2, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DBUGNAME2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -883,18 +892,19 @@ test_dataset_append_BUG2(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Pclose(dapl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_BUG2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_dataset_append_less
  *
@@ -913,127 +923,127 @@ error:
 static int
 test_dataset_append_less(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t dapl = -1;                        /* A copy of dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                /* Current dimension sizes */
-    hsize_t maxdims[2] = {100, 100};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};        /* Chunk dimension sizes */
-    int lbuf[20], cbuf[6][3];                /* Data buffers */
-    int buf[6][13], rbuf[6][13];        /* Data buffers */
-    int i, j, k;                        /* Local index variables */
-
-    hsize_t boundary[2] = {3, 3};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t dapl  = -1; /* A copy of dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {0, 10};    /* Current dimension sizes */
+    hsize_t maxdims[2]    = {100, 100}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};     /* Chunk dimension sizes */
+    int     lbuf[20], cbuf[6][3];       /* Data buffers */
+    int     buf[6][13], rbuf[6][13];    /* Data buffers */
+    int     i, j, k;                    /* Local index variables */
+
+    hsize_t   boundary[2] = {3, 3}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append size < boundary size");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_LESS, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_LESS, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append to the dataset 2 rows at a time for 3 times */
-    for(i = 0, k = 0; i < 6; i++) {
-        for(j = 0; j < 10; j++, k++)
+    for (i = 0, k = 0; i < 6; i++) {
+        for (j = 0; j < 10; j++, k++)
             buf[i][j] = lbuf[k] = (i * 10) + (j + 1);
 
-        if((i + 1) % 2 == 0) {
-            if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)2, H5T_NATIVE_INT, lbuf) < 0)
+        if ((i + 1) % 2 == 0) {
+            if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)2, H5T_NATIVE_INT, lbuf) < 0)
                 TEST_ERROR;
             k = 0;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Verify the # of appends */
-    if(append_ct != 2)
+    if (append_ct != 2)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 2)
+    if (*flush_ptr != 2)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset, once */
-    for(i = 0; i < 3; i++)
-        for(j = 0; j < 6; j++, k++)
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 6; j++, k++)
             cbuf[j][i] = buf[j][i + 10] = ((i * 6) + (j + 1)) * -1;
-    if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)3, H5T_NATIVE_INT, cbuf) < 0)
+    if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)3, H5T_NATIVE_INT, cbuf) < 0)
         TEST_ERROR;
 
     /* Verify the # of appends */
-    if(append_ct != 3)
+    if (append_ct != 3)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 3)
+    if (*flush_ptr != 3)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Clear the buffer */
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DNAME_LESS, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DNAME_LESS, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -1041,13 +1051,15 @@ test_dataset_append_less(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl);
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_less() */
@@ -1073,122 +1085,122 @@ error:
 static int
 test_dataset_append_vary(hid_t fid)
 {
-    hid_t did = -1;                        /* Dataset ID */
-    hid_t sid = -1;                        /* Dataspace ID */
-    hid_t dcpl = -1;                        /* A copy of dataset creation property */
-    hid_t dapl = -1;                        /* A copy of dataset access property */
-    hid_t ffapl = -1;                        /* The file's file access property list */
-
-    hsize_t dims[2] = {0, 10};                                        /* Current dimension sizes */
-    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};        /* Maximum dimension sizes */
-    hsize_t chunk_dims[2] = {2,5};                                /* Chunk dimension sizes */
-    int lbuf[60], cbuf[6][3];                /* Data buffers */
-    int buf[6][13], rbuf[6][13];        /* Data buffers */
-    int i, j, k;                        /* Local index variables */
-
-    hsize_t boundary[2] = {3, 7};        /* Boundary sizes */
-    unsigned append_ct = 0;                /* The # of appends */
-    unsigned *flush_ptr;                /* Points to the flush counter */
+    hid_t did   = -1; /* Dataset ID */
+    hid_t sid   = -1; /* Dataspace ID */
+    hid_t dcpl  = -1; /* A copy of dataset creation property */
+    hid_t dapl  = -1; /* A copy of dataset access property */
+    hid_t ffapl = -1; /* The file's file access property list */
+
+    hsize_t dims[2]       = {0, 10};                        /* Current dimension sizes */
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes */
+    hsize_t chunk_dims[2] = {2, 5};                         /* Chunk dimension sizes */
+    int     lbuf[60], cbuf[6][3];                           /* Data buffers */
+    int     buf[6][13], rbuf[6][13];                        /* Data buffers */
+    int     i, j, k;                                        /* Local index variables */
+
+    hsize_t   boundary[2] = {3, 7}; /* Boundary sizes */
+    unsigned  append_ct   = 0;      /* The # of appends */
+    unsigned *flush_ptr;            /* Points to the flush counter */
 
     HL_TESTING2("Append flush with H5DOappend()--append & boundary size vary");
 
     /* Get the file's file access property list */
-    if((ffapl = H5Fget_access_plist(fid)) < 0)
+    if ((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
+    if (H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_VARY, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
+    if ((did = H5Dcreate2(fid, DNAME_VARY, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset, once */
-    for(i = 0, k = 0; i < 6; i++)
-        for(j = 0; j < 10; j++, k++)
+    for (i = 0, k = 0; i < 6; i++)
+        for (j = 0; j < 10; j++, k++)
             buf[i][j] = lbuf[k] = (i * 10) + (j + 1);
-    if(H5DOappend(did, H5P_DEFAULT, 0, (size_t)6, H5T_NATIVE_INT, lbuf) < 0)
+    if (H5DOappend(did, H5P_DEFAULT, 0, (size_t)6, H5T_NATIVE_INT, lbuf) < 0)
         TEST_ERROR;
 
     /* Verify the # of appends */
-    if(append_ct != 1)
+    if (append_ct != 1)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 1)
+    if (*flush_ptr != 1)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset, once */
-    for(i = 0; i < 3; i++)
-        for(j = 0; j < 6; j++, k++)
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 6; j++, k++)
             cbuf[j][i] = buf[j][i + 10] = ((i * 6) + (j + 1)) * -1;
-    if(H5DOappend(did, H5P_DEFAULT, 1, (size_t)3, H5T_NATIVE_INT, cbuf) < 0)
+    if (H5DOappend(did, H5P_DEFAULT, 1, (size_t)3, H5T_NATIVE_INT, cbuf) < 0)
         TEST_ERROR;
 
     /* Verify the # of appends */
-    if(append_ct != 1)
+    if (append_ct != 1)
         TEST_ERROR;
 
     /* Retrieve and verify object flush counts */
-    if(H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
+    if (H5Pget_object_flush_cb(ffapl, NULL, (void **)&flush_ptr) < 0)
         FAIL_STACK_ERROR;
-    if(*flush_ptr != 1)
+    if (*flush_ptr != 1)
         TEST_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Clear the dataset */
     HDmemset(rbuf, 0, sizeof(rbuf));
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
 
     /* Open the dataset again */
-    if((did = H5Dopen2(fid, DNAME_VARY, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DNAME_VARY, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Read the dataset */
-    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
 
     /* Verify the data */
-    for(i = 0; i < 6; i++)
-        for(j = 0; j < 13; j++)
-            if(buf[i][j] != rbuf[i][j])
+    for (i = 0; i < 6; i++)
+        for (j = 0; j < 13; j++)
+            if (buf[i][j] != rbuf[i][j])
                 TEST_ERROR;
 
     /* Closing */
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dapl) < 0)
+    if (H5Pclose(dapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Pclose(ffapl) < 0)
+    if (H5Pclose(ffapl) < 0)
         FAIL_STACK_ERROR;
 
     PASSED();
@@ -1196,13 +1208,15 @@ test_dataset_append_vary(hid_t fid)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl);
         H5Pclose(dcpl);
         H5Pclose(sid);
         H5Dclose(did);
         H5Pclose(ffapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return 1;
 } /* test_dataset_append_vary() */
@@ -1219,64 +1233,66 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-int main(void)
+int
+main(void)
 {
-    hid_t fid = -1;                /* File ID */
-    hid_t fapl = -1;                /* File access property list */
-    unsigned flush_ct = 0;        /* The # of flushes */
-    int   nerrors = 0;                /* The # of errors encountered */
+    hid_t    fid      = -1; /* File ID */
+    hid_t    fapl     = -1; /* File access property list */
+    unsigned flush_ct = 0;  /* The # of flushes */
+    int      nerrors  = 0;  /* The # of errors encountered */
 
     /* Get a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to use the latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         FAIL_STACK_ERROR;
 
     /* Set object flush property */
-    if(H5Pset_object_flush_cb(fapl, flush_func, &flush_ct) < 0)
+    if (H5Pset_object_flush_cb(fapl, flush_func, &flush_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the test file */
-    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR;
 
     nerrors += test_dataset_append_notset(fid);
 
     nerrors += test_dataset_append_rows(fid);
 
-    flush_ct = 0;        /* Reset flush counter */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_columns(fid);
 
-    flush_ct = 0;        /* Reset flush counter */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_rows_columns(fid);
 
-/*
- * The following tests illustrate the scenarios when H5DOappend does not work with extensible array indexing:
- *        - when the the dataset has 1 unlimited dimension and the other dimension is fixed but extendible
- *        - the dataset expands along 1 dimension and then expands along the other dimension
- */
-    flush_ct = 0;        /* Reset flush counter */
+    /*
+     * The following tests illustrate the scenarios when H5DOappend does not work with extensible array
+     * indexing:
+     *        - when the the dataset has 1 unlimited dimension and the other dimension is fixed but extendible
+     *        - the dataset expands along 1 dimension and then expands along the other dimension
+     */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_BUG1(fid);
 
-    flush_ct = 0;        /* Reset flush counter */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_BUG2(fid);
 
-    flush_ct = 0;        /* Reset flush counter */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_less(fid);
 
-    flush_ct = 0;        /* Reset flush counter */
+    flush_ct = 0; /* Reset flush counter */
     nerrors += test_dataset_append_vary(fid);
 
     /* Closing */
-    if(H5Pclose(fapl) < 0)
+    if (H5Pclose(fapl) < 0)
         FAIL_STACK_ERROR;
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         FAIL_STACK_ERROR;
 
     /* Check for errors */
-    if(nerrors)
+    if (nerrors)
         goto error;
 
     return EXIT_SUCCESS;
@@ -1284,4 +1300,3 @@ int main(void)
 error:
     return EXIT_FAILURE;
 }
-
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index fd2d0d2..863279c 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5hltest.h"
 #include "H5LTpublic.h"
@@ -21,8 +21,8 @@
 /* For superblock version 0, 1: the offset to "file consistency flags" is 20 with size of 4 bytes */
 /* The file consistency flags is the "status_flags" field in H5F_super_t */
 /* Note: the offset and size will be different when using superblock version 2 for the test file */
-#define SUPER_STATUS_FLAGS_OFF_V0_V1    20
-#define SUPER_STATUS_FLAGS_SIZE_V0_V1   4
+#define SUPER_STATUS_FLAGS_OFF_V0_V1  20
+#define SUPER_STATUS_FLAGS_SIZE_V0_V1 4
 
 /* Test of file image operations.
 
@@ -47,32 +47,32 @@
    buffers if appropriate.                                                   */
 
 /*-------------------------------------------------------------------------
-* test file image operations
-*-------------------------------------------------------------------------
-*/
+ * test file image operations
+ *-------------------------------------------------------------------------
+ */
 static int
 test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 {
-    hid_t       *file_id, *dset_id, file_space, plist; /* HDF5 ids */
-    hsize_t     dims1[RANK] = {2,3};    /* original dimension of datasets */
-    hsize_t     max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED};
-    int         data1[6] = {1,2,3,4,5,6}; /* original contents of dataset */
-    int         data2[6] = {7,8,9,10,11,12}; /* "wrong" contents of dataset */
-    hsize_t     dims3[RANK];            /* array to read dataset dimensions */
-    int         data3[15];              /* array to read dataset contents */
-    hsize_t     dims4[RANK] = {3,5};    /* extended dimensions of datasets */
-    int         data4[15] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
-                                        /* extended contents of dataset */
-    ssize_t     *buf_size;              /* pointer to array of buffer sizes */
-    void        **buf_ptr;              /* pointer to array of pointers to image buffers */
-    char        **filename;             /* pointer to array of pointers to filenames */
-    unsigned    *input_flags;           /* pointer to array of flag combinations */
-    size_t      i, j, k, nrow, n_values;
-    herr_t      status1;
-    void        *handle_ptr = NULL;     /* pointers to driver buffer */
+    hid_t * file_id, *dset_id, file_space, plist; /* HDF5 ids */
+    hsize_t dims1[RANK]    = {2, 3};              /* original dimension of datasets */
+    hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED};
+    int     data1[6]       = {1, 2, 3, 4, 5, 6};    /* original contents of dataset */
+    int     data2[6]       = {7, 8, 9, 10, 11, 12}; /* "wrong" contents of dataset */
+    hsize_t dims3[RANK];                            /* array to read dataset dimensions */
+    int     data3[15];                              /* array to read dataset contents */
+    hsize_t dims4[RANK] = {3, 5};                   /* extended dimensions of datasets */
+    int     data4[15]   = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+    /* extended contents of dataset */
+    ssize_t *       buf_size;    /* pointer to array of buffer sizes */
+    void **         buf_ptr;     /* pointer to array of pointers to image buffers */
+    char **         filename;    /* pointer to array of pointers to filenames */
+    unsigned *      input_flags; /* pointer to array of flag combinations */
+    size_t          i, j, k, nrow, n_values;
+    herr_t          status1;
+    void *          handle_ptr       = NULL; /* pointers to driver buffer */
     unsigned char **core_buf_ptr_ptr = NULL;
 
-    VERIFY(open_images > 1 , "The number of open images must be greater than 1");
+    VERIFY(open_images > 1, "The number of open images must be greater than 1");
 
     VERIFY(nflags > 0, "The number of flag combinations  must be greater than 0");
 
@@ -131,7 +131,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             FAIL_PUTS_ERROR("H5Pset_chunk() failed");
 
         /* create and write an integer type dataset named "dset" */
-        if ((dset_id[i] = H5Dcreate2(file_id[i], DSET_NAME, H5T_NATIVE_INT, file_space, H5P_DEFAULT, plist, H5P_DEFAULT)) < 0)
+        if ((dset_id[i] = H5Dcreate2(file_id[i], DSET_NAME, H5T_NATIVE_INT, file_space, H5P_DEFAULT, plist,
+                                     H5P_DEFAULT)) < 0)
             FAIL_PUTS_ERROR("H5Dcreate() failed");
 
         /* dataset in open image 1 is written with "wrong" data */
@@ -172,7 +173,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* buffer for file image 2 is filled with counter data (non-valid image) */
         if (i == 2) {
             for (j = 0; j < (size_t)buf_size[i]; j++)
-                ((char*)(buf_ptr[i]))[j] = (char)j;
+                ((char *)(buf_ptr[i]))[j] = (char)j;
         } /* end if */
         /* buffers for the rest of the file images are filled with data from the respective files */
         else {
@@ -181,7 +182,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         } /* end else */
 
         /* file close */
-        if (H5Fclose (file_id[i]) < 0)
+        if (H5Fclose(file_id[i]) < 0)
             FAIL_PUTS_ERROR("H5Fclose() failed");
     } /* end for */
 
@@ -193,10 +194,12 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
     for (i = 0; i < open_images; i++) {
         /* open file image 2 filled with counter data (non-valid image) */
         if (i == 2) {
-            H5E_BEGIN_TRY {
+            H5E_BEGIN_TRY
+            {
                 /* attempt to set file image in the core driver */
                 file_id[i] = H5LTopen_file_image(buf_ptr[i], (size_t)buf_size[i], input_flags[i]);
-            } H5E_END_TRY
+            }
+            H5E_END_TRY
 
             VERIFY(file_id[i] < 0, "H5LTopen_file_image() should have failed");
         } /* end if */
@@ -208,36 +211,41 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 
             /* get pointer to the image buffer of the core driver */
             if (H5Fget_vfd_handle(file_id[i], H5P_DEFAULT, &handle_ptr) < 0)
-               FAIL_PUTS_ERROR("H5Fget_vfd_handle() failed");
+                FAIL_PUTS_ERROR("H5Fget_vfd_handle() failed");
 
             core_buf_ptr_ptr = (unsigned char **)handle_ptr;
 
             /* test whether the user buffer has been copied or not */
             if (input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY)
-                VERIFY(*core_buf_ptr_ptr == buf_ptr[i], "vfd buffer and user buffer should have been the same");
+                VERIFY(*core_buf_ptr_ptr == buf_ptr[i],
+                       "vfd buffer and user buffer should have been the same");
             else
                 VERIFY(*core_buf_ptr_ptr != buf_ptr[i], "vfd buffer and user buffer should be different");
 
-        /*
+            /*
              *  When the vfd and user buffers are different and H5LT_FILE_IMAGE_OPEN_RW is enabled,
              *  status_flags in the superblock needs to be cleared in the vfd buffer for
              *  the comparison to proceed as expected.  The user buffer as returned from H5Fget_file_image()
              *  has already cleared status_flags.  The superblock's status_flags is used for the
              *  implementation of file locking.
              */
-            if(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW && !(input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY)) {
+            if (input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW && !(input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY)) {
 
                 void *tmp_ptr = HDmalloc((size_t)buf_size[i]);
                 /* Copy vfd buffer to a temporary buffer */
                 HDmemcpy(tmp_ptr, (void *)*core_buf_ptr_ptr, (size_t)buf_size[i]);
-                /* Clear status_flags in the superblock for the vfd buffer: file locking is using status_flags */
-                HDmemset((uint8_t *)tmp_ptr + SUPER_STATUS_FLAGS_OFF_V0_V1, (int)0, (size_t)SUPER_STATUS_FLAGS_SIZE_V0_V1);
+                /* Clear status_flags in the superblock for the vfd buffer: file locking is using status_flags
+                 */
+                HDmemset((uint8_t *)tmp_ptr + SUPER_STATUS_FLAGS_OFF_V0_V1, (int)0,
+                         (size_t)SUPER_STATUS_FLAGS_SIZE_V0_V1);
                 /* Does the comparision */
-                if(HDmemcmp(tmp_ptr, buf_ptr[i], (size_t)buf_size[i]) != 0)
+                if (HDmemcmp(tmp_ptr, buf_ptr[i], (size_t)buf_size[i]) != 0)
                     FAIL_PUTS_ERROR("comparison of TMP vfd and user buffer failed");
                 /* Free the temporary buffer */
-                if(tmp_ptr) HDfree(tmp_ptr);
-            } else {
+                if (tmp_ptr)
+                    HDfree(tmp_ptr);
+            }
+            else {
 
                 /* test whether the contents of the user buffer and driver buffer */
                 /* are equal.                                                     */
@@ -245,7 +253,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                     FAIL_PUTS_ERROR("comparison of vfd and user buffer failed");
             }
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     PASSED();
 
@@ -272,7 +280,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             FAIL_PUTS_ERROR("H5Sget_simple_extent_dims() failed");
 
         /* read dataset */
-        if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data3) < 0)
+        if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data3) < 0)
             FAIL_PUTS_ERROR("H5Dread() failed");
 
         /* compute number of elements in dataset */
@@ -286,7 +294,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             /* compare file image values with original data */
             for (j = 0; j < n_values / nrow; j++)
                 for (k = 0; k < nrow; k++)
-                    if (data3[j * nrow + k ] == data1[j * nrow + k ])
+                    if (data3[j * nrow + k] == data1[j * nrow + k])
                         FAIL_PUTS_ERROR("comparison of image values with original data should have failed");
         } /* end if */
         /* verify contents for the rest of the file images */
@@ -294,12 +302,12 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             /* compare file image values with original data */
             for (j = 0; j < n_values / nrow; j++)
                 for (k = 0; k < nrow; k++)
-                    if (data3[j * nrow + k ] != data1[j * nrow + k ])
+                    if (data3[j * nrow + k] != data1[j * nrow + k])
                         FAIL_PUTS_ERROR("comparison of image values with original data failed");
         } /* end else */
 
         /* close dataspace */
-        if (H5Sclose (file_space) < 0)
+        if (H5Sclose(file_space) < 0)
             FAIL_PUTS_ERROR("H5Sclose() failed");
     } /* end for */
 
@@ -318,23 +326,29 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* test data write when file image access is read-only */
         if (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW)) {
             /* write dataset without extending it */
-            H5E_BEGIN_TRY {
-                status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data1);
-            } H5E_END_TRY;
+            H5E_BEGIN_TRY
+            {
+                status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
+            }
+            H5E_END_TRY;
 
             VERIFY(status1 < 0, "H5Dwrite() should have failed");
 
             /* extend dimensions of dataset */
-            H5E_BEGIN_TRY {
+            H5E_BEGIN_TRY
+            {
                 status1 = H5Dset_extent(dset_id[i], dims4);
-            } H5E_END_TRY;
+            }
+            H5E_END_TRY;
 
             VERIFY(status1 < 0, "H5Dset_extent() should have failed");
 
             /* write extended dataset */
-            H5E_BEGIN_TRY {
-                status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data4);
-            } H5E_END_TRY;
+            H5E_BEGIN_TRY
+            {
+                status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data4);
+            }
+            H5E_END_TRY;
 
             VERIFY(status1 < 0, "H5Dwrite() should have failed");
 
@@ -344,7 +358,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         } /* end if */
         /* test data write where file image access is read-write */
         else {
-            if ((input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY) && (input_flags[i] & H5LT_FILE_IMAGE_DONT_RELEASE)) {
+            if ((input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY) &&
+                (input_flags[i] & H5LT_FILE_IMAGE_DONT_RELEASE)) {
 /* This test is disabled currently, since the new attribute causes the file
  * to increase in size, but the realloc call in H5FD_core_write() fails, causing
  * the flush operation to fail and the file to fail to close, eventually
@@ -396,13 +411,13 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                     H5Aclose(attr_id);
                 } H5E_END_TRY;
 #endif
-        if (H5Dclose(dset_id[i]) < 0)
-            FAIL_PUTS_ERROR("H5Dclose() failed");
-        dset_id[i] = -1;
+                if (H5Dclose(dset_id[i]) < 0)
+                    FAIL_PUTS_ERROR("H5Dclose() failed");
+                dset_id[i] = -1;
             } /* end if */
             else {
                 /* write dataset without extending it */
-                if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data1) < 0)
+                if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1) < 0)
                     FAIL_PUTS_ERROR("H5Dwrite() failed");
 
                 /* extend dimensions of dataset */
@@ -410,15 +425,15 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                     FAIL_PUTS_ERROR("H5Dset_extent() failed");
 
                 /* write extended dataset */
-                if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data4) < 0)
+                if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data4) < 0)
                     FAIL_PUTS_ERROR("H5Dwrite() failed");
 
                 /* close dataset */
                 if (H5Dclose(dset_id[i]) < 0)
                     FAIL_PUTS_ERROR("H5Dclose() failed");
             } /* end else */
-        } /* end else */
-    } /* end for */
+        }     /* end else */
+    }         /* end for */
 
     PASSED();
 
@@ -427,7 +442,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
     /* read open file images and verify data */
     for (i = 0; i < open_images; i++) {
         /* if opening the file image failed, continue next iteration */
-        if ((dset_id[i] < 0) || (file_id[i] <  0) || (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW )))
+        if ((dset_id[i] < 0) || (file_id[i] < 0) || (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW)))
             continue;
 
         /* open dataset in file image */
@@ -443,7 +458,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             FAIL_PUTS_ERROR("H5Sget_simple_extent_dims() failed");
 
         /* read dataset */
-        if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data3) < 0)
+        if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data3) < 0)
             FAIL_PUTS_ERROR("H5Dread() failed");
 
         /* compute number of elements in dataset */
@@ -455,11 +470,11 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* verify contents for the file images */
         for (j = 0; j < n_values / nrow; j++)
             for (k = 0; k < nrow; k++)
-                if (data3[j * nrow + k ] != data4[j * nrow + k ])
+                if (data3[j * nrow + k] != data4[j * nrow + k])
                     FAIL_PUTS_ERROR("comparison of image values with original data failed");
 
         /* close dataspace */
-        if (H5Sclose (file_space) < 0)
+        if (H5Sclose(file_space) < 0)
             FAIL_PUTS_ERROR("H5Sclose() failed");
 
         /* close dataset */
@@ -485,7 +500,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             FAIL_PUTS_ERROR("HDremove() failed");
 
         /* free shared buffer if appropriate */
-        if (!(input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY) || (input_flags[i] & H5LT_FILE_IMAGE_DONT_RELEASE)) {
+        if (!(input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY) ||
+            (input_flags[i] & H5LT_FILE_IMAGE_DONT_RELEASE)) {
             VERIFY(buf_ptr[i] != NULL, "buffer pointer must be non NULL");
             HDfree(buf_ptr[i]);
         } /* end if */
@@ -512,15 +528,16 @@ error:
 }
 
 /*-------------------------------------------------------------------------
-* the main program
-*-------------------------------------------------------------------------
-*/
-int main( void )
+ * the main program
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
 {
-    int       nerrors = 0;
-    size_t    open_images = 10; /* number of open file images */
-    size_t    nflags = 8; /* number of flag combinations */
-    unsigned  flags[8]; /* array with flag combinations */
+    int      nerrors     = 0;
+    size_t   open_images = 10; /* number of open file images */
+    size_t   nflags      = 8;  /* number of flag combinations */
+    unsigned flags[8];         /* array with flag combinations */
 
     /* set flag combinations for testing */
     flags[0] = 0;
@@ -533,14 +550,14 @@ int main( void )
     flags[7] = H5LT_FILE_IMAGE_OPEN_RW | H5LT_FILE_IMAGE_DONT_COPY | H5LT_FILE_IMAGE_DONT_RELEASE;
 
     /* Test file image operations. The flag combinations are assigned to file images in round-robin fashion */
-    nerrors += test_file_image(open_images, nflags, flags) < 0? 1 : 0;
+    nerrors += test_file_image(open_images, nflags, flags) < 0 ? 1 : 0;
 
-    if (nerrors) goto error;
+    if (nerrors)
+        goto error;
     HDprintf("File image tests passed.\n");
     return 0;
 
 error:
-    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
-
diff --git a/hl/test/test_h5do_compat.c b/hl/test/test_h5do_compat.c
index 75028fb..7efef3f 100644
--- a/hl/test/test_h5do_compat.c
+++ b/hl/test/test_h5do_compat.c
@@ -20,12 +20,11 @@
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 
-#define FILE_NAME       "h5do_compat.h5"
-#define DATASET_NAME    "direct_chunk_io"
-
-#define NX              8
-#define CHUNK_NX        4
+#define FILE_NAME    "h5do_compat.h5"
+#define DATASET_NAME "direct_chunk_io"
 
+#define NX       8
+#define CHUNK_NX 4
 
 /*-------------------------------------------------------------------------
  * Function:    test_direct_chunk_write
@@ -40,12 +39,12 @@
 static hid_t
 create_dataset(hid_t fid)
 {
-    hid_t   did             = H5I_INVALID_HID;
-    hid_t   sid             = H5I_INVALID_HID;
-    hid_t   dcpl_id         = H5I_INVALID_HID;
-    hsize_t dims[1]         = {NX};
-    hsize_t maxdims[1]      = {H5S_UNLIMITED};
-    hsize_t chunk_dims[1]   = {CHUNK_NX};
+    hid_t   did           = H5I_INVALID_HID;
+    hid_t   sid           = H5I_INVALID_HID;
+    hid_t   dcpl_id       = H5I_INVALID_HID;
+    hsize_t dims[1]       = {NX};
+    hsize_t maxdims[1]    = {H5S_UNLIMITED};
+    hsize_t chunk_dims[1] = {CHUNK_NX};
     int     data[NX];
     int     i;
 
@@ -79,19 +78,19 @@ create_dataset(hid_t fid)
 
     return did;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Sclose(sid);
         H5Pclose(dcpl_id);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return H5I_INVALID_HID;
 
 } /* end create_dataset() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    test_direct_chunk_write
  *
@@ -105,11 +104,11 @@ create_dataset(hid_t fid)
 static int
 test_direct_chunk_write(hid_t did)
 {
-    unsigned    filter_mask = 0;
-    int         chunk_data[CHUNK_NX];
-    hsize_t     offset[1];
-    size_t      data_size;
-    int         i;
+    unsigned filter_mask = 0;
+    int      chunk_data[CHUNK_NX];
+    hsize_t  offset[1];
+    size_t   data_size;
+    int      i;
 
     HL_TESTING2("H5DOwrite_chunk wrapper");
 
@@ -124,7 +123,7 @@ test_direct_chunk_write(hid_t did)
      * dataset, using the direct writing function.
      */
     offset[0] = 0;
-    for (i = 0; i < NX/CHUNK_NX; i++) {
+    for (i = 0; i < NX / CHUNK_NX; i++) {
         if (H5DOwrite_chunk(did, H5P_DEFAULT, filter_mask, offset, data_size, chunk_data) < 0)
             TEST_ERROR
         offset[0] += CHUNK_NX;
@@ -138,7 +137,6 @@ error:
     return 1;
 } /* test_direct_chunk_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_direct_chunk_read
  *
@@ -152,22 +150,22 @@ error:
 static int
 test_direct_chunk_read(hid_t did)
 {
-    hid_t       mem_sid         = H5I_INVALID_HID;
-    hid_t       file_sid        = H5I_INVALID_HID;
-    hsize_t     dims[1]         = {NX};
-    hsize_t     chunk_dims[1]   = {CHUNK_NX};
+    hid_t   mem_sid       = H5I_INVALID_HID;
+    hid_t   file_sid      = H5I_INVALID_HID;
+    hsize_t dims[1]       = {NX};
+    hsize_t chunk_dims[1] = {CHUNK_NX};
 
-    unsigned    filter_mask;
-    int         chunk_data[CHUNK_NX];   /* Chunk read with H5DOread_chunk */
-    int         check[CHUNK_NX];        /* Chunk read with H5Dread */
-    hsize_t     offset[1];
+    unsigned filter_mask;
+    int      chunk_data[CHUNK_NX]; /* Chunk read with H5DOread_chunk */
+    int      check[CHUNK_NX];      /* Chunk read with H5Dread */
+    hsize_t  offset[1];
 
-    hsize_t     start[1];  /* Start of hyperslab */
-    hsize_t     stride[1]; /* Stride of hyperslab */
-    hsize_t     count[1];  /* Block count */
-    hsize_t     block[1];  /* Block sizes */
+    hsize_t start[1];  /* Start of hyperslab */
+    hsize_t stride[1]; /* Stride of hyperslab */
+    hsize_t count[1];  /* Block count */
+    hsize_t block[1];  /* Block sizes */
 
-    int         i,j;
+    int i, j;
 
     HL_TESTING2("H5DOread_chunk wrapper");
 
@@ -178,7 +176,7 @@ test_direct_chunk_read(hid_t did)
         TEST_ERROR
 
     /* For each chunk in the dataset, compare the result of H5Dread and H5DOread_chunk. */
-    for (i = 0; i < NX/CHUNK_NX; i++) {
+    for (i = 0; i < NX / CHUNK_NX; i++) {
 
         /* Select hyperslab for one chunk in the file */
         start[0]  = (hsize_t)i * CHUNK_NX;
@@ -197,7 +195,7 @@ test_direct_chunk_read(hid_t did)
         /* Read the raw chunk back */
         HDmemset(chunk_data, 0, CHUNK_NX * sizeof(int));
         filter_mask = UINT_MAX;
-        offset[0] = (hsize_t)i * CHUNK_NX;
+        offset[0]   = (hsize_t)i * CHUNK_NX;
         if (H5DOread_chunk(did, H5P_DEFAULT, offset, &filter_mask, chunk_data) < 0)
             TEST_ERROR
 
@@ -221,10 +219,12 @@ test_direct_chunk_read(hid_t did)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Sclose(mem_sid);
         H5Sclose(file_sid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
@@ -232,7 +232,6 @@ error:
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -244,7 +243,8 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-int main( void )
+int
+main(void)
 {
 #ifdef H5_NO_DEPRECATED_SYMBOLS
 
@@ -254,9 +254,9 @@ int main( void )
 
 #else
 
-    hid_t   fid         = H5I_INVALID_HID;
-    hid_t   did         = H5I_INVALID_HID;
-    int     nerrors     = 0;
+    hid_t fid     = H5I_INVALID_HID;
+    hid_t did     = H5I_INVALID_HID;
+    int   nerrors = 0;
 
     if ((fid = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 6d13419..c67b04f 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <limits.h>
 #include <stdlib.h>
@@ -39,10 +39,9 @@
 #define PAL3_NAME   "earth"
 #define PAL4_NAME   "blue-red"
 
-
-#define WIDTH        400
-#define HEIGHT       200
-#define PAL_ENTRIES  256
+#define WIDTH       400
+#define HEIGHT      200
+#define PAL_ENTRIES 256
 
 /* struct to store RGB values read from a .pal file */
 typedef struct rgb_t {
@@ -55,54 +54,57 @@ typedef struct rgb_t {
 static int test_simple(void);
 static int test_data(void);
 static int test_generate(void);
-static int read_data(const char* file_name, hsize_t *width, hsize_t *height );
-static int read_palette(const char* file_name, rgb_t *palette, size_t palette_size);
+static int read_data(const char *file_name, hsize_t *width, hsize_t *height);
+static int read_palette(const char *file_name, rgb_t *palette, size_t palette_size);
 
 /* globals */
 unsigned char *image_data = NULL;
 
 /*-------------------------------------------------------------------------
-* the main program
-*-------------------------------------------------------------------------
-*/
+ * the main program
+ *-------------------------------------------------------------------------
+ */
 
-int main(void)
+int
+main(void)
 {
-    int nerrors=0;
+    int nerrors = 0;
 
-    nerrors += test_simple()<0  ?1:0;
-    nerrors += test_data()<0  ?1:0;
-    nerrors += test_generate()<0  ?1:0;
+    nerrors += test_simple() < 0 ? 1 : 0;
+    nerrors += test_data() < 0 ? 1 : 0;
+    nerrors += test_generate() < 0 ? 1 : 0;
 
-    if (nerrors) goto error;
+    if (nerrors)
+        goto error;
     HDprintf("All image tests passed.\n");
     return 0;
 
 error:
-    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
 /*-------------------------------------------------------------------------
-* a simple test that generates images and palettes
-*-------------------------------------------------------------------------
-*/
+ * a simple test that generates images and palettes
+ *-------------------------------------------------------------------------
+ */
 
-static int test_simple(void)
+static int
+test_simple(void)
 {
-    hsize_t       width    = WIDTH;
-    hsize_t       height   = HEIGHT;
-    hsize_t       planes;
-    hid_t         fid;
-    int           i, j, n, space;
-    hsize_t       u;
-    char          interlace[20];
-    hssize_t      npals;
+    hsize_t  width  = WIDTH;
+    hsize_t  height = HEIGHT;
+    hsize_t  planes;
+    hid_t    fid;
+    int      i, j, n, space;
+    hsize_t  u;
+    char     interlace[20];
+    hssize_t npals;
 
     /* 8-bit image */
     unsigned char *buf1 = NULL;
-    unsigned char pal[ PAL_ENTRIES * 3 ];        /* palette array */
-    hsize_t       pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
+    unsigned char  pal[PAL_ENTRIES * 3];           /* palette array */
+    hsize_t        pal_dims[2] = {PAL_ENTRIES, 3}; /* palette dimensions */
 
     /* 24-bit image */
     unsigned char *buf2 = NULL;
@@ -110,395 +112,376 @@ static int test_simple(void)
     /* read data */
     unsigned char *buf1_out = NULL;
     unsigned char *buf2_out = NULL;
-    unsigned char pal_out[ PAL_ENTRIES * 3 ];    /* palette array */
-    hsize_t       pal_dims_out[2];               /* palette dimensions */
+    unsigned char  pal_out[PAL_ENTRIES * 3]; /* palette array */
+    hsize_t        pal_dims_out[2];          /* palette dimensions */
 
     /* Allocate image buffers */
     buf1 = (unsigned char *)HDmalloc(WIDTH * HEIGHT);
     HDassert(buf1);
-    buf2  = (unsigned char *)HDmalloc(WIDTH * HEIGHT * 3);
+    buf2 = (unsigned char *)HDmalloc(WIDTH * HEIGHT * 3);
     HDassert(buf2);
     buf1_out = (unsigned char *)HDmalloc(WIDTH * HEIGHT);
     HDassert(buf1_out);
-    buf2_out  = (unsigned char *)HDmalloc(WIDTH * HEIGHT * 3);
+    buf2_out = (unsigned char *)HDmalloc(WIDTH * HEIGHT * 3);
     HDassert(buf2_out);
 
     /* create an image */
-    space = WIDTH*HEIGHT / PAL_ENTRIES;
-    for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
-    {
+    space = WIDTH * HEIGHT / PAL_ENTRIES;
+    for (i = 0, j = 0, n = 0; i < WIDTH * HEIGHT; i++, j++) {
         buf1[i] = (unsigned char)n;
-        if ( j > space )
-        {
+        if (j > space) {
             n++;
-            j=0;
+            j = 0;
         }
-
     }
 
     /* create an image */
-    space = WIDTH*HEIGHT / 256;
-    for (i=0, j=0, n=0; i < WIDTH*HEIGHT*3; i+=3, j++ )
-    {
-        buf2[i]   = (unsigned char)n;
-        buf2[i+1] = 0;
-        buf2[i+2] = (unsigned char)(255 - n);
-        if ( j > space )
-        {
+    space = WIDTH * HEIGHT / 256;
+    for (i = 0, j = 0, n = 0; i < WIDTH * HEIGHT * 3; i += 3, j++) {
+        buf2[i]     = (unsigned char)n;
+        buf2[i + 1] = 0;
+        buf2[i + 2] = (unsigned char)(255 - n);
+        if (j > space) {
             n++;
-            j=0;
+            j = 0;
         }
     }
 
     /*-------------------------------------------------------------------------
-    * define a palette, blue to red tones
-    *-------------------------------------------------------------------------
-    */
-    for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
-    {
-        pal[i]  =(unsigned char)n;      /* red */
-        pal[i+1]=0;      /* green */
-        pal[i+2]=(unsigned char)(255 - n);  /* blue */
+     * define a palette, blue to red tones
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0, n = 0; i < PAL_ENTRIES * 3; i += 3, n++) {
+        pal[i]     = (unsigned char)n;         /* red */
+        pal[i + 1] = 0;                        /* green */
+        pal[i + 2] = (unsigned char)(255 - n); /* blue */
     }
 
     /* Create a new HDF5 file using default properties. */
-    fid = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+    fid = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * Indexed image test
-    *-------------------------------------------------------------------------
-    */
+     * Indexed image test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("indexed image");
 
     /* Write image */
-    if ( H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, buf1 ) < 0 )
+    if (H5IMmake_image_8bit(fid, IMAGE1_NAME, width, height, buf1) < 0)
         goto out;
 
     /* Make a palette */
-    if ( H5IMmake_palette( fid, PAL_NAME, pal_dims, pal ) < 0 )
+    if (H5IMmake_palette(fid, PAL_NAME, pal_dims, pal) < 0)
         goto out;
 
     /* Attach a palette to the image dataset */
-    if ( H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME ) < 0 )
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL_NAME) < 0)
         goto out;
 
     /* Read image */
-    if ( H5IMget_image_info( fid, IMAGE1_NAME, &width, &height, &planes, interlace, &npals ) < 0 )
+    if (H5IMget_image_info(fid, IMAGE1_NAME, &width, &height, &planes, interlace, &npals) < 0)
         goto out;
 
-    if ( H5IMread_image( fid, IMAGE1_NAME, buf1_out ) < 0 )
+    if (H5IMread_image(fid, IMAGE1_NAME, buf1_out) < 0)
         goto out;
 
-    for (u = 0; u < height*width*planes; u++)
-    {
-        if ( buf1[u] != buf1_out[u] )
+    for (u = 0; u < height * width * planes; u++) {
+        if (buf1[u] != buf1_out[u])
             goto out;
-
     }
 
-
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * True color image test
-    *-------------------------------------------------------------------------
-    */
+     * True color image test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("true color image");
 
     /* Write image */
-    if ( H5IMmake_image_24bit( fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", buf2 ) )
+    if (H5IMmake_image_24bit(fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", buf2))
         goto out;
 
     /* Read image */
-    if ( H5IMget_image_info( fid, IMAGE2_NAME, &width, &height, &planes, interlace, &npals ) < 0 )
+    if (H5IMget_image_info(fid, IMAGE2_NAME, &width, &height, &planes, interlace, &npals) < 0)
         goto out;
 
-    if ( H5IMread_image( fid, IMAGE2_NAME, buf2_out ) < 0 )
+    if (H5IMread_image(fid, IMAGE2_NAME, buf2_out) < 0)
         goto out;
 
-    for (u = 0; u < height*width*planes; u++)
-    {
-        if ( buf2[u] != buf2_out[u] )
+    for (u = 0; u < height * width * planes; u++) {
+        if (buf2[u] != buf2_out[u])
             goto out;
     }
 
-
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5IMget_npalettes test
-    *-------------------------------------------------------------------------
-    */
+     * H5IMget_npalettes test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("pallete functions");
 
-    if ( H5IMget_npalettes( fid, IMAGE1_NAME, &npals ) < 0 )
+    if (H5IMget_npalettes(fid, IMAGE1_NAME, &npals) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * H5IMget_palette_info test
-    *-------------------------------------------------------------------------
-    */
+     * H5IMget_palette_info test
+     *-------------------------------------------------------------------------
+     */
 
-    if ( H5IMget_palette_info( fid, IMAGE1_NAME, 0, pal_dims_out ) < 0 )
+    if (H5IMget_palette_info(fid, IMAGE1_NAME, 0, pal_dims_out) < 0)
         goto out;
 
-    for (i = 0; i < 2; i++)
-    {
-        if ( pal_dims[i] != pal_dims_out[i] )
+    for (i = 0; i < 2; i++) {
+        if (pal_dims[i] != pal_dims_out[i])
             goto out;
     }
 
     /*-------------------------------------------------------------------------
-    * H5IMget_palette test
-    *-------------------------------------------------------------------------
-    */
+     * H5IMget_palette test
+     *-------------------------------------------------------------------------
+     */
 
-    if ( H5IMget_palette( fid, IMAGE1_NAME, 0, pal_out ) < 0 )
+    if (H5IMget_palette(fid, IMAGE1_NAME, 0, pal_out) < 0)
         goto out;
 
-    for (i = 0; i < PAL_ENTRIES * 3; i++)
-    {
-        if ( pal[i] != pal_out[i] )
+    for (i = 0; i < PAL_ENTRIES * 3; i++) {
+        if (pal[i] != pal_out[i])
             goto out;
     }
 
     /*-------------------------------------------------------------------------
-    * H5IMis_image test
-    *-------------------------------------------------------------------------
-    */
+     * H5IMis_image test
+     *-------------------------------------------------------------------------
+     */
 
-    if ( H5IMis_image( fid, IMAGE1_NAME ) < 0 )
+    if (H5IMis_image(fid, IMAGE1_NAME) < 0)
         goto out;
 
-    if ( H5IMis_image( fid, IMAGE2_NAME ) < 0 )
+    if (H5IMis_image(fid, IMAGE2_NAME) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * H5IMis_palette test
-    *-------------------------------------------------------------------------
-    */
+     * H5IMis_palette test
+     *-------------------------------------------------------------------------
+     */
 
-    if ( H5IMis_palette( fid, PAL_NAME ) < 0 )
+    if (H5IMis_palette(fid, PAL_NAME) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * end tests
-    *-------------------------------------------------------------------------
-    */
+     * end tests
+     *-------------------------------------------------------------------------
+     */
 
-    if(buf1)
+    if (buf1)
         HDfree(buf1);
-    if(buf2)
+    if (buf2)
         HDfree(buf2);
-    if(buf1_out)
+    if (buf1_out)
         HDfree(buf1_out);
-    if(buf2_out)
+    if (buf2_out)
         HDfree(buf2_out);
 
     /* Close the file. */
-    if(H5Fclose( fid ) < 0)
+    if (H5Fclose(fid) < 0)
         goto out;
 
-
     PASSED();
 
     return 0;
 
     /* error zone, gracefully close */
 out:
-    if(buf1)
+    if (buf1)
         HDfree(buf1);
-    if(buf2)
+    if (buf2)
         HDfree(buf2);
-    if(buf1_out)
+    if (buf1_out)
         HDfree(buf1_out);
-    if(buf2_out)
+    if (buf2_out)
         HDfree(buf2_out);
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     H5_FAILED();
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
-* read sample realistic image data from ASCII files
-*-------------------------------------------------------------------------
-*/
+ * read sample realistic image data from ASCII files
+ *-------------------------------------------------------------------------
+ */
 
-static int test_data(void)
+static int
+test_data(void)
 {
-    hid_t          fid;
-    hsize_t        pal_dims[2];
-    hsize_t        width;
-    hsize_t        height;
-    unsigned char  pal[256*3]; /* buffer to hold an HDF5 palette */
-    rgb_t          rgb[256];   /* buffer to hold a .pal file palette */
-    int            i, n;
+    hid_t         fid;
+    hsize_t       pal_dims[2];
+    hsize_t       width;
+    hsize_t       height;
+    unsigned char pal[256 * 3]; /* buffer to hold an HDF5 palette */
+    rgb_t         rgb[256];     /* buffer to hold a .pal file palette */
+    int           i, n;
 
     /* create a file using default properties */
-    if ((fid=H5Fcreate(FILE2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+    if ((fid = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     HDprintf("Testing read ascii image data and generate images\n");
 
     /*-------------------------------------------------------------------------
-    * read 8bit image data
-    *-------------------------------------------------------------------------
-    */
+     * read 8bit image data
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make indexed image");
 
     /* read first data file */
-    if (read_data(DATA_FILE1,&width,&height)<0)
+    if (read_data(DATA_FILE1, &width, &height) < 0)
         goto out;
 
     /* make an image */
-    if (H5IMmake_image_8bit(fid,IMAGE1_NAME,width,height,image_data)<0)
+    if (H5IMmake_image_8bit(fid, IMAGE1_NAME, width, height, image_data) < 0)
         goto out;
 
     PASSED();
 
-
     HL_TESTING2("attaching palettes");
 
     /*-------------------------------------------------------------------------
-    * palette #1. rainbow palette. data is contained in "pal_rgb.h"
-    *-------------------------------------------------------------------------
-    */
+     * palette #1. rainbow palette. data is contained in "pal_rgb.h"
+     *-------------------------------------------------------------------------
+     */
 
     /* initialize the palette data */
     pal_dims[0] = 256;
     pal_dims[1] = 3;
 
     /* make a palette */
-    if (H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb)<0)
+    if (H5IMmake_palette(fid, PAL1_NAME, pal_dims, pal_rgb) < 0)
         goto out;
 
     /* attach a palette to the image dataset */
-    if (H5IMlink_palette(fid,IMAGE1_NAME,PAL1_NAME)<0)
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL1_NAME) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * palette #2. sepia palette.
-    * read a PAL file and attach the palette to the HDF5 file
-    *-------------------------------------------------------------------------
-    */
+     * palette #2. sepia palette.
+     * read a PAL file and attach the palette to the HDF5 file
+     *-------------------------------------------------------------------------
+     */
 
     /* read a PAL file */
     if (read_palette(PAL2_FILE, rgb, (sizeof(rgb) / sizeof(rgb[0]))) < 0)
         goto out;
 
     /* transfer to the HDF5 buffer */
-    for ( i=0, n=0; i<256*3; i+=3, n++)
-    {
-        pal[i]  =rgb[n].r;
-        pal[i+1]=rgb[n].g;
-        pal[i+2]=rgb[n].b;
+    for (i = 0, n = 0; i < 256 * 3; i += 3, n++) {
+        pal[i]     = rgb[n].r;
+        pal[i + 1] = rgb[n].g;
+        pal[i + 2] = rgb[n].b;
     }
 
     /* make a palette */
-    if (H5IMmake_palette(fid,PAL2_NAME,pal_dims,pal)<0)
+    if (H5IMmake_palette(fid, PAL2_NAME, pal_dims, pal) < 0)
         goto out;
 
     /* attach the palette to the image dataset */
-    if (H5IMlink_palette(fid,IMAGE1_NAME,PAL2_NAME)<0)
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL2_NAME) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * palette #3. earth palette.
-    * read a PAL file and attach the palette to the HDF5 file
-    *-------------------------------------------------------------------------
-    */
+     * palette #3. earth palette.
+     * read a PAL file and attach the palette to the HDF5 file
+     *-------------------------------------------------------------------------
+     */
 
     /* read a PAL file */
     if (read_palette(PAL3_FILE, rgb, (sizeof(rgb) / sizeof(rgb[0]))) < 0)
         goto out;
 
     /* transfer to the HDF5 buffer */
-    for ( i=0, n=0; i<256*3; i+=3, n++)
-    {
-        pal[i]  =rgb[n].r;
-        pal[i+1]=rgb[n].g;
-        pal[i+2]=rgb[n].b;
+    for (i = 0, n = 0; i < 256 * 3; i += 3, n++) {
+        pal[i]     = rgb[n].r;
+        pal[i + 1] = rgb[n].g;
+        pal[i + 2] = rgb[n].b;
     }
 
     /* make a palette */
-    if (H5IMmake_palette(fid,PAL3_NAME,pal_dims,pal)<0)
+    if (H5IMmake_palette(fid, PAL3_NAME, pal_dims, pal) < 0)
         goto out;
 
     /* attach the palette to the image dataset */
-    if (H5IMlink_palette(fid,IMAGE1_NAME,PAL3_NAME)<0)
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL3_NAME) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * palette #4. blue-red
-    * make a palette whith blue to red colors
-    *-------------------------------------------------------------------------
-    */
-    for ( i=0, n=0; i<256*3; i+=3, n++)
-    {
-        pal[i]  =(unsigned char)n;
-        pal[i+1]=0;
-        pal[i+2]=(unsigned char)(255 - n);
+     * palette #4. blue-red
+     * make a palette whith blue to red colors
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0, n = 0; i < 256 * 3; i += 3, n++) {
+        pal[i]     = (unsigned char)n;
+        pal[i + 1] = 0;
+        pal[i + 2] = (unsigned char)(255 - n);
     }
 
     /* make a palette */
-    if (H5IMmake_palette(fid,PAL4_NAME,pal_dims,pal)<0)
+    if (H5IMmake_palette(fid, PAL4_NAME, pal_dims, pal) < 0)
         goto out;
 
     /* attach the palette to the image dataset */
-    if (H5IMlink_palette(fid,IMAGE1_NAME,PAL4_NAME)<0)
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL4_NAME) < 0)
         goto out;
 
-
     /*-------------------------------------------------------------------------
-    * true color image example with pixel interlace
-    *-------------------------------------------------------------------------
-    */
+     * true color image example with pixel interlace
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make true color image with pixel interlace");
 
     /* read second data file */
-    if ((read_data(DATA_FILE2,&width,&height))<0)
+    if ((read_data(DATA_FILE2, &width, &height)) < 0)
         goto out;
 
     /* make image */
-    if ((H5IMmake_image_24bit(fid,IMAGE2_NAME,width,height,"INTERLACE_PIXEL",image_data))<0)
+    if ((H5IMmake_image_24bit(fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", image_data)) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * True color image example with plane interlace
-    *-------------------------------------------------------------------------
-    */
+     * True color image example with plane interlace
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make true color image with plane interlace");
 
     /* read third data file */
-    if ((read_data(DATA_FILE3,&width,&height))<0)
+    if ((read_data(DATA_FILE3, &width, &height)) < 0)
         goto out;
 
     /* make image */
-    if ((H5IMmake_image_24bit(fid,IMAGE3_NAME,width,height,"INTERLACE_PLANE",image_data))<0)
+    if ((H5IMmake_image_24bit(fid, IMAGE3_NAME, width, height, "INTERLACE_PLANE", image_data)) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if (H5Fclose(fid)<0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     /* Release memory buffer */
@@ -509,18 +492,19 @@ static int test_data(void)
     /* error zone, gracefully close */
 out:
     /* Release memory buffer */
-    if(image_data)
+    if (image_data)
         HDfree(image_data);
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return FAIL;
 }
 
-
 /*
 The following test provides an examples of how to generate HDF5 image data from
 floating point data.  In the example we use real life topographic data
@@ -534,34 +518,34 @@ http://modb.oce.ulg.ac.be/
 
 */
 
-static int test_generate(void)
+static int
+test_generate(void)
 {
-    hid_t    fid;
-    hsize_t  pal_dims[2] = { 256, 3 };
-    float    *data = NULL;
-    int      imax, jmax, kmax;
-    int      n_elements;
-    float    valex, xmin, xmax, value;
-    FILE     *f = NULL;
+    hid_t       fid;
+    hsize_t     pal_dims[2] = {256, 3};
+    float *     data        = NULL;
+    int         imax, jmax, kmax;
+    int         n_elements;
+    float       valex, xmin, xmax, value;
+    FILE *      f         = NULL;
     const char *data_file = H5_get_srcdir_filename(DATA_FILE4);
-    int      i;
-    int      retval = FAIL;
+    int         i;
+    int         retval = FAIL;
 
     /* create a file using default properties */
-    if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+    if ((fid = H5Fcreate(FILE3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     HDprintf("Testing read and process data and make indexed images\n");
 
     /*-------------------------------------------------------------------------
-    * read data; the file data format is described below
-    *-------------------------------------------------------------------------
-    */
+     * read data; the file data format is described below
+     *-------------------------------------------------------------------------
+     */
 
-    f  = HDfopen( data_file, "r" ) ;
-    if ( f == NULL )
-    {
-        HDprintf( "Could not find file %s. Try set $srcdir \n", data_file );
+    f = HDfopen(data_file, "r");
+    if (f == NULL) {
+        HDprintf("Could not find file %s. Try set $srcdir \n", data_file);
         goto out;
     }
 
@@ -600,45 +584,43 @@ static int test_generate(void)
     !
     */
 
-
-    if(fscanf( f, "%d %d %d", &imax, &jmax, &kmax ) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%d %d %d", &imax, &jmax, &kmax) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
-    if(fscanf( f, "%f %f %f", &valex, &xmin, &xmax ) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%f %f %f", &valex, &xmin, &xmax) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
     /* Sanity check on scanned-in values */
-    if(imax < 1 || jmax < 1 || kmax < 1)
+    if (imax < 1 || jmax < 1 || kmax < 1)
         goto out;
 
     /* Test product for integer overflow */
-    if(imax > INT_MAX / jmax)
+    if (imax > INT_MAX / jmax)
         goto out;
-    if(imax * jmax > INT_MAX / kmax)
+    if (imax * jmax > INT_MAX / kmax)
         goto out;
 
     n_elements = imax * jmax * kmax;
 
     /* Test buffer sizes for overflow */
-    if(n_elements > INT_MAX / (int)sizeof(unsigned char))
+    if (n_elements > INT_MAX / (int)sizeof(unsigned char))
         goto out;
-    if(n_elements > INT_MAX / (int)sizeof(float))
+    if (n_elements > INT_MAX / (int)sizeof(float))
         goto out;
 
     data = (float *)HDmalloc((size_t)n_elements * sizeof(float));
-    if(NULL == data)
+    if (NULL == data)
         goto out;
     image_data = (unsigned char *)HDmalloc((size_t)n_elements * sizeof(unsigned char));
-    if(NULL == image_data)
+    if (NULL == image_data)
         goto out;
 
-    for ( i = 0; i < n_elements; i++ )
-    {
-        if(fscanf( f, "%f ", &value ) < 0 && HDferror(f)) {
-            HDprintf( "fscanf error in file %s.\n", data_file );
+    for (i = 0; i < n_elements; i++) {
+        if (fscanf(f, "%f ", &value) < 0 && HDferror(f)) {
+            HDprintf("fscanf error in file %s.\n", data_file);
             goto out;
         } /* end if */
         data[i] = value;
@@ -647,93 +629,90 @@ static int test_generate(void)
     f = NULL;
 
     /*-------------------------------------------------------------------------
-    * transform the data from floating point to unsigned char
-    * we are processing all the data here
-    *-------------------------------------------------------------------------
-    */
+     * transform the data from floating point to unsigned char
+     * we are processing all the data here
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make indexed image from all the data");
 
-    for ( i = 0; i < n_elements; i++ )
-        image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / (xmax - xmin ));
+    for (i = 0; i < n_elements; i++)
+        image_data[i] = (unsigned char)((255 * (data[i] - xmin)) / (xmax - xmin));
 
     /* Make the image */
-    if ((H5IMmake_image_8bit(fid,"All data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
+    if ((H5IMmake_image_8bit(fid, "All data", (hsize_t)imax, (hsize_t)jmax, image_data)) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * transform the data from floating point to unsigned char
-    * here we just process the land data
-    *-------------------------------------------------------------------------
-    */
+     * transform the data from floating point to unsigned char
+     * here we just process the land data
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make indexed image from land data");
 
-    for ( i = 0; i < n_elements; i++ )
-    {
-        if ( data[i] < 0 )
+    for (i = 0; i < n_elements; i++) {
+        if (data[i] < 0)
             image_data[i] = 0;
         else
-            image_data[i] = (unsigned char)(( 255 * (data[i] ) ) / xmax );
+            image_data[i] = (unsigned char)((255 * (data[i])) / xmax);
     }
 
     /* make the image */
-    if ((H5IMmake_image_8bit(fid,"Land data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
+    if ((H5IMmake_image_8bit(fid, "Land data", (hsize_t)imax, (hsize_t)jmax, image_data)) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * transform the data from floating point to unsigned char
-    * here we just process the sea data
-    *-------------------------------------------------------------------------
-    */
+     * transform the data from floating point to unsigned char
+     * here we just process the sea data
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("make indexed image from sea data");
 
-    for ( i = 0; i < n_elements; i++ )
-    {
-        if ( data[i] > 0 )
+    for (i = 0; i < n_elements; i++) {
+        if (data[i] > 0)
             image_data[i] = 0;
         else
-            image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / xmin );
+            image_data[i] = (unsigned char)((255 * (data[i] - xmin)) / xmin);
     }
 
     /* make the image */
-    if ((H5IMmake_image_8bit(fid,"Sea data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
+    if ((H5IMmake_image_8bit(fid, "Sea data", (hsize_t)imax, (hsize_t)jmax, image_data)) < 0)
         goto out;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * make a palette and attach it to the datasets
-    *-------------------------------------------------------------------------
-    */
+     * make a palette and attach it to the datasets
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("attaching palettes");
 
     /* make a palette */
-    if ((H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb))<0)
+    if ((H5IMmake_palette(fid, PAL1_NAME, pal_dims, pal_rgb)) < 0)
         goto out;
 
     /* attach the palette to the image datasets */
-    if ((H5IMlink_palette(fid,"All data",PAL1_NAME))<0)
+    if ((H5IMlink_palette(fid, "All data", PAL1_NAME)) < 0)
         goto out;
-    if ((H5IMlink_palette(fid,"Land data",PAL1_NAME))<0)
+    if ((H5IMlink_palette(fid, "Land data", PAL1_NAME)) < 0)
         goto out;
-    if ((H5IMlink_palette(fid,"Sea data",PAL1_NAME))<0)
+    if ((H5IMlink_palette(fid, "Sea data", PAL1_NAME)) < 0)
         goto out;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    if (H5Fclose(fid)<0)
+     * close
+     *-------------------------------------------------------------------------
+     */
+    if (H5Fclose(fid) < 0)
         goto out;
 
     /* Release memory buffers */
@@ -746,122 +725,124 @@ static int test_generate(void)
     /* error zone, gracefully close */
 out:
     /* Release memory buffers */
-    if(data)
+    if (data)
         HDfree(data);
-    if(image_data)
+    if (image_data)
         HDfree(image_data);
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Fclose(fid);
-    } H5E_END_TRY;
-    if(f)
+    }
+    H5E_END_TRY;
+    if (f)
         HDfclose(f);
     H5_FAILED();
     return retval;
 }
 
-
 /*-------------------------------------------------------------------------
-* read_data
-* utility function to read ASCII image data
-* the files have a header of the type
-*
-*   components
-*   n
-*   height
-*   n
-*   width
-*   n
-*
-* followed by the image data
-*
-*-------------------------------------------------------------------------
-*/
-
-static int read_data(const char* fname, /*IN*/
-                     hsize_t *width, /*OUT*/
-                     hsize_t *height /*OUT*/)
+ * read_data
+ * utility function to read ASCII image data
+ * the files have a header of the type
+ *
+ *   components
+ *   n
+ *   height
+ *   n
+ *   width
+ *   n
+ *
+ * followed by the image data
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static int
+read_data(const char *fname, /*IN*/
+          hsize_t *   width, /*OUT*/
+          hsize_t *   height /*OUT*/)
 {
-    int    i, n;
-    int    color_planes;
-    char   str[20];
-    FILE   *f = NULL;
-    int    w, h;
-    int    n_elements;
+    int         i, n;
+    int         color_planes;
+    char        str[20];
+    FILE *      f = NULL;
+    int         w, h;
+    int         n_elements;
     const char *data_file = H5_get_srcdir_filename(fname);
-    int    ret_val = -1;
+    int         ret_val   = -1;
 
     /*-------------------------------------------------------------------------
-    * read
-    *-------------------------------------------------------------------------
-    */
+     * read
+     *-------------------------------------------------------------------------
+     */
 
-    if(NULL == (f = HDfopen(data_file, "r"))) {
-        HDprintf( "Could not open file %s. Try set $srcdir \n", data_file );
+    if (NULL == (f = HDfopen(data_file, "r"))) {
+        HDprintf("Could not open file %s. Try set $srcdir \n", data_file);
         goto out;
     }
 
-    if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if(fscanf(f, "%d", &color_planes) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%d", &color_planes) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if(fscanf(f, "%d", &h) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%d", &h) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if(fscanf(f, "%d", &w) < 0 && HDferror(f)) {
-        HDprintf( "fscanf error in file %s.\n", data_file );
+    if (fscanf(f, "%d", &w) < 0 && HDferror(f)) {
+        HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
     /* Check product for overflow */
-    if(w < 1 || h < 1 || color_planes < 1)
+    if (w < 1 || h < 1 || color_planes < 1)
         goto out;
-    if(w > INT_MAX / h)
+    if (w > INT_MAX / h)
         goto out;
-    if(w * h > INT_MAX / color_planes)
+    if (w * h > INT_MAX / color_planes)
         goto out;
 
     /* Compute buffer size */
     n_elements = w * h * color_planes;
 
     /* Check buffer size for overflow */
-    if(n_elements > INT_MAX / (int)sizeof(unsigned char))
+    if (n_elements > INT_MAX / (int)sizeof(unsigned char))
         goto out;
 
     /* Release the buffer, if it was previously allocated */
-    if(image_data)
+    if (image_data)
         HDfree(image_data);
 
     /* Allocate the image data buffer */
     image_data = (unsigned char *)HDmalloc((size_t)n_elements * sizeof(unsigned char));
-    if(NULL == image_data)
+    if (NULL == image_data)
         goto out;
 
-    *width = (hsize_t)w;
+    *width  = (hsize_t)w;
     *height = (hsize_t)h;
 
     /* Read data elements */
-    for(i = 0; i < n_elements; i++) {
-        if(fscanf(f, "%d", &n) < 0 && HDferror(f)) {
-            HDprintf( "fscanf error in file %s.\n", data_file );
+    for (i = 0; i < n_elements; i++) {
+        if (fscanf(f, "%d", &n) < 0 && HDferror(f)) {
+            HDprintf("fscanf error in file %s.\n", data_file);
             goto out;
         } /* end if */
         image_data[i] = (unsigned char)n;
@@ -871,123 +852,108 @@ static int read_data(const char* fname, /*IN*/
     ret_val = 1;
 
 out:
-    if(f)
+    if (f)
         HDfclose(f);
 
     return ret_val;
 } /* end read_data() */
 
-
 /*-------------------------------------------------------------------------
-* read_palette
-* Read an ASCII palette file .PAL into an array
-* the files have a header of the type
-*
-* Parameters:
-*  fname - name of file to read.
-*  palette - array of rgb_t to store the read palette.
-*  palette_size - number of elements in 'palette' array
-*
-*-------------------------------------------------------------------------
-*/
-
+ * read_palette
+ * Read an ASCII palette file .PAL into an array
+ * the files have a header of the type
+ *
+ * Parameters:
+ *  fname - name of file to read.
+ *  palette - array of rgb_t to store the read palette.
+ *  palette_size - number of elements in 'palette' array
+ *
+ *-------------------------------------------------------------------------
+ */
 
 #define STRING_JASC   "JASC-PAL"
 #define VERSION_JASC  "0100"
 #define STRING_CWPAL  "CWPAL"
 #define VERSION_CWPAL "100"
 
-static int read_palette(const char* fname,
-                        rgb_t *palette,
-                        size_t palette_size)
+static int
+read_palette(const char *fname, rgb_t *palette, size_t palette_size)
 {
-    FILE          *file;
-    char          buffer[80];
-    unsigned      u;
-    unsigned int  red;
-    unsigned int  green;
-    unsigned int  blue;
-    unsigned      nentries;
-    const char *data_file = H5_get_srcdir_filename(fname);
+    FILE *       file;
+    char         buffer[80];
+    unsigned     u;
+    unsigned int red;
+    unsigned int green;
+    unsigned int blue;
+    unsigned     nentries;
+    const char * data_file = H5_get_srcdir_filename(fname);
 
     /* ensure the given palette is valid */
     if (!palette)
         return -1;
 
     /* open the input file */
-    if (!(file = HDfopen(data_file, "r")))
-    {
-        HDprintf( "Could not open file %s. Try set $srcdir \n", data_file );
+    if (!(file = HDfopen(data_file, "r"))) {
+        HDprintf("Could not open file %s. Try set $srcdir \n", data_file);
         return -1;
     }
 
     /* read the file ident string */
-    if (HDfgets(buffer, sizeof(buffer), file) == NULL)
-    {
+    if (HDfgets(buffer, sizeof(buffer), file) == NULL) {
         HDfclose(file);
         return -1;
     }
 
     /* ensure it matches the palette file ident string */
-    if ( HDstrncmp(buffer, STRING_JASC, sizeof(STRING_JASC) - 1) != 0 &&
-            HDstrncmp(buffer, STRING_CWPAL, sizeof(STRING_CWPAL) - 1) != 0 )
-    {
+    if (HDstrncmp(buffer, STRING_JASC, sizeof(STRING_JASC) - 1) != 0 &&
+        HDstrncmp(buffer, STRING_CWPAL, sizeof(STRING_CWPAL) - 1) != 0) {
         HDfclose(file);
         return -1;
     }
 
     /* read the version string */
-    if (HDfgets(buffer, sizeof(buffer), file) == NULL)
-    {
+    if (HDfgets(buffer, sizeof(buffer), file) == NULL) {
         HDfclose(file);
         return -1;
     }
 
     /* ensure it matches the palette file version string */
-    if ( HDstrncmp(buffer, VERSION_JASC, sizeof(VERSION_JASC) - 1) != 0 &&
-            HDstrncmp(buffer, VERSION_CWPAL, sizeof(VERSION_CWPAL) - 1) != 0 )
-    {
+    if (HDstrncmp(buffer, VERSION_JASC, sizeof(VERSION_JASC) - 1) != 0 &&
+        HDstrncmp(buffer, VERSION_CWPAL, sizeof(VERSION_CWPAL) - 1) != 0) {
         HDfclose(file);
         return -1;
     }
 
     /* read the number of colors */
-    if (HDfgets(buffer, sizeof(buffer), file) == NULL)
-    {
+    if (HDfgets(buffer, sizeof(buffer), file) == NULL) {
         HDfclose(file);
         return -1;
     }
 
-
     /* extract the number of colors.
     check for missing version or number of colors
     in this case it reads the first entry
     */
-    if ( HDstrlen( buffer ) > 4 )
-    {
+    if (HDstrlen(buffer) > 4) {
         HDfclose(file);
         return -1;
     }
 
-    if (sscanf(buffer, "%u", &nentries) != 1)
-    {
+    if (sscanf(buffer, "%u", &nentries) != 1) {
         HDfclose(file);
         return -1;
     }
 
     /* ensure there are a sensible number of colors in the palette */
-    if ((nentries > 256) || (nentries > palette_size))
-    {
+    if ((nentries > 256) || (nentries > palette_size)) {
         HDfclose(file);
-        return(-1);
+        return (-1);
     }
 
     /* read the palette entries */
-    for (u = 0; u < nentries; u++)
-    {
+    for (u = 0; u < nentries; u++) {
         /* extract the red, green and blue color components.  */
-        if (fscanf(file, "%u %u %u", &red, &green, &blue) != 3)
-        {
+        if (fscanf(file, "%u %u %u", &red, &green, &blue) != 3) {
             HDfclose(file);
             return -1;
         }
@@ -1002,4 +968,3 @@ static int read_palette(const char* fname,
 
     return (int)nentries;
 }
-
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index e3cde5d..342397a 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
 #include <string.h>
@@ -26,17 +26,17 @@
 #define COPY_FILENAME "COPY_test_ld.h5"
 
 /* Dataset names */
-#define DSET_ONE        "DSET_ONE"
-#define DSET_ALLOC_LATE "DSET_ALLOC_LATE"
+#define DSET_ONE         "DSET_ONE"
+#define DSET_ALLOC_LATE  "DSET_ALLOC_LATE"
 #define DSET_ALLOC_EARLY "DSET_ALLOC_EARLY"
-#define DSET_TWO     "DSET_TWO"
-#define TWO_DIM_1    4
-#define TWO_DIM_2    10
-#define DSET_CMPD     "DSET_CMPD"
-#define DSET_CMPD_ESC     "DSET_CMPD_ESC"
-#define DSET_CMPD_TWO     "DSET_CMPD_TWO"
-#define DSET_NULL       "DSET_NULL"
-#define DSET_SCALAR     "DSET_SCALAR"
+#define DSET_TWO         "DSET_TWO"
+#define TWO_DIM_1        4
+#define TWO_DIM_2        10
+#define DSET_CMPD        "DSET_CMPD"
+#define DSET_CMPD_ESC    "DSET_CMPD_ESC"
+#define DSET_CMPD_TWO    "DSET_CMPD_TWO"
+#define DSET_NULL        "DSET_NULL"
+#define DSET_SCALAR      "DSET_SCALAR"
 
 /* Selected compound field members for testing */
 #define VALID_FIELDS1 "field1,field2.a,field3,field4" /* TEMPORORAY */
@@ -57,7 +57,7 @@
  * Test variations (retained original) for one-dimensional dataset:
  *    Varies from 10->13; 10->9, 10->10, 10->1, 10->11
  */
-#define ONE_NTESTS      5
+#define ONE_NTESTS 5
 int one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1};
 
 /*
@@ -66,88 +66,92 @@ int one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1};
  *            {4,10}->{3,12}; {4,10}->{3,9}; {4,10}->{3,10};
  *            {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10}
  */
-#define TWO_NTESTS     9
-int two_tests[TWO_NTESTS][2] = { {2,2},  {2,-1},  {2,0},
-                    {-1,2}, {-1,-1}, {-1,0},
-                        {0,2},  {0,-1},  {0,0} };
-
+#define TWO_NTESTS 9
+int two_tests[TWO_NTESTS][2] = {{2, 2}, {2, -1}, {2, 0}, {-1, 2}, {-1, -1}, {-1, 0}, {0, 2}, {0, -1}, {0, 0}};
 
 /* Verify that the two input values are the same */
-#define VERIFY_EQUAL(_x, _y)                        \
-{                                    \
-    long __x = (long)_x, __y = (long)_y;                \
-    if(__x != __y) TEST_ERROR                    \
-}
+#define VERIFY_EQUAL(_x, _y)                                                                                 \
+    {                                                                                                        \
+        long __x = (long)_x, __y = (long)_y;                                                                 \
+        if (__x != __y)                                                                                      \
+            TEST_ERROR                                                                                       \
+    }
 
 /* Temporary buffer for reading in the test file */
-#define TMP_BUF_SIZE        2048
-char  g_tmp_buf[TMP_BUF_SIZE];
+#define TMP_BUF_SIZE 2048
+char g_tmp_buf[TMP_BUF_SIZE];
 
 /* Macros for verifying compound fields */
 /* Verify all fields */
-#define VERIFY_ELMTS_ALL(ent1, ent2)  {            \
-    VERIFY_EQUAL(ent1.field1, ent2.field1);        \
-    VERIFY_EQUAL(ent1.field2.a, ent2.field2.a);        \
-    VERIFY_EQUAL(ent1.field2.b.a, ent2.field2.b.a);    \
-    VERIFY_EQUAL(ent1.field2.b.b, ent2.field2.b.b);    \
-    VERIFY_EQUAL(ent1.field2.b.c, ent2.field2.b.c);    \
-    VERIFY_EQUAL(ent1.field2.c, ent2.field2.c);        \
-    VERIFY_EQUAL(ent1.field3, ent2.field3);        \
-    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);        \
-}
+#define VERIFY_ELMTS_ALL(ent1, ent2)                                                                         \
+    {                                                                                                        \
+        VERIFY_EQUAL(ent1.field1, ent2.field1);                                                              \
+        VERIFY_EQUAL(ent1.field2.a, ent2.field2.a);                                                          \
+        VERIFY_EQUAL(ent1.field2.b.a, ent2.field2.b.a);                                                      \
+        VERIFY_EQUAL(ent1.field2.b.b, ent2.field2.b.b);                                                      \
+        VERIFY_EQUAL(ent1.field2.b.c, ent2.field2.b.c);                                                      \
+        VERIFY_EQUAL(ent1.field2.c, ent2.field2.c);                                                          \
+        VERIFY_EQUAL(ent1.field3, ent2.field3);                                                              \
+        VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);                                                          \
+    }
 
 /* Verify fields selected in VALID_FIELDS1 */
-#define VERIFY_ELMTS_VALID1(ent1, ent2)  {        \
-    VERIFY_EQUAL(ent1.field1, ent2.field1);        \
-    VERIFY_EQUAL(ent1.field2_a, ent2.field2.a);        \
-    VERIFY_EQUAL(ent1.field3, ent2.field3);        \
-    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);        \
-    VERIFY_EQUAL(ent1.field4.b, ent2.field4.b);        \
-}
+#define VERIFY_ELMTS_VALID1(ent1, ent2)                                                                      \
+    {                                                                                                        \
+        VERIFY_EQUAL(ent1.field1, ent2.field1);                                                              \
+        VERIFY_EQUAL(ent1.field2_a, ent2.field2.a);                                                          \
+        VERIFY_EQUAL(ent1.field3, ent2.field3);                                                              \
+        VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);                                                          \
+        VERIFY_EQUAL(ent1.field4.b, ent2.field4.b);                                                          \
+    }
 
 /* Verify fields selected in VALID_FIELDS2 */
-#define VERIFY_ELMTS_VALID2(ent1, ent2)  {        \
-    VERIFY_EQUAL(ent1.field2_b_a, ent2.field2.b.a);    \
-    VERIFY_EQUAL(ent1.field2_c, ent2.field2.c);        \
-    VERIFY_EQUAL(ent1.field4_b, ent2.field4.b);        \
-}
+#define VERIFY_ELMTS_VALID2(ent1, ent2)                                                                      \
+    {                                                                                                        \
+        VERIFY_EQUAL(ent1.field2_b_a, ent2.field2.b.a);                                                      \
+        VERIFY_EQUAL(ent1.field2_c, ent2.field2.c);                                                          \
+        VERIFY_EQUAL(ent1.field4_b, ent2.field4.b);                                                          \
+    }
 
 /* The types of 2-dimensional dataset: DSET_TWO or DSET_CMPD_TWO */
-#define TWO_NONE                0       /* DSET_TWO */
-#define TWO_CMPD_NULL           1       /* DSET_CMPD_TWO with NULL fields */
-#define TWO_CMPD_VALID1         2       /* DSET_CMPD_TWO with VALID_FIELDS1 or VALID_ESC_FIELDS1 */
-#define TWO_CMPD_VALID2         3       /* DSET_CMPD_TWO with VALID_FIELDS2 or VALID_ESC_FIELDS2 */
-
-#define VERIFY_ELMTS(type, k, ind, _ldbuf, _buf) {            \
-    if(type == TWO_NONE) {                        \
-    int *iib = (int *)_ldbuf;                    \
-    int *ib = (int *)_buf;                        \
-                                    \
-    VERIFY_EQUAL(iib[k], ib[ind + n])                \
-    } else if(type == TWO_CMPD_NULL) {                    \
-    set_t *ccb = (set_t *)_ldbuf;                    \
-    set_t *cb = (set_t *)_buf;                    \
-                                    \
-    VERIFY_ELMTS_ALL(ccb[k], cb[ind + n])                \
-    } else if(type == TWO_CMPD_VALID1) {                \
-    test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf;        \
-    set_t *cb = (set_t *)_buf;                    \
-                                    \
-    VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n])            \
-    } else if(type == TWO_CMPD_VALID2) {                \
-    test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf;        \
-    set_t *cb = (set_t *)_buf;                    \
-                                    \
-    VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n])            \
-    }                                    \
-}
+#define TWO_NONE        0 /* DSET_TWO */
+#define TWO_CMPD_NULL   1 /* DSET_CMPD_TWO with NULL fields */
+#define TWO_CMPD_VALID1 2 /* DSET_CMPD_TWO with VALID_FIELDS1 or VALID_ESC_FIELDS1 */
+#define TWO_CMPD_VALID2 3 /* DSET_CMPD_TWO with VALID_FIELDS2 or VALID_ESC_FIELDS2 */
+
+#define VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)                                                             \
+    {                                                                                                        \
+        if (type == TWO_NONE) {                                                                              \
+            int *iib = (int *)_ldbuf;                                                                        \
+            int *ib  = (int *)_buf;                                                                          \
+                                                                                                             \
+            VERIFY_EQUAL(iib[k], ib[ind + n])                                                                \
+        }                                                                                                    \
+        else if (type == TWO_CMPD_NULL) {                                                                    \
+            set_t *ccb = (set_t *)_ldbuf;                                                                    \
+            set_t *cb  = (set_t *)_buf;                                                                      \
+                                                                                                             \
+            VERIFY_ELMTS_ALL(ccb[k], cb[ind + n])                                                            \
+        }                                                                                                    \
+        else if (type == TWO_CMPD_VALID1) {                                                                  \
+            test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf;                                          \
+            set_t *             cb  = (set_t *)_buf;                                                         \
+                                                                                                             \
+            VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n])                                                         \
+        }                                                                                                    \
+        else if (type == TWO_CMPD_VALID2) {                                                                  \
+            test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf;                                          \
+            set_t *             cb  = (set_t *)_buf;                                                         \
+                                                                                                             \
+            VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n])                                                         \
+        }                                                                                                    \
+    }
 
 /* Tests for test_LD_elmts_pipe() */
-#define ONE_TESTS    3
-int  onetests[ONE_TESTS] = {3, 9, 1};
-#define TWO_TESTS    5
-int twotests[TWO_TESTS][2] = { {2,2}, {2,-1}, {2,0}, {-1,2}, {0,2}  };
-
+#define ONE_TESTS 3
+int onetests[ONE_TESTS] = {3, 9, 1};
+#define TWO_TESTS 5
+int twotests[TWO_TESTS][2] = {{2, 2}, {2, -1}, {2, 0}, {-1, 2}, {0, 2}};
 
 static herr_t test_LD_dims_params(const char *file);
 static herr_t test_LD_dims(const char *file);
@@ -158,7 +162,7 @@ static herr_t test_LD_elmts_invalid(const char *file);
 static herr_t test_LD_elmts_one(const char *file, const char *dname, const char *fields);
 static herr_t test_LD_elmts_two(const char *file, const char *dname, const char *fields);
 
-static herr_t verify_elmts_two(int type, hsize_t *ext_dims, hsize_t *prev_dims,  void *_ldbuf, void *_buf);
+static herr_t verify_elmts_two(int type, hsize_t *ext_dims, hsize_t *prev_dims, void *_ldbuf, void *_buf);
 
 /* data structures for compound data type */
 typedef struct sub22_t {
@@ -168,9 +172,9 @@ typedef struct sub22_t {
 } sub22_t;
 
 typedef struct sub2_t {
-    int a;
+    int     a;
     sub22_t b;
-    int c;
+    int     c;
 } sub2_t;
 
 typedef struct sub4_t {
@@ -179,7 +183,7 @@ typedef struct sub4_t {
 } sub4_t;
 
 typedef struct set_t {
-    int field1;
+    int    field1;
     sub2_t field2;
     double field3;
     sub4_t field4;
@@ -195,8 +199,8 @@ typedef struct set_t {
 /* VALID_FIELDS1 "field1,field2.a,field3,field4" */
 /* VALID_ESC_FIELDS1 "field\\,1,field2\\..\\.a,field\\\\3,field4\\," */
 typedef struct test_valid_fields1 {
-    int field1;
-    int field2_a;
+    int    field1;
+    int    field2_a;
     double field3;
     sub4_t field4;
 } test_valid_fields1;
@@ -209,16 +213,14 @@ typedef struct test_valid_fields2 {
     int field4_b;
 } test_valid_fields2;
 
-
 /* Temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */
-#define TEST_BUF_SIZE         100
-int *iibuf;            /* buffer for storing retrieved elements */
-int *ibuf;            /* buffer for storing retrieved elements (integer) */
-set_t *cbuf;            /* buffer for storing retrieved elemnets (compound) */
-set_t *ccbuf;            /* buffer for storing retrieved elemnets (compound) */
-test_valid_fields1 *vbuf1;    /* buffer for storing retrieved elements (FIELDS1) */
-test_valid_fields2 *vbuf2;    /* buffer for storing retrieved elements (FIELDS2) */
-
+#define TEST_BUF_SIZE 100
+int *               iibuf; /* buffer for storing retrieved elements */
+int *               ibuf;  /* buffer for storing retrieved elements (integer) */
+set_t *             cbuf;  /* buffer for storing retrieved elemnets (compound) */
+set_t *             ccbuf; /* buffer for storing retrieved elemnets (compound) */
+test_valid_fields1 *vbuf1; /* buffer for storing retrieved elements (FIELDS1) */
+test_valid_fields2 *vbuf2; /* buffer for storing retrieved elements (FIELDS2) */
 
 /*
  *********************************************************************************
@@ -236,109 +238,114 @@ test_valid_fields2 *vbuf2;    /* buffer for storing retrieved elements (FIELDS2)
 static herr_t
 test_LD_dims_params(const char *file)
 {
-    hid_t fid=-1;        /* file identifier */
-    hid_t did=-1;        /* dataset identifier */
-    hsize_t one_cur_dims[1];    /* current dimension sizes for 1-dimensonal dataset */
-    hsize_t two_cur_dims[2];    /* current dimension sizes for 2-dimensional dataset */
-    hid_t invalid_id = -1;
-    herr_t ret;            /* return value */
+    hid_t   fid = -1;        /* file identifier */
+    hid_t   did = -1;        /* dataset identifier */
+    hsize_t one_cur_dims[1]; /* current dimension sizes for 1-dimensonal dataset */
+    hsize_t two_cur_dims[2]; /* current dimension sizes for 2-dimensional dataset */
+    hid_t   invalid_id = -1;
+    herr_t  ret; /* return value */
 
     const char *filename = H5_get_srcdir_filename(file);
 
     HL_TESTING2("H5LDget_dset_dims");
 
     /* Open the copied file */
-    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * 1. Verify failure with negative dataset id
      */
-    H5E_BEGIN_TRY {
-    ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
+    }
+    H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
 
     /*
      * 2. Verify failure for NULL cur_dims
      */
-    if((did = H5Dopen2(fid, DSET_ALLOC_EARLY, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-    ret = H5LDget_dset_dims(did, NULL);
-    } H5E_END_TRY;
+    if ((did = H5Dopen2(fid, DSET_ALLOC_EARLY, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_dims(did, NULL);
+    }
+    H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * 3. Verify for nonNULL cur_dims
      */
-    if((did = H5Dopen2(fid, DSET_ALLOC_LATE, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
-    if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_ALLOC_LATE, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, one_cur_dims) < 0)
+        FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 10)
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * 4. Verify nonNULL cur_dims for a 2-dimensional dataset
      */
-    if((did = H5Dopen2(fid, DSET_CMPD_TWO, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
-    if(H5LDget_dset_dims(did, two_cur_dims) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_CMPD_TWO, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, two_cur_dims) < 0)
+        FAIL_STACK_ERROR
     VERIFY_EQUAL(two_cur_dims[0], TWO_DIM_1)
     VERIFY_EQUAL(two_cur_dims[1], TWO_DIM_2)
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * 5. Verify nonNULL cur_dims for dataset with H5S_NULL dataspace
      */
     one_cur_dims[0] = 0;
 
-    if((did = H5Dopen2(fid, DSET_NULL, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_NULL, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
-    if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-    FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, one_cur_dims) < 0)
+        FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 0)
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * 6. Verify nonNULL cur_dims for dataset with H5S_SCALAR dataspace
      */
     one_cur_dims[0] = 0;
 
-    if((did = H5Dopen2(fid, DSET_SCALAR, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_SCALAR, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
-    if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-    FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, one_cur_dims) < 0)
+        FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 0)
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /* Close the file */
-    if(H5Fclose(fid) < 0)
-    FAIL_STACK_ERROR
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
 
-    return(-1);
+    return (-1);
 } /* test_LD_dims_params() */
 
-
 /*
  *********************************************************************************
  *
@@ -379,93 +386,93 @@ error:
 static herr_t
 test_LD_dims(const char *file)
 {
-    hid_t fid=-1;        /* file identifier */
-    hid_t did=-1;        /* dataset identifier */
-    hsize_t one_prev_dims[1];    /* original dimension sizes for 1-dimensonal dataset */
-    hsize_t one_cur_dims[1];    /* current dimension sizes for 1-dimensonal dataset */
-    hsize_t one_ext_dims[1];    /* extended dimension sizes for 1-dimensonal dataset */
-    hsize_t two_prev_dims[2];    /* original dimension sizes for 2-dimensional dataset */
-    hsize_t two_cur_dims[2];    /* current dimension sizes for 2-dimensional dataset */
-    hsize_t two_ext_dims[2];    /* extended dimension sizes for 2-dimensional dataset*/
-    int i;            /* local index variable */
+    hid_t   fid = -1;         /* file identifier */
+    hid_t   did = -1;         /* dataset identifier */
+    hsize_t one_prev_dims[1]; /* original dimension sizes for 1-dimensonal dataset */
+    hsize_t one_cur_dims[1];  /* current dimension sizes for 1-dimensonal dataset */
+    hsize_t one_ext_dims[1];  /* extended dimension sizes for 1-dimensonal dataset */
+    hsize_t two_prev_dims[2]; /* original dimension sizes for 2-dimensional dataset */
+    hsize_t two_cur_dims[2];  /* current dimension sizes for 2-dimensional dataset */
+    hsize_t two_ext_dims[2];  /* extended dimension sizes for 2-dimensional dataset*/
+    int     i;                /* local index variable */
 
     HL_TESTING2("H5LDget_dset_dims with H5Dset_extent");
 
     /* Make a copy of the test file */
-    if(h5_make_local_copy(file, COPY_FILENAME) < 0)
+    if (h5_make_local_copy(file, COPY_FILENAME) < 0)
         TEST_ERROR
 
     /* Open the copied file */
-    if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Testing with one-dimensional dataset: DSET_ONE
      */
-    if((did = H5Dopen2(fid, DSET_ONE, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_ONE, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Retrieve dimension sizes */
-    if(H5LDget_dset_dims(did, one_prev_dims) < 0)
-    FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, one_prev_dims) < 0)
+        FAIL_STACK_ERROR
 
-    for(i = 0; i < ONE_NTESTS; i++) {
+    for (i = 0; i < ONE_NTESTS; i++) {
 
-    /* Set up the extended dimension sizes */
-    one_ext_dims[0] = (hsize_t)((int)one_prev_dims[0] + one_tests[i]);
+        /* Set up the extended dimension sizes */
+        one_ext_dims[0] = (hsize_t)((int)one_prev_dims[0] + one_tests[i]);
 
-    /* Change the dimension size */
-    if(H5Dset_extent(did, one_ext_dims) < 0)
-        FAIL_STACK_ERROR
+        /* Change the dimension size */
+        if (H5Dset_extent(did, one_ext_dims) < 0)
+            FAIL_STACK_ERROR
 
-    /* Retrieve the dimension size */
-    if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-        FAIL_STACK_ERROR
+        /* Retrieve the dimension size */
+        if (H5LDget_dset_dims(did, one_cur_dims) < 0)
+            FAIL_STACK_ERROR
 
-    /* Verify that the retrieved dimension size is correct as expected */
-    VERIFY_EQUAL(one_cur_dims[0], one_ext_dims[0])
+        /* Verify that the retrieved dimension size is correct as expected */
+        VERIFY_EQUAL(one_cur_dims[0], one_ext_dims[0])
     }
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Testing with two-dimensional dataset: DSET_TWO
      */
-    if((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Retrieve the dimension sizes */
-    if(H5LDget_dset_dims(did, two_prev_dims) < 0)
-    FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, two_prev_dims) < 0)
+        FAIL_STACK_ERROR
 
-    for(i = 0; i < TWO_NTESTS; i++) {
+    for (i = 0; i < TWO_NTESTS; i++) {
 
-    /* Set up the extended dimension sizes */
-    two_ext_dims[0] = (hsize_t)((int)two_prev_dims[0] + two_tests[i][0]);
-    two_ext_dims[1] = (hsize_t) ((int)two_prev_dims[1] + two_tests[i][1]);
+        /* Set up the extended dimension sizes */
+        two_ext_dims[0] = (hsize_t)((int)two_prev_dims[0] + two_tests[i][0]);
+        two_ext_dims[1] = (hsize_t)((int)two_prev_dims[1] + two_tests[i][1]);
 
-    /* Change the dimension sizes */
-    if(H5Dset_extent(did, two_ext_dims) < 0)
-        FAIL_STACK_ERROR
+        /* Change the dimension sizes */
+        if (H5Dset_extent(did, two_ext_dims) < 0)
+            FAIL_STACK_ERROR
 
-    /* Retrieve the dimension sizes */
-    if(H5LDget_dset_dims(did, two_cur_dims) < 0)
-        FAIL_STACK_ERROR
+        /* Retrieve the dimension sizes */
+        if (H5LDget_dset_dims(did, two_cur_dims) < 0)
+            FAIL_STACK_ERROR
 
-    /* Verify that the retrieved dimension sizes are correct as expected */
-    VERIFY_EQUAL(two_cur_dims[0], two_ext_dims[0])
-    VERIFY_EQUAL(two_cur_dims[1], two_ext_dims[1])
+        /* Verify that the retrieved dimension sizes are correct as expected */
+        VERIFY_EQUAL(two_cur_dims[0], two_ext_dims[0])
+        VERIFY_EQUAL(two_cur_dims[1], two_ext_dims[1])
     } /* end TWO_NTESTS */
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /* Close the file */
-    if(H5Fclose(fid) < 0)
-    FAIL_STACK_ERROR
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
 
     /* Remove the copied file */
     HDremove(COPY_FILENAME);
@@ -474,15 +481,16 @@ test_LD_dims(const char *file)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
-    return(-1);
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+    return (-1);
 
 } /* test_LD_dims() */
 
-
 /*
  **********************************************************************************
  *
@@ -514,33 +522,35 @@ error:
 static int
 test_LD_size(const char *file)
 {
-    hid_t fid=-1;    /* file identifier */
-    hid_t did=-1;    /* dataset identifier */
-    hid_t dtid=-1;    /* dataset's datatype identifier */
-    hid_t invalid_id=-1;
-    hid_t memb0_tid=-1;    /* type identifier for a member in the compound type */
-    hid_t memb1_tid=-1;    /* type identifier for a member in the compound type */
-    hid_t memb2_tid=-1;    /* type identifier for a member in the compound type */
-    hid_t memb3_tid=-1;    /* type identifier for a member in the compound type */
-    hid_t memb_tid=-1;    /* type identifier for a member in the compound type */
-    hid_t memb_tid2=-1;    /* type identifier for a member in the compound type */
-    size_t dsize;    /* size of the dataset's datatype */
-    size_t ck_dsize;    /* size of the dataset's datatype to be checked against */
+    hid_t  fid        = -1; /* file identifier */
+    hid_t  did        = -1; /* dataset identifier */
+    hid_t  dtid       = -1; /* dataset's datatype identifier */
+    hid_t  invalid_id = -1;
+    hid_t  memb0_tid  = -1; /* type identifier for a member in the compound type */
+    hid_t  memb1_tid  = -1; /* type identifier for a member in the compound type */
+    hid_t  memb2_tid  = -1; /* type identifier for a member in the compound type */
+    hid_t  memb3_tid  = -1; /* type identifier for a member in the compound type */
+    hid_t  memb_tid   = -1; /* type identifier for a member in the compound type */
+    hid_t  memb_tid2  = -1; /* type identifier for a member in the compound type */
+    size_t dsize;           /* size of the dataset's datatype */
+    size_t ck_dsize;        /* size of the dataset's datatype to be checked against */
 
     const char *filename = H5_get_srcdir_filename(file);
 
     HL_TESTING2("H5LDget_dset_type_size");
 
     /* Open the file */
-    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Verify failure with an invalid dataset id
      */
-    H5E_BEGIN_TRY {
-    dsize = H5LDget_dset_type_size(invalid_id, NULL);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        dsize = H5LDget_dset_type_size(invalid_id, NULL);
+    }
+    H5E_END_TRY;
     VERIFY_EQUAL(dsize, 0)
 
     /*
@@ -549,91 +559,91 @@ test_LD_size(const char *file)
      */
 
     /* Open dataset DSET_CMPD */
-    if((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Return size of the whole element */
-    if((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the dataset's datatype and then its datatype size */
-    if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+    if ((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
-    if((ck_dsize = H5Tget_size(dtid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(dtid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Verify case #1 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Get datatype id for each member */
-    if((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field1" */
-    FAIL_STACK_ERROR
-    if((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2" */
-    FAIL_STACK_ERROR
-    if((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field3" */
-    FAIL_STACK_ERROR
-    if((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4" */
-    FAIL_STACK_ERROR
+    if ((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field1" */
+        FAIL_STACK_ERROR
+    if ((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2" */
+        FAIL_STACK_ERROR
+    if ((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field3" */
+        FAIL_STACK_ERROR
+    if ((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4" */
+        FAIL_STACK_ERROR
 
     /* Obtain size for VALID_FIELDS1: "field1,field2.a,field3,field4" */
-    if((dsize = H5LDget_dset_type_size(did, VALID_FIELDS1)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, VALID_FIELDS1)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the datatype size for "field1" */
-    if((ck_dsize = H5Tget_size(memb0_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(memb0_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2.a" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field3" */
-    if((ck_dsize += H5Tget_size(memb2_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb2_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4" */
-    if((ck_dsize += H5Tget_size(memb3_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb3_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Verify case #2 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Obtain datatype size for VALID_FIELDS2: "field2.b.a,field2.c,field4.b" */
-    if((dsize = H5LDget_dset_type_size(did, VALID_FIELDS2)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, VALID_FIELDS2)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the datatype size for "field2.b.a" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
-    FAIL_STACK_ERROR
-    if((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize = H5Tget_size(memb_tid2)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid2) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
+        FAIL_STACK_ERROR
+    if ((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(memb_tid2)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid2) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2.c" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4.b" */
-    if((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Verify case #3 */
     VERIFY_EQUAL(dsize, ck_dsize)
@@ -657,18 +667,18 @@ test_LD_size(const char *file)
     VERIFY_EQUAL(dsize, 0)
 
     /* Closing */
-    if(H5Tclose(memb0_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb1_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb2_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb3_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(dtid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Tclose(memb0_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb1_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb2_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb3_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(dtid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Testing one-dimensional dataset with compound datatype and
@@ -677,91 +687,91 @@ test_LD_size(const char *file)
      */
 
     /* Open dataset DSET_CMPD_ESC */
-    if((did = H5Dopen2(fid, DSET_CMPD_ESC, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_CMPD_ESC, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Return size of the whole element */
-    if((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the dataset's datatype and then its datatype size */
-    if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+    if ((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(dtid)) == 0)
         FAIL_STACK_ERROR
-    if((ck_dsize = H5Tget_size(dtid)) == 0)
-    FAIL_STACK_ERROR
 
     /* Verify case #1 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Get datatype id for each member */
-    if((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field,1" */
-    FAIL_STACK_ERROR
-    if((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2." */
-    FAIL_STACK_ERROR
-    if((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field\3" */
-    FAIL_STACK_ERROR
-    if((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4," */
-    FAIL_STACK_ERROR
+    if ((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field,1" */
+        FAIL_STACK_ERROR
+    if ((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2." */
+        FAIL_STACK_ERROR
+    if ((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field\3" */
+        FAIL_STACK_ERROR
+    if ((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4," */
+        FAIL_STACK_ERROR
 
     /* Obtain size for VALID_ESC_FIELDS1: "field\\,1,field2\\..\\.a,field\\\\3,field4\\," */
-    if((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS1)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS1)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the datatype size for "field\\,1" */
-    if((ck_dsize = H5Tget_size(memb0_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(memb0_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2\\..\\.a" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field\\\\3" */
-    if((ck_dsize += H5Tget_size(memb2_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb2_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4\\," */
-    if((ck_dsize += H5Tget_size(memb3_tid)) == 0)
-    FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb3_tid)) == 0)
+        FAIL_STACK_ERROR
 
     /* Verify case #2 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Obtain datatype size for VALID_ESC_FIELDS2:
         "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\," */
-    if((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS2)) == 0)
-    FAIL_STACK_ERROR
+    if ((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS2)) == 0)
+        FAIL_STACK_ERROR
 
     /* Get the datatype size for "field2\..,b.a" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
-    FAIL_STACK_ERROR
-    if((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize = H5Tget_size(memb_tid2)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid2) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
+        FAIL_STACK_ERROR
+    if ((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize = H5Tget_size(memb_tid2)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid2) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2\..\\c" */
-    if((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4\,.b\," */
-    if((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
-    FAIL_STACK_ERROR
-    if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb_tid) < 0)
-    FAIL_STACK_ERROR
+    if ((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
+        FAIL_STACK_ERROR
+    if ((ck_dsize += H5Tget_size(memb_tid)) == 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb_tid) < 0)
+        FAIL_STACK_ERROR
 
     /* Verify case #3 */
     VERIFY_EQUAL(dsize, ck_dsize)
@@ -785,42 +795,43 @@ test_LD_size(const char *file)
     VERIFY_EQUAL(dsize, 0)
 
     /* Closing */
-    if(H5Tclose(memb0_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb1_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb2_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(memb3_tid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Tclose(dtid) < 0)
-    FAIL_STACK_ERROR
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
-
-    if(H5Fclose(fid) < 0)
-    FAIL_STACK_ERROR
+    if (H5Tclose(memb0_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb1_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb2_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(memb3_tid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(dtid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
+
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Tclose(memb0_tid);
-    H5Tclose(memb1_tid);
-    H5Tclose(memb2_tid);
-    H5Tclose(memb3_tid);
-    H5Tclose(memb_tid);
-    H5Tclose(memb_tid2);
-    H5Tclose(dtid);
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
-    return(-1);
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(memb0_tid);
+        H5Tclose(memb1_tid);
+        H5Tclose(memb2_tid);
+        H5Tclose(memb3_tid);
+        H5Tclose(memb_tid);
+        H5Tclose(memb_tid2);
+        H5Tclose(dtid);
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+    return (-1);
 
 } /* test_LD_size() */
 
-
 /*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
@@ -844,32 +855,32 @@ error:
 static int
 test_LD_elmts_invalid(const char *file)
 {
-    hid_t fid=-1;        /* file identifier */
-    hid_t did=-1;        /* dataset identifier */
-    hid_t sid=-1;        /* dataspace identifier */
-    hid_t invalid_id=-1;
-    int ret;            /* return value */
-    hsize_t cur_dims[2];    /* current dimension sizes of the dataset */
-    hsize_t prev_dims[2];    /* previous dimension sizes of the dataset */
-    char tbuf[2];    /* temporary buffer for testing */
-    int ndims;        /* # of dimension sizes */
-    int i;        /* local index variable */
+    hid_t   fid        = -1; /* file identifier */
+    hid_t   did        = -1; /* dataset identifier */
+    hid_t   sid        = -1; /* dataspace identifier */
+    hid_t   invalid_id = -1;
+    int     ret;          /* return value */
+    hsize_t cur_dims[2];  /* current dimension sizes of the dataset */
+    hsize_t prev_dims[2]; /* previous dimension sizes of the dataset */
+    char    tbuf[2];      /* temporary buffer for testing */
+    int     ndims;        /* # of dimension sizes */
+    int     i;            /* local index variable */
 
     const char *filename = H5_get_srcdir_filename(file);
 
     HL_TESTING2("H5LDget_dset_elmts on invalid conditions");
 
     /* Open the copied file */
-    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Testing two-dimensional dataset: DSET_TWO
      */
 
     /* Open dataset: DSET_TWO */
-    if((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Verify failure from case #1: cur_dims and prev_dims are NULL */
     ret = H5LDget_dset_elmts(did, NULL, NULL, NULL, NULL);
@@ -883,16 +894,16 @@ test_LD_elmts_invalid(const char *file)
     ret = H5LDget_dset_elmts(did, NULL, prev_dims, NULL, NULL);
     VERIFY_EQUAL(ret, FAIL)
 
-    if((sid = H5Dget_space(did)) < 0)
-    FAIL_STACK_ERROR
+    if ((sid = H5Dget_space(did)) < 0)
+        FAIL_STACK_ERROR
 
     /* Get the # of dimensions and current dimension sizes */
-    if((ndims = H5Sget_simple_extent_dims(sid, cur_dims, NULL)) < 0)
-    FAIL_STACK_ERROR
+    if ((ndims = H5Sget_simple_extent_dims(sid, cur_dims, NULL)) < 0)
+        FAIL_STACK_ERROR
 
     /* Set up valid cur_dims and prev_dims */
-    for(i = 0; i < ndims; i++)
-    prev_dims[i] = cur_dims[i] - 1;
+    for (i = 0; i < ndims; i++)
+        prev_dims[i] = cur_dims[i] - 1;
 
     /* Verify failure from case #4: FIELDS is nonNULL but the dataset is not compound datatype */
     ret = H5LDget_dset_elmts(did, prev_dims, cur_dims, "field1", tbuf);
@@ -905,12 +916,12 @@ test_LD_elmts_invalid(const char *file)
     /* Verify failure from case #6: cur_dims is not > than prev_dims */
     cur_dims[0] = prev_dims[0] - 1;
     cur_dims[1] = prev_dims[1] - 1;
-    ret = H5LDget_dset_elmts(did, prev_dims, cur_dims, NULL, tbuf);
+    ret         = H5LDget_dset_elmts(did, prev_dims, cur_dims, NULL, tbuf);
     VERIFY_EQUAL(ret, FAIL)
 
     /* Close DSET_TWO */
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Testing one-dimensional dataset with compound datatype:
@@ -918,18 +929,20 @@ test_LD_elmts_invalid(const char *file)
      */
 
     /* Verify failure from case #1: an invalid dataset id */
-    H5E_BEGIN_TRY {
-    ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
+    }
+    H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
 
     /* Open dataset: DSET_CMPD */
-    if((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Retrieve the current dimension sizes */
-    if(H5LDget_dset_dims(did, cur_dims) < 0)
-    FAIL_STACK_ERROR
+    if (H5LDget_dset_dims(did, cur_dims) < 0)
+        FAIL_STACK_ERROR
 
     /* Set up valid cur_dims, prev_dims */
     prev_dims[0] = cur_dims[0] - 1;
@@ -939,27 +952,28 @@ test_LD_elmts_invalid(const char *file)
     VERIFY_EQUAL(ret, FAIL)
 
     /* Close DSET_CMPD */
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
 
     /* Close the file */
-    if(H5Fclose(fid) < 0)
-    FAIL_STACK_ERROR
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Sclose(sid);
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
-    return(-1);
+    H5E_BEGIN_TRY
+    {
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+    return (-1);
 
 } /* test_LD_elmts_invalid() */
 
-
 /*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
@@ -982,122 +996,122 @@ error:
 static herr_t
 test_LD_elmts_one(const char *file, const char *dname, const char *fields)
 {
-    hid_t fid=-1;        /* file identifier */
-    hid_t did=-1;        /* dataset identifier */
-    hid_t dtype=-1;        /* dataset's data type */
-    hsize_t ext_dims[1];    /* extended dimension sizes of the dataset */
-    hsize_t prev_dims[1];    /* previous dimension sizes of the dataset */
-    int i, j;            /* local index variable */
-    int ret = 0;        /* return value */
+    hid_t   fid   = -1;   /* file identifier */
+    hid_t   did   = -1;   /* dataset identifier */
+    hid_t   dtype = -1;   /* dataset's data type */
+    hsize_t ext_dims[1];  /* extended dimension sizes of the dataset */
+    hsize_t prev_dims[1]; /* previous dimension sizes of the dataset */
+    int     i, j;         /* local index variable */
+    int     ret = 0;      /* return value */
 
     HL_TESTING2("H5LDget_dset_elmts: one-dimensional dataset");
 
     /* Copy the test file */
-    if(h5_make_local_copy(file, COPY_FILENAME) < 0)
+    if (h5_make_local_copy(file, COPY_FILENAME) < 0)
         TEST_ERROR
 
-    for(i = 0; i < TEST_BUF_SIZE; i++) {
-    cbuf[i].field1 = i;
-    cbuf[i].field2.a = i;
-    cbuf[i].field2.b.a = i;
-    cbuf[i].field2.b.b = i;
-    cbuf[i].field2.b.c = i;
-    cbuf[i].field2.c = i;
-    cbuf[i].field3 = (double)i;
-    cbuf[i].field4.a = i;
-    cbuf[i].field4.b = i;
-    ibuf[i] = i;
+    for (i = 0; i < TEST_BUF_SIZE; i++) {
+        cbuf[i].field1     = i;
+        cbuf[i].field2.a   = i;
+        cbuf[i].field2.b.a = i;
+        cbuf[i].field2.b.b = i;
+        cbuf[i].field2.b.c = i;
+        cbuf[i].field2.c   = i;
+        cbuf[i].field3     = (double)i;
+        cbuf[i].field4.a   = i;
+        cbuf[i].field4.b   = i;
+        ibuf[i]            = i;
     } /* end for */
 
     /* Open the copied file */
-    if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Get the dataset's data type */
-    if((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Get current dimension sizes before extending the dataset's dimension sizes */
-    if(H5LDget_dset_dims(did, prev_dims) < 0)
-    FAIL_STACK_ERROR
-
-    /* Loop through different variations of extending the dataset */
-    for(i = 0; i < ONE_NTESTS; i++) {
-    HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
-    HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
-    HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-    HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
-
-    ext_dims[0] = (hsize_t)((int)prev_dims[0] + one_tests[i]);
-
-    /* Change the dimension sizes of the dataset */
-    if(H5Dset_extent(did, ext_dims) < 0)
+    if (H5LDget_dset_dims(did, prev_dims) < 0)
         FAIL_STACK_ERROR
 
-    /* Initialize data */
-    if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
-        FAIL_STACK_ERROR
-    } /* end if */
-        else if(!HDstrcmp(dname, DSET_ONE)) {
-        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
-        FAIL_STACK_ERROR
-    } /* end if */
+    /* Loop through different variations of extending the dataset */
+    for (i = 0; i < ONE_NTESTS; i++) {
+        HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
+        HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
+        HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+        HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
+
+        ext_dims[0] = (hsize_t)((int)prev_dims[0] + one_tests[i]);
+
+        /* Change the dimension sizes of the dataset */
+        if (H5Dset_extent(did, ext_dims) < 0)
+            FAIL_STACK_ERROR
+
+        /* Initialize data */
+        if (!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+            if (H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
+                FAIL_STACK_ERROR
+        } /* end if */
+        else if (!HDstrcmp(dname, DSET_ONE)) {
+            if (H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
+                FAIL_STACK_ERROR
+        } /* end if */
 
-    /* There are changes in dimension sizes */
-    if(one_tests[i] > 0) {
-        if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-        if(fields) {
-                    if(!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
+        /* There are changes in dimension sizes */
+        if (one_tests[i] > 0) {
+            if (!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+                if (fields) {
+                    if (!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
                         /* Retrieve the elmemts in BUF */
-                        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
+                        if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
                             TEST_ERROR
-                        for(j = 0; j < one_tests[i]; j++)
+                        for (j = 0; j < one_tests[i]; j++)
                             VERIFY_ELMTS_VALID1(vbuf1[j], cbuf[prev_dims[0] + (hsize_t)j])
                     } /* end if */
-                    else if(!HDstrcmp(fields, VALID_FIELDS2) || !HDstrcmp(fields, VALID_ESC_FIELDS2)) {
+                    else if (!HDstrcmp(fields, VALID_FIELDS2) || !HDstrcmp(fields, VALID_ESC_FIELDS2)) {
                         /* Retrieve the elmemts in BUF */
-                        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf2) < 0)
+                        if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf2) < 0)
                             TEST_ERROR
-                        for(j = 0; j < one_tests[i]; j++)
+                        for (j = 0; j < one_tests[i]; j++)
                             VERIFY_ELMTS_VALID2(vbuf2[j], cbuf[prev_dims[0] + (hsize_t)j])
                     } /* end else-if */
                     else
-            TEST_ERROR
-        } /* end if */
+                        TEST_ERROR
+                } /* end if */
                 else {
-            /* Retrieve the elmemts in BUF */
-            if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
-            TEST_ERROR
-            for(j = 0; j < one_tests[i]; j++)
-            VERIFY_ELMTS_ALL(ccbuf[j], cbuf[prev_dims[0] + (hsize_t)j])
-        } /* end else-if */
-        } /* end if */
+                    /* Retrieve the elmemts in BUF */
+                    if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
+                        TEST_ERROR
+                    for (j = 0; j < one_tests[i]; j++)
+                        VERIFY_ELMTS_ALL(ccbuf[j], cbuf[prev_dims[0] + (hsize_t)j])
+                } /* end else-if */
+            }     /* end if */
             else {
-        /* Retrieve the elmemts in BUF */
-        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
-            TEST_ERROR
-        for(j = 0; j < one_tests[i]; j++)
-            VERIFY_EQUAL(iibuf[j], ibuf[prev_dims[0] + (hsize_t)j])
-        } /* end else */
-    } /* end if */
+                /* Retrieve the elmemts in BUF */
+                if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
+                    TEST_ERROR
+                for (j = 0; j < one_tests[i]; j++)
+                    VERIFY_EQUAL(iibuf[j], ibuf[prev_dims[0] + (hsize_t)j])
+            } /* end else */
+        }     /* end if */
         else {
             /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
             ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
             VERIFY_EQUAL(ret, FAIL)
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     /* Closing */
-    if(H5Tclose(dtype) < 0)
+    if (H5Tclose(dtype) < 0)
         FAIL_STACK_ERROR
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         FAIL_STACK_ERROR
 
     /* Remove the copied file */
@@ -1107,15 +1121,16 @@ test_LD_elmts_one(const char *file, const char *dname, const char *fields)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Tclose(dtype);
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
-    return(-1);
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(dtype);
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+    return (-1);
 } /* test_LD_elmts_one() */
 
-
 /*
  **************************************************************************************
  *
@@ -1137,36 +1152,35 @@ error:
  **************************************************************************************
  */
 static herr_t
-verify_elmts_two(int type, hsize_t *ext_dims, hsize_t *prev_dims,  void *_ldbuf, void *_buf)
+verify_elmts_two(int type, hsize_t *ext_dims, hsize_t *prev_dims, void *_ldbuf, void *_buf)
 {
-    int k, m;        /* Local index variable */
+    int k, m; /* Local index variable */
 
     k = 0;
-    for(m = 0; m < (int)ext_dims[0]; m++) {
-        int n, ind;    /* Local index variable */
-
-    ind = m * (int)ext_dims[1];
-    if(m < (int)prev_dims[0]) {
-        for(n = (int)prev_dims[1]; n < (int)ext_dims[1]; n++) {
-        VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
-        ++k;
-        }  /* end for */
-    } /* end if */
+    for (m = 0; m < (int)ext_dims[0]; m++) {
+        int n, ind; /* Local index variable */
+
+        ind = m * (int)ext_dims[1];
+        if (m < (int)prev_dims[0]) {
+            for (n = (int)prev_dims[1]; n < (int)ext_dims[1]; n++) {
+                VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
+                ++k;
+            } /* end for */
+        }     /* end if */
         else {
-        for(n = 0; n < (int)ext_dims[1]; n++) {
-        VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
-        ++k;
-        } /* end for */
-    } /* end else */
-    } /* end for */
+            for (n = 0; n < (int)ext_dims[1]; n++) {
+                VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
+                ++k;
+            } /* end for */
+        }     /* end else */
+    }         /* end for */
 
-    return(0);
+    return (0);
 
 error:
-    return(-1);
+    return (-1);
 } /* verify_elmts_two() */
 
-
 /*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
@@ -1193,126 +1207,126 @@ error:
 static herr_t
 test_LD_elmts_two(const char *file, const char *dname, const char *fields)
 {
-    hid_t fid=-1;        /* file identifier */
-    hid_t did=-1;        /* dataset identifier */
-    hid_t dtype=-1;        /* dataset's data type */
-    hsize_t ext_dims[2];    /* extended dimension sizes of the dataset */
-    hsize_t prev_dims[2];    /* previous dimension sizes of the dataset */
-    int i;            /* local index variable */
-    int ret = 0;        /* return value */
+    hid_t   fid   = -1;   /* file identifier */
+    hid_t   did   = -1;   /* dataset identifier */
+    hid_t   dtype = -1;   /* dataset's data type */
+    hsize_t ext_dims[2];  /* extended dimension sizes of the dataset */
+    hsize_t prev_dims[2]; /* previous dimension sizes of the dataset */
+    int     i;            /* local index variable */
+    int     ret = 0;      /* return value */
 
     HL_TESTING2("H5LDget_dset_elmts: two-dimensional dataset");
 
     /* Copy the test file */
-    if(h5_make_local_copy(file, COPY_FILENAME) < 0)
+    if (h5_make_local_copy(file, COPY_FILENAME) < 0)
         TEST_ERROR
 
-    for(i = 0; i < TEST_BUF_SIZE; i++) {
-    cbuf[i].field1 = i;
-    cbuf[i].field2.a = i;
-    cbuf[i].field2.b.a = i;
-    cbuf[i].field2.b.b = i;
-    cbuf[i].field2.b.c = i;
-    cbuf[i].field2.c = i;
-    cbuf[i].field3 = (double)i;
-    cbuf[i].field4.a = i;
-    cbuf[i].field4.b = i;
-    ibuf[i] = i;
+    for (i = 0; i < TEST_BUF_SIZE; i++) {
+        cbuf[i].field1     = i;
+        cbuf[i].field2.a   = i;
+        cbuf[i].field2.b.a = i;
+        cbuf[i].field2.b.b = i;
+        cbuf[i].field2.b.c = i;
+        cbuf[i].field2.c   = i;
+        cbuf[i].field3     = (double)i;
+        cbuf[i].field4.a   = i;
+        cbuf[i].field4.b   = i;
+        ibuf[i]            = i;
     } /* end for */
 
     /* Open the copied file */
-    if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Get the dataset's data type */
-    if((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
-    FAIL_STACK_ERROR
+    if ((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Get current dimension sizes before extending the dataset's dimension sizes */
-    if(H5LDget_dset_dims(did, prev_dims) < 0)
-    FAIL_STACK_ERROR
-
-    /* Loop through different variations of extending the dataset */
-    for(i = 0; i < TWO_NTESTS; i++) {
-    HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
-    HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
-    HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-    HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
-
-    ext_dims[0] = (hsize_t)((int)prev_dims[0] + two_tests[i][0]);
-    ext_dims[1] = (hsize_t)((int)prev_dims[1] + two_tests[i][1]);
-
-    /* Change the dimension sizes of the dataset */
-    if(H5Dset_extent(did, ext_dims) < 0)
+    if (H5LDget_dset_dims(did, prev_dims) < 0)
         FAIL_STACK_ERROR
 
-    /* Initialize data */
-    if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
-        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
-        FAIL_STACK_ERROR
-    } /* end if */
-        else if(!HDstrcmp(dname, DSET_TWO)) {
-        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
-        FAIL_STACK_ERROR
-    } /* end else-if */
+    /* Loop through different variations of extending the dataset */
+    for (i = 0; i < TWO_NTESTS; i++) {
+        HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
+        HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
+        HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+        HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
+
+        ext_dims[0] = (hsize_t)((int)prev_dims[0] + two_tests[i][0]);
+        ext_dims[1] = (hsize_t)((int)prev_dims[1] + two_tests[i][1]);
+
+        /* Change the dimension sizes of the dataset */
+        if (H5Dset_extent(did, ext_dims) < 0)
+            FAIL_STACK_ERROR
+
+        /* Initialize data */
+        if (!HDstrcmp(dname, DSET_CMPD_TWO)) {
+            if (H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
+                FAIL_STACK_ERROR
+        } /* end if */
+        else if (!HDstrcmp(dname, DSET_TWO)) {
+            if (H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
+                FAIL_STACK_ERROR
+        } /* end else-if */
         else
             TEST_ERROR
 
-    /* There are changes in dimension sizes */
-    if(two_tests[i][0] > 0 || two_tests[i][1] > 0) {
-        if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
-        if(fields) {
-                     if(!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
+        /* There are changes in dimension sizes */
+        if (two_tests[i][0] > 0 || two_tests[i][1] > 0) {
+            if (!HDstrcmp(dname, DSET_CMPD_TWO)) {
+                if (fields) {
+                    if (!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
                         /* Retrieve the elmemts in BUF */
-                        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
+                        if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
                             TEST_ERROR
-                        if(verify_elmts_two(TWO_CMPD_VALID1, ext_dims, prev_dims, vbuf1, cbuf) < 0)
+                        if (verify_elmts_two(TWO_CMPD_VALID1, ext_dims, prev_dims, vbuf1, cbuf) < 0)
                             TEST_ERROR
                     } /* end if */
-                    else if(!HDstrcmp(fields, VALID_FIELDS2) || !HDstrcmp(fields, VALID_ESC_FIELDS2)) {
+                    else if (!HDstrcmp(fields, VALID_FIELDS2) || !HDstrcmp(fields, VALID_ESC_FIELDS2)) {
                         /* Retrieve the elmemts in BUF */
-                        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf2) < 0)
+                        if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf2) < 0)
                             TEST_ERROR
-                        if(verify_elmts_two(TWO_CMPD_VALID2, ext_dims, prev_dims, vbuf2, cbuf) < 0)
+                        if (verify_elmts_two(TWO_CMPD_VALID2, ext_dims, prev_dims, vbuf2, cbuf) < 0)
                             TEST_ERROR
                     } /* end else-if */
                     else
                         TEST_ERROR
-        } /* end if */
+                } /* end if */
                 else {
-            /* Retrieve the elmemts in BUF */
-            if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
-            TEST_ERROR
-            if(verify_elmts_two(TWO_CMPD_NULL, ext_dims, prev_dims, ccbuf, cbuf) < 0)
-            TEST_ERROR
-        } /* end else */
-        } /* end if */
+                    /* Retrieve the elmemts in BUF */
+                    if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
+                        TEST_ERROR
+                    if (verify_elmts_two(TWO_CMPD_NULL, ext_dims, prev_dims, ccbuf, cbuf) < 0)
+                        TEST_ERROR
+                }  /* end else */
+            }      /* end if */
             else { /* DSET_TWO */
-        /* Retrieve the elmemts in BUF */
-        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
-            TEST_ERROR
-            if(verify_elmts_two(TWO_NONE, ext_dims, prev_dims, iibuf, ibuf) < 0)
-            TEST_ERROR
-        } /* end else */
-    } /* end if */
+                /* Retrieve the elmemts in BUF */
+                if (H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
+                    TEST_ERROR
+                if (verify_elmts_two(TWO_NONE, ext_dims, prev_dims, iibuf, ibuf) < 0)
+                    TEST_ERROR
+            } /* end else */
+        }     /* end if */
         else {
-        /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
-        ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
-        VERIFY_EQUAL(ret, FAIL)
-    } /* end else */
-    } /* end for */
+            /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
+            ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
+            VERIFY_EQUAL(ret, FAIL)
+        } /* end else */
+    }     /* end for */
 
     /* Closing */
-    if(H5Tclose(dtype) < 0)
-    FAIL_STACK_ERROR;
-    if(H5Dclose(did) < 0)
-    FAIL_STACK_ERROR;
-    if(H5Fclose(fid) < 0)
-    FAIL_STACK_ERROR;
+    if (H5Tclose(dtype) < 0)
+        FAIL_STACK_ERROR;
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR;
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR;
 
     /* Remove the copied file */
     HDremove(COPY_FILENAME);
@@ -1321,37 +1335,40 @@ test_LD_elmts_two(const char *file, const char *dname, const char *fields)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Tclose(dtype);
-    H5Dclose(did);
-    H5Fclose(fid);
-    } H5E_END_TRY;
-    return(-1);
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(dtype);
+        H5Dclose(did);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+    return (-1);
 } /* test_LD_elmts_two() */
 
 /*
  * Tests for High Level routines:
  *    H5LDget_dset_dims(), H5LDget_dset_elmts, H5LDget_dset_type_size()
  */
-int main(void)
+int
+main(void)
 {
-    int  nerrors = 0;
+    int nerrors = 0;
 
     /* Set up temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */
-    if(NULL == (ibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
-    if(NULL == (iibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
+    if (NULL == (ibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
+    if (NULL == (iibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
 
-    if(NULL == (cbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
-    if(NULL == (ccbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
+    if (NULL == (cbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
+    if (NULL == (ccbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
 
-    if(NULL == (vbuf1 = (test_valid_fields1 *)HDmalloc(sizeof(test_valid_fields1) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
-    if(NULL == (vbuf2 = (test_valid_fields2 *)HDmalloc(sizeof(test_valid_fields2) * TEST_BUF_SIZE)))
-    FAIL_STACK_ERROR;
+    if (NULL == (vbuf1 = (test_valid_fields1 *)HDmalloc(sizeof(test_valid_fields1) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
+    if (NULL == (vbuf2 = (test_valid_fields2 *)HDmalloc(sizeof(test_valid_fields2) * TEST_BUF_SIZE)))
+        FAIL_STACK_ERROR;
 
     /*
      * Testing H5LDget_dset_dims()
@@ -1401,28 +1418,27 @@ int main(void)
     nerrors += test_LD_elmts_two(FILE, DSET_CMPD_TWO, VALID_FIELDS2);
 
     /* Free temporary buffers */
-    if(ibuf)
+    if (ibuf)
         HDfree(ibuf);
-    if(iibuf)
+    if (iibuf)
         HDfree(iibuf);
-    if(cbuf)
+    if (cbuf)
         HDfree(cbuf);
-    if(ccbuf)
+    if (ccbuf)
         HDfree(ccbuf);
-    if(vbuf1)
+    if (vbuf1)
         HDfree(vbuf1);
-    if(vbuf2)
+    if (vbuf2)
         HDfree(vbuf2);
 
     /* check for errors */
-    if(nerrors)
-    goto error;
+    if (nerrors)
+        goto error;
 
     puts("All tests for H5LD high level routines passed.");
 
-    return(0);
+    return (0);
 
 error:
-    return(1);
+    return (1);
 } /* main() */
-
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index e6b4668..a255e50 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
 #include <string.h>
@@ -17,7 +17,7 @@
 #include "H5srcdir.h"
 #include "H5LTpublic.h"
 
-#define FILE_NAME "test_lite1.h5"
+#define FILE_NAME  "test_lite1.h5"
 #define FILE_NAME2 "test_lite2.h5"
 #define FILE_NAME3 "test_lite3.h5"
 #define FILE_NAME4 "test_lite4.h5"
@@ -35,78 +35,76 @@
 #define DIM 6
 
 #define ATTR_NAME_SUB "att"
-#define ATTR1_NAME "attr string"
-#define ATTR2_NAME "attr char"
-#define ATTR3_NAME "attr short"
-#define ATTR4_NAME "attr int"
+#define ATTR1_NAME    "attr string"
+#define ATTR2_NAME    "attr char"
+#define ATTR3_NAME    "attr short"
+#define ATTR4_NAME    "attr int"
 #define ATTR_NAME_EXT "att int ext"
-#define ATTR5_NAME "attr long"
-#define ATTR6_NAME "attr uchar"
-#define ATTR7_NAME "attr ushort"
-#define ATTR8_NAME "attr uint"
-#define ATTR9_NAME "attr ulong"
-#define ATTR10_NAME "attr float"
-#define ATTR11_NAME "attr double"
-
-static herr_t make_attributes( hid_t loc_id, const char* obj_name );
+#define ATTR5_NAME    "attr long"
+#define ATTR6_NAME    "attr uchar"
+#define ATTR7_NAME    "attr ushort"
+#define ATTR8_NAME    "attr uint"
+#define ATTR9_NAME    "attr ulong"
+#define ATTR10_NAME   "attr float"
+#define ATTR11_NAME   "attr double"
 
+static herr_t make_attributes(hid_t loc_id, const char *obj_name);
 
 /*-------------------------------------------------------------------------
-* test dataset functions
-*-------------------------------------------------------------------------
-*/
+ * test dataset functions
+ *-------------------------------------------------------------------------
+ */
 
-static int test_dsets( void )
+static int
+test_dsets(void)
 {
-    int     rank     = 2;
-    hsize_t dims[2]  = {2,3};
-    hid_t   file_id;
-    hid_t   dataset_id;
-    char    data_char_in[DIM]    = {1,2,3,4,5,6};
-    char    data_char_out[DIM];
-    short   data_short_in[DIM]   = {1,2,3,4,5,6};
-    short   data_short_out[DIM];
-    int     data_int_in[DIM]     = {1,2,3,4,5,6};
-    int     data_int_out[DIM];
-    long    data_long_in[DIM]    = {1,2,3,4,5,6};
-    long    data_long_out[DIM];
-    float   data_float_in[DIM]   = {1,2,3,4,5,6};
-    float   data_float_out[DIM];
-    double  data_double_in[DIM]  = {1,2,3,4,5,6};
-    double  data_double_out[DIM];
-    const char    *data_string_in = "This is a string";
-    char    data_string_out[20];
-    int     i;
-
+    int         rank    = 2;
+    hsize_t     dims[2] = {2, 3};
+    hid_t       file_id;
+    hid_t       dataset_id;
+    char        data_char_in[DIM] = {1, 2, 3, 4, 5, 6};
+    char        data_char_out[DIM];
+    short       data_short_in[DIM] = {1, 2, 3, 4, 5, 6};
+    short       data_short_out[DIM];
+    int         data_int_in[DIM] = {1, 2, 3, 4, 5, 6};
+    int         data_int_out[DIM];
+    long        data_long_in[DIM] = {1, 2, 3, 4, 5, 6};
+    long        data_long_out[DIM];
+    float       data_float_in[DIM] = {1, 2, 3, 4, 5, 6};
+    float       data_float_out[DIM];
+    double      data_double_in[DIM] = {1, 2, 3, 4, 5, 6};
+    double      data_double_out[DIM];
+    const char *data_string_in = "This is a string";
+    char        data_string_out[20];
+    int         i;
 
     /* Create a new file using default properties. */
-    file_id = H5Fcreate( FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+    file_id = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset");
 
     /* Make dataset */
-    if ( H5LTmake_dataset( file_id, DSET0_NAME, rank, dims, H5T_NATIVE_INT, data_int_in ) < 0 )
+    if (H5LTmake_dataset(file_id, DSET0_NAME, rank, dims, H5T_NATIVE_INT, data_int_in) < 0)
         goto out;
 
     /* Read dataset using the basic HDF5 API */
 
-    if ( ( dataset_id = H5Dopen2(file_id, DSET0_NAME, H5P_DEFAULT) ) < 0 )
+    if ((dataset_id = H5Dopen2(file_id, DSET0_NAME, H5P_DEFAULT)) < 0)
         goto out;
 
-    if ( H5Dread ( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_int_out ) < 0 )
+    if (H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_int_out) < 0)
         goto out;
 
-    if ( H5Dclose( dataset_id ) < 0 )
+    if (H5Dclose(dataset_id) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_int_in[i] != data_int_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_int_in[i] != data_int_out[i]) {
             goto out;
         }
     }
@@ -114,18 +112,17 @@ static int test_dsets( void )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * read using the LT function H5LTread_dataset
-    *-------------------------------------------------------------------------
-    */
+     * read using the LT function H5LTread_dataset
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTread_dataset");
 
-    if ( H5LTread_dataset( file_id, DSET0_NAME, H5T_NATIVE_INT, data_int_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET0_NAME, H5T_NATIVE_INT, data_int_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_int_in[i] != data_int_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_int_in[i] != data_int_out[i]) {
             goto out;
         }
     }
@@ -133,76 +130,70 @@ static int test_dsets( void )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test the H5LTmake_dataset_ functions
-    *-------------------------------------------------------------------------
-    */
-
+     * test the H5LTmake_dataset_ functions
+     *-------------------------------------------------------------------------
+     */
 
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_char
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_char
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_char");
 
     /* Make dataset char */
-    if ( H5LTmake_dataset_char( file_id, DSET1_NAME, rank, dims, data_char_in ) < 0 )
+    if (H5LTmake_dataset_char(file_id, DSET1_NAME, rank, dims, data_char_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET1_NAME, H5T_NATIVE_CHAR, data_char_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET1_NAME, H5T_NATIVE_CHAR, data_char_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_char_in[i] != data_char_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_char_in[i] != data_char_out[i]) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_char( file_id, DSET1_NAME, data_char_out ) < 0 )
+    if (H5LTread_dataset_char(file_id, DSET1_NAME, data_char_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_char_in[i] != data_char_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_char_in[i] != data_char_out[i]) {
             goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_short
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_short
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_short");
 
     /* Make dataset short */
-    if ( H5LTmake_dataset_short( file_id, DSET2_NAME, rank, dims, data_short_in ) < 0 )
+    if (H5LTmake_dataset_short(file_id, DSET2_NAME, rank, dims, data_short_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET2_NAME, H5T_NATIVE_SHORT, data_short_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET2_NAME, H5T_NATIVE_SHORT, data_short_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_short_in[i] != data_short_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_short_in[i] != data_short_out[i]) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_short( file_id, DSET2_NAME, data_short_out ) < 0 )
+    if (H5LTread_dataset_short(file_id, DSET2_NAME, data_short_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_short_in[i] != data_short_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_short_in[i] != data_short_out[i]) {
             goto out;
         }
     }
@@ -210,180 +201,165 @@ static int test_dsets( void )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_int
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_int
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_int");
 
     /* Make dataset int */
-    if ( H5LTmake_dataset_int( file_id, DSET3_NAME, rank, dims, data_int_in ) < 0 )
+    if (H5LTmake_dataset_int(file_id, DSET3_NAME, rank, dims, data_int_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET3_NAME, H5T_NATIVE_INT, data_int_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET3_NAME, H5T_NATIVE_INT, data_int_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_int_in[i] != data_int_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_int_in[i] != data_int_out[i]) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_int( file_id, DSET3_NAME, data_int_out ) < 0 )
+    if (H5LTread_dataset_int(file_id, DSET3_NAME, data_int_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_int_in[i] != data_int_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_int_in[i] != data_int_out[i]) {
             goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_long
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_long
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_long");
 
     /* Make dataset long */
-    if ( H5LTmake_dataset_long( file_id, DSET4_NAME, rank, dims, data_long_in ) < 0 )
+    if (H5LTmake_dataset_long(file_id, DSET4_NAME, rank, dims, data_long_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET4_NAME, H5T_NATIVE_LONG, data_long_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET4_NAME, H5T_NATIVE_LONG, data_long_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_long_in[i] != data_long_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_long_in[i] != data_long_out[i]) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_long( file_id, DSET4_NAME, data_long_out ) < 0 )
+    if (H5LTread_dataset_long(file_id, DSET4_NAME, data_long_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if ( data_long_in[i] != data_long_out[i] ) {
+    for (i = 0; i < DIM; i++) {
+        if (data_long_in[i] != data_long_out[i]) {
             goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_float
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_float
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_float");
 
     /* Make dataset float */
-    if ( H5LTmake_dataset_float( file_id, DSET5_NAME, rank, dims, data_float_in ) < 0 )
+    if (H5LTmake_dataset_float(file_id, DSET5_NAME, rank, dims, data_float_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET5_NAME, H5T_NATIVE_FLOAT, data_float_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET5_NAME, H5T_NATIVE_FLOAT, data_float_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if(!H5_FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
+    for (i = 0; i < DIM; i++) {
+        if (!H5_FLT_ABS_EQUAL(data_float_in[i], data_float_out[i])) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_float( file_id, DSET5_NAME, data_float_out ) < 0 )
+    if (H5LTread_dataset_float(file_id, DSET5_NAME, data_float_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if(!H5_FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
+    for (i = 0; i < DIM; i++) {
+        if (!H5_FLT_ABS_EQUAL(data_float_in[i], data_float_out[i])) {
             goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_double
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_double
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_double");
 
     /* Make dataset double */
-    if ( H5LTmake_dataset_double( file_id, DSET6_NAME, rank, dims, data_double_in ) < 0 )
+    if (H5LTmake_dataset_double(file_id, DSET6_NAME, rank, dims, data_double_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset( file_id, DSET6_NAME, H5T_NATIVE_DOUBLE, data_double_out ) < 0 )
+    if (H5LTread_dataset(file_id, DSET6_NAME, H5T_NATIVE_DOUBLE, data_double_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if(!H5_DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
+    for (i = 0; i < DIM; i++) {
+        if (!H5_DBL_ABS_EQUAL(data_double_in[i], data_double_out[i])) {
             goto out;
         }
     }
 
     /* Read dataset */
-    if ( H5LTread_dataset_double( file_id, DSET6_NAME, data_double_out ) < 0 )
+    if (H5LTread_dataset_double(file_id, DSET6_NAME, data_double_out) < 0)
         goto out;
 
-    for (i = 0; i < DIM; i++)
-    {
-        if(!H5_DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
+    for (i = 0; i < DIM; i++) {
+        if (!H5_DBL_ABS_EQUAL(data_double_in[i], data_double_out[i])) {
             goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTmake_dataset_string
-    *-------------------------------------------------------------------------
-    */
+     * H5LTmake_dataset_string
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTmake_dataset_string");
 
     /* Make dataset string */
-    if ( H5LTmake_dataset_string(file_id,DSET7_NAME,data_string_in) < 0 )
+    if (H5LTmake_dataset_string(file_id, DSET7_NAME, data_string_in) < 0)
         goto out;
 
     /* Read dataset */
-    if ( H5LTread_dataset_string(file_id,DSET7_NAME,data_string_out) < 0 )
+    if (H5LTread_dataset_string(file_id, DSET7_NAME, data_string_out) < 0)
         goto out;
 
-    if ( HDstrcmp(data_string_in,data_string_out) != 0 )
+    if (HDstrcmp(data_string_in, data_string_out) != 0)
         goto out;
 
-
-
     /*-------------------------------------------------------------------------
-    * end tests
-    *-------------------------------------------------------------------------
-    */
+     * end tests
+     *-------------------------------------------------------------------------
+     */
 
     /* Close the file. */
-    H5Fclose( file_id );
+    H5Fclose(file_id);
 
     PASSED();
 
-
     return 0;
 
 out:
@@ -393,75 +369,83 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* test attribute functions
-*-------------------------------------------------------------------------
-*/
+ * test attribute functions
+ *-------------------------------------------------------------------------
+ */
 
-static int test_attr(void)
+static int
+test_attr(void)
 {
     hid_t   file_id;
     hid_t   dataset_id;
     hid_t   group_id;
     hid_t   space_id;
-    hsize_t dims[1] = { 5 };
+    hsize_t dims[1] = {5};
 
     /* Create a new file using default properties. */
     file_id = H5Fcreate(FILE_NAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * Create a dataset named "dset" on the root group
-    *-------------------------------------------------------------------------
-    */
+     * Create a dataset named "dset" on the root group
+     *-------------------------------------------------------------------------
+     */
 
     /* Create the data space  */
-    if((space_id = H5Screate_simple(1, dims, NULL)) < 0) goto out;
+    if ((space_id = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
 
     /* Create the dataset */
-    if((dataset_id = H5Dcreate2(file_id , "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out;
+    if ((dataset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT,
+                                 H5P_DEFAULT)) < 0)
+        goto out;
 
     /* Close */
     H5Dclose(dataset_id);
 
     /*-------------------------------------------------------------------------
-    * Create a group named "grp" on the root group
-    *-------------------------------------------------------------------------
-    */
+     * Create a group named "grp" on the root group
+     *-------------------------------------------------------------------------
+     */
 
     /* Create a group. */
-    if((group_id = H5Gcreate2(file_id, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out;
+    if ((group_id = H5Gcreate2(file_id, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
     /* Close */
     H5Gclose(group_id);
 
     /*-------------------------------------------------------------------------
-    *
-    * Create attributes in the root group
-    * Note that we are calling the H5LTset_attribute functions with the name "."
-    *
-    *-------------------------------------------------------------------------
-    */
-    if(make_attributes(file_id, ".") < 0) goto out;
+     *
+     * Create attributes in the root group
+     * Note that we are calling the H5LTset_attribute functions with the name "."
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (make_attributes(file_id, ".") < 0)
+        goto out;
 
     /*-------------------------------------------------------------------------
-    *
-    * Create attributes in the dataset "dset"
-    *
-    *-------------------------------------------------------------------------
-    */
-    if(make_attributes(file_id, "dset") < 0) goto out;
+     *
+     * Create attributes in the dataset "dset"
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (make_attributes(file_id, "dset") < 0)
+        goto out;
 
     /*-------------------------------------------------------------------------
-    *
-    * Create attributes in the group "grp"
-    *
-    *-------------------------------------------------------------------------
-    */
-    if(make_attributes(file_id, "grp") < 0) goto out;
+     *
+     * Create attributes in the group "grp"
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (make_attributes(file_id, "grp") < 0)
+        goto out;
 
     /*-------------------------------------------------------------------------
-    * end
-    *-------------------------------------------------------------------------
-    */
+     * end
+     *-------------------------------------------------------------------------
+     */
     /* Close the file. */
     H5Fclose(file_id);
 
@@ -476,113 +460,109 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* make_attributes
-*-------------------------------------------------------------------------
-*/
+ * make_attributes
+ *-------------------------------------------------------------------------
+ */
 
-static herr_t make_attributes( hid_t loc_id, const char* obj_name )
+static herr_t
+make_attributes(hid_t loc_id, const char *obj_name)
 {
 
     int         rank_out;
-    hsize_t     *dims_out = 0;
+    hsize_t *   dims_out = 0;
     H5T_class_t type_class;
     size_t      type_size;
     int         i;
 
-    char    attr_str_in[]     = {"My attribute"};
-    char    attr_str_out[20];
-    char    attr_char_in[5]   = {1,2,3,4,5};
-    char    attr_char_out[5];
-    short   attr_short_in[5]  = {1,2,3,4,5};
-    short   attr_short_out[5];
-    int     attr_int_in[5]    = {1,2,3,4,5};
-    int     attr_int_out[5];
-    long    attr_long_in[5]   = {1,2,3,4,5};
-    long    attr_long_out[5];
-    float   attr_float_in[5]  = {1,2,3,4,5};
-    float   attr_float_out[5];
-    double  attr_double_in[5] = {1,2,3,4,5};
-    double  attr_double_out[5];
-    unsigned char    attr_uchar_in[5]   = {1,2,3,4,5};
-    unsigned char    attr_uchar_out[5];
-    unsigned short   attr_ushort_in[5]  = {1,2,3,4,5};
-    unsigned short   attr_ushort_out[5];
-    unsigned int     attr_uint_in[5]    = {1,2,3,4,5};
-    unsigned int     attr_uint_out[5];
-    unsigned long    attr_ulong_in[5]   = {1,2,3,4,5};
-    unsigned long    attr_ulong_out[5];
+    char           attr_str_in[] = {"My attribute"};
+    char           attr_str_out[20];
+    char           attr_char_in[5] = {1, 2, 3, 4, 5};
+    char           attr_char_out[5];
+    short          attr_short_in[5] = {1, 2, 3, 4, 5};
+    short          attr_short_out[5];
+    int            attr_int_in[5] = {1, 2, 3, 4, 5};
+    int            attr_int_out[5];
+    long           attr_long_in[5] = {1, 2, 3, 4, 5};
+    long           attr_long_out[5];
+    float          attr_float_in[5] = {1, 2, 3, 4, 5};
+    float          attr_float_out[5];
+    double         attr_double_in[5] = {1, 2, 3, 4, 5};
+    double         attr_double_out[5];
+    unsigned char  attr_uchar_in[5] = {1, 2, 3, 4, 5};
+    unsigned char  attr_uchar_out[5];
+    unsigned short attr_ushort_in[5] = {1, 2, 3, 4, 5};
+    unsigned short attr_ushort_out[5];
+    unsigned int   attr_uint_in[5] = {1, 2, 3, 4, 5};
+    unsigned int   attr_uint_out[5];
+    unsigned long  attr_ulong_in[5] = {1, 2, 3, 4, 5};
+    unsigned long  attr_ulong_out[5];
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_string test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_string test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_string");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_string( loc_id, obj_name, ATTR1_NAME, attr_str_in ) < 0 )
+    if (H5LTset_attribute_string(loc_id, obj_name, ATTR1_NAME, attr_str_in) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_string test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_string test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_string");
 
-
     /* Get the attribute */
-    if ( H5LTget_attribute_string( loc_id, obj_name, ATTR1_NAME, attr_str_out ) < 0 )
+    if (H5LTget_attribute_string(loc_id, obj_name, ATTR1_NAME, attr_str_out) < 0)
         return -1;
 
-    if ( HDstrcmp( attr_str_in, attr_str_out ) != 0 )
-    {
+    if (HDstrcmp(attr_str_in, attr_str_out) != 0) {
         return -1;
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_char test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_char test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_char");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_char(loc_id, obj_name, ATTR2_NAME, attr_char_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_char test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_char test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_char");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_out ) < 0 )
+    if (H5LTget_attribute_char(loc_id, obj_name, ATTR2_NAME, attr_char_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_char_in[i] != attr_char_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_char_in[i] != attr_char_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR2_NAME, H5T_NATIVE_CHAR, attr_char_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR2_NAME, H5T_NATIVE_CHAR, attr_char_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_char_in[i] != attr_char_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_char_in[i] != attr_char_out[i]) {
             return -1;
         }
     }
@@ -590,117 +570,109 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_short test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_short test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_short");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_short(loc_id, obj_name, ATTR3_NAME, attr_short_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_short test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_short test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_short");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_out ) < 0 )
+    if (H5LTget_attribute_short(loc_id, obj_name, ATTR3_NAME, attr_short_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_short_in[i] != attr_short_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_short_in[i] != attr_short_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR3_NAME, H5T_NATIVE_SHORT, attr_short_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR3_NAME, H5T_NATIVE_SHORT, attr_short_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_short_in[i] != attr_short_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_short_in[i] != attr_short_out[i]) {
             return -1;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_int test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_int test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_int");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_int(loc_id, obj_name, ATTR4_NAME, attr_int_in, (size_t)5) < 0)
         return -1;
 
     /* Set the attribute which is a substring of an existing attribute */
-    if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_int(loc_id, obj_name, ATTR_NAME_SUB, attr_int_in, (size_t)5) < 0)
         return -1;
 
     /* Set the attribute which is an extension of an existing attribute */
-    if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_int(loc_id, obj_name, ATTR_NAME_EXT, attr_int_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_int test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_int test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_int");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_out ) < 0 )
+    if (H5LTget_attribute_int(loc_id, obj_name, ATTR4_NAME, attr_int_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_int_in[i] != attr_int_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_int_in[i] != attr_int_out[i]) {
             return -1;
         }
     }
 
-    if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_out ) < 0 )
+    if (H5LTget_attribute_int(loc_id, obj_name, ATTR_NAME_SUB, attr_int_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_int_in[i] != attr_int_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_int_in[i] != attr_int_out[i]) {
             return -1;
         }
     }
 
-    if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_out ) < 0 )
+    if (H5LTget_attribute_int(loc_id, obj_name, ATTR_NAME_EXT, attr_int_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_int_in[i] != attr_int_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_int_in[i] != attr_int_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR4_NAME, H5T_NATIVE_INT, attr_int_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR4_NAME, H5T_NATIVE_INT, attr_int_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_int_in[i] != attr_int_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_int_in[i] != attr_int_out[i]) {
             return -1;
         }
     }
@@ -708,43 +680,41 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_long test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_long test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_long");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_long(loc_id, obj_name, ATTR5_NAME, attr_long_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_long test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_long test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_long");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_out ) < 0 )
+    if (H5LTget_attribute_long(loc_id, obj_name, ATTR5_NAME, attr_long_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_long_in[i] != attr_long_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_long_in[i] != attr_long_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR5_NAME, H5T_NATIVE_LONG, attr_long_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR5_NAME, H5T_NATIVE_LONG, attr_long_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_long_in[i] != attr_long_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_long_in[i] != attr_long_out[i]) {
             return -1;
         }
     }
@@ -752,43 +722,41 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_uchar test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_uchar test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_uchar");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_uchar(loc_id, obj_name, ATTR6_NAME, attr_uchar_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_uchar test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_uchar test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_uchar");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_out ) < 0 )
+    if (H5LTget_attribute_uchar(loc_id, obj_name, ATTR6_NAME, attr_uchar_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_uchar_in[i] != attr_uchar_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_uchar_in[i] != attr_uchar_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR6_NAME, H5T_NATIVE_UCHAR, attr_uchar_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR6_NAME, H5T_NATIVE_UCHAR, attr_uchar_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_uchar_in[i] != attr_uchar_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_uchar_in[i] != attr_uchar_out[i]) {
             return -1;
         }
     }
@@ -796,89 +764,83 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_ushort test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_ushort test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_ushort");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_ushort(loc_id, obj_name, ATTR7_NAME, attr_ushort_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_ushort test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_ushort test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_ushort");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_out ) < 0 )
+    if (H5LTget_attribute_ushort(loc_id, obj_name, ATTR7_NAME, attr_ushort_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_ushort_in[i] != attr_ushort_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_ushort_in[i] != attr_ushort_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR7_NAME, H5T_NATIVE_USHORT, attr_ushort_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR7_NAME, H5T_NATIVE_USHORT, attr_ushort_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_ushort_in[i] != attr_ushort_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_ushort_in[i] != attr_ushort_out[i]) {
             return -1;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_int test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_int test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_uint");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_uint(loc_id, obj_name, ATTR8_NAME, attr_uint_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_int test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_int test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_uint");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_out ) < 0 )
+    if (H5LTget_attribute_uint(loc_id, obj_name, ATTR8_NAME, attr_uint_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_uint_in[i] != attr_uint_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_uint_in[i] != attr_uint_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR8_NAME, H5T_NATIVE_UINT, attr_uint_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR8_NAME, H5T_NATIVE_UINT, attr_uint_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_uint_in[i] != attr_uint_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_uint_in[i] != attr_uint_out[i]) {
             return -1;
         }
     }
@@ -886,89 +848,83 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_ulong test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_ulong test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_ulong");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_ulong(loc_id, obj_name, ATTR9_NAME, attr_ulong_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_long test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_long test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_ulong");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_out ) < 0 )
+    if (H5LTget_attribute_ulong(loc_id, obj_name, ATTR9_NAME, attr_ulong_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_ulong_in[i] != attr_ulong_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_ulong_in[i] != attr_ulong_out[i]) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR9_NAME, H5T_NATIVE_ULONG, attr_ulong_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR9_NAME, H5T_NATIVE_ULONG, attr_ulong_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if ( attr_ulong_in[i] != attr_ulong_out[i] ) {
+    for (i = 0; i < 5; i++) {
+        if (attr_ulong_in[i] != attr_ulong_out[i]) {
             return -1;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_float test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_float test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_float");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_float( loc_id, obj_name, ATTR10_NAME, attr_float_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_float(loc_id, obj_name, ATTR10_NAME, attr_float_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_float test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_float test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_float");
 
-
     /* Get the attribute */
-    if ( H5LTget_attribute_float( loc_id, obj_name, ATTR10_NAME, attr_float_out ) < 0 )
+    if (H5LTget_attribute_float(loc_id, obj_name, ATTR10_NAME, attr_float_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if(!H5_FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
+    for (i = 0; i < 5; i++) {
+        if (!H5_FLT_ABS_EQUAL(attr_float_in[i], attr_float_out[i])) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR10_NAME, H5T_NATIVE_FLOAT, attr_float_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR10_NAME, H5T_NATIVE_FLOAT, attr_float_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if(!H5_FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
+    for (i = 0; i < 5; i++) {
+        if (!H5_FLT_ABS_EQUAL(attr_float_in[i], attr_float_out[i])) {
             return -1;
         }
     }
@@ -976,93 +932,90 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTset_attribute_double test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTset_attribute_double test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTset_attribute_double");
 
     /* Set the attribute */
-    if ( H5LTset_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_in, (size_t)5 ) < 0 )
+    if (H5LTset_attribute_double(loc_id, obj_name, ATTR11_NAME, attr_double_in, (size_t)5) < 0)
         return -1;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_double test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_double test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_double");
 
     /* Get the attribute */
-    if ( H5LTget_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_out ) < 0 )
+    if (H5LTget_attribute_double(loc_id, obj_name, ATTR11_NAME, attr_double_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if(!H5_DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
+    for (i = 0; i < 5; i++) {
+        if (!H5_DBL_ABS_EQUAL(attr_double_in[i], attr_double_out[i])) {
             return -1;
         }
     }
 
     /* Get the attribute */
-    if ( H5LTget_attribute( loc_id, obj_name, ATTR11_NAME, H5T_NATIVE_DOUBLE, attr_double_out ) < 0 )
+    if (H5LTget_attribute(loc_id, obj_name, ATTR11_NAME, H5T_NATIVE_DOUBLE, attr_double_out) < 0)
         return -1;
 
-    for (i = 0; i < 5; i++)
-    {
-        if(!H5_DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
+    for (i = 0; i < 5; i++) {
+        if (!H5_DBL_ABS_EQUAL(attr_double_in[i], attr_double_out[i])) {
             return -1;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_ndims test
-    *-------------------------------------------------------------------------
-    */
-
+     * H5LTget_attribute_ndims test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_ndims");
 
-    if ( H5LTget_attribute_ndims( loc_id, obj_name, ATTR2_NAME, &rank_out ) < 0 )
+    if (H5LTget_attribute_ndims(loc_id, obj_name, ATTR2_NAME, &rank_out) < 0)
         return -1;
 
-    if ( rank_out != 1 ) {
+    if (rank_out != 1) {
         return -1;
     }
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * H5LTget_attribute_info test
-    *-------------------------------------------------------------------------
-    */
+     * H5LTget_attribute_info test
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("H5LTget_attribute_info");
 
-    if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * (size_t)rank_out ))) return -1;
+    if (NULL == (dims_out = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)rank_out)))
+        return -1;
 
-    if ( H5LTget_attribute_info( loc_id, obj_name, ATTR2_NAME, dims_out, &type_class, &type_size) < 0 ) {
-        HDfree( dims_out );
+    if (H5LTget_attribute_info(loc_id, obj_name, ATTR2_NAME, dims_out, &type_class, &type_size) < 0) {
+        HDfree(dims_out);
         return -1;
     }
 
     for (i = 0; i < rank_out; i++) {
-        if ( dims_out[i] != 5 ) {
-            HDfree( dims_out );
+        if (dims_out[i] != 5) {
+            HDfree(dims_out);
             return -1;
         }
     }
 
-    if ( type_class != H5T_INTEGER ) {
-        HDfree( dims_out );
+    if (type_class != H5T_INTEGER) {
+        HDfree(dims_out);
         return -1;
     }
-    HDfree( dims_out );
+    HDfree(dims_out);
 
     PASSED();
 
@@ -1070,52 +1023,53 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_integers().
-*-------------------------------------------------------------------------
-*/
-static int test_integers(void)
+ * subroutine for test_text_dtype(): test_integers().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_integers(void)
 {
-    hid_t   dtype;
-    char*   dt_str;
-    size_t  str_len;
+    hid_t  dtype;
+    char * dt_str;
+    size_t str_len;
 
     HL_TESTING3("\n        text for integer types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_NATIVE_INT\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_NATIVE_INT\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_NATIVE_INT))
+    if (!H5Tequal(dtype, H5T_NATIVE_INT))
         goto out;
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_STD_I8BE\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_STD_I8BE\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_STD_I8BE))
+    if (!H5Tequal(dtype, H5T_STD_I8BE))
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
 
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_STD_I8BE")) {
+    if (HDstrcmp(dt_str, "H5T_STD_I8BE")) {
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_STD_U16LE\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_STD_U16LE\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_STD_U16LE))
+    if (!H5Tequal(dtype, H5T_STD_U16LE))
         goto out;
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1127,52 +1081,53 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_fps().
-*-------------------------------------------------------------------------
-*/
-static int test_fps(void)
+ * subroutine for test_text_dtype(): test_fps().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_fps(void)
 {
-    hid_t   dtype;
-    char*   dt_str;
-    size_t  str_len;
+    hid_t  dtype;
+    char * dt_str;
+    size_t str_len;
 
     HL_TESTING3("        text for floating-point types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_NATIVE_LDOUBLE\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_NATIVE_LDOUBLE\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_NATIVE_LDOUBLE))
+    if (!H5Tequal(dtype, H5T_NATIVE_LDOUBLE))
         goto out;
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_IEEE_F32BE\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_IEEE_F32BE\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_IEEE_F32BE))
+    if (!H5Tequal(dtype, H5T_IEEE_F32BE))
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
 
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_IEEE_F32BE")) {
+    if (HDstrcmp(dt_str, "H5T_IEEE_F32BE")) {
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_IEEE_F64LE\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_IEEE_F64LE\n", H5LT_DDL)) < 0)
         goto out;
-    if(!H5Tequal(dtype, H5T_IEEE_F64LE))
+    if (!H5Tequal(dtype, H5T_IEEE_F64LE))
         goto out;
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1184,82 +1139,89 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_strings().
-*-------------------------------------------------------------------------
-*/
-static int test_strings(void)
+ * subroutine for test_text_dtype(): test_strings().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_strings(void)
 {
-    hid_t   dtype;
-    size_t  str_size;
+    hid_t       dtype;
+    size_t      str_size;
     H5T_str_t   str_pad;
     H5T_cset_t  str_cset;
     H5T_class_t type_class;
-    char*   dt_str = NULL;
-    size_t  str_len;
+    char *      dt_str = NULL;
+    size_t      str_len;
 
     HL_TESTING3("        text for string types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_STRING { STRSIZE 13; STRPAD H5T_STR_NULLTERM; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(
+             "H5T_STRING { STRSIZE 13; STRPAD H5T_STR_NULLTERM; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; }",
+             H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_STRING)
+    if (type_class != H5T_STRING)
         goto out;
 
     str_size = H5Tget_size(dtype);
-    if(str_size != 13)
+    if (str_size != 13)
         goto out;
 
     str_pad = H5Tget_strpad(dtype);
-    if(str_pad != H5T_STR_NULLTERM)
+    if (str_pad != H5T_STR_NULLTERM)
         goto out;
 
     str_cset = H5Tget_cset(dtype);
-    if(str_cset != H5T_CSET_ASCII)
+    if (str_cset != H5T_CSET_ASCII)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_STRING {\n      STRSIZE 13;\n      STRPAD H5T_STR_NULLTERM;\n      CSET H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_STRING {\n      STRSIZE 13;\n      STRPAD H5T_STR_NULLTERM;\n      CSET "
+                         "H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_NULLPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_NULLPAD; CSET "
+                                   "H5T_CSET_ASCII; CTYPE H5T_C_S1; }",
+                                   H5LT_DDL)) < 0)
         goto out;
 
-    if(!H5Tis_variable_str(dtype))
+    if (!H5Tis_variable_str(dtype))
         goto out;
 
     str_pad = H5Tget_strpad(dtype);
-    if(str_pad != H5T_STR_NULLPAD)
+    if (str_pad != H5T_STR_NULLPAD)
         goto out;
 
     str_cset = H5Tget_cset(dtype);
-    if(str_cset != H5T_CSET_ASCII)
+    if (str_cset != H5T_CSET_ASCII)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      CSET H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      "
+                         "CSET H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
@@ -1268,97 +1230,108 @@ static int test_strings(void)
 
     /* Length of the character buffer is larger then needed */
     str_len = str_len + 10;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
-      goto out;
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
+        goto out;
 
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
-      HDfree(dt_str);
-      goto out;
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
+        HDfree(dt_str);
+        goto out;
     }
-    if(HDstrncmp(dt_str, "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      CSET H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }", str_len-1)) {
-      HDprintf("dt=\n%s\n", dt_str);
-      HDfree(dt_str);
-      goto out;
+    if (HDstrncmp(dt_str,
+                  "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      CSET "
+                  "H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }",
+                  str_len - 1)) {
+        HDprintf("dt=\n%s\n", dt_str);
+        HDfree(dt_str);
+        goto out;
     }
     HDfree(dt_str);
 
     /* Length of the character buffer is smaller then needed */
     str_len = 21;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
-      goto out;
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
+        goto out;
 
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
-      HDfree(dt_str);
-      goto out;
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
+        HDfree(dt_str);
+        goto out;
     }
     /* check the truncated string */
-    if(HDstrlen(dt_str) != str_len-1) goto out;
+    if (HDstrlen(dt_str) != str_len - 1)
+        goto out;
     str_len = HDstrlen(dt_str);
-    if(HDstrncmp(dt_str, "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      CSET H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }", str_len)) {
-      HDprintf("dt=\n%s\n", dt_str);
-      HDfree(dt_str);
-      goto out;
+    if (HDstrncmp(dt_str,
+                  "H5T_STRING {\n      STRSIZE H5T_VARIABLE;\n      STRPAD H5T_STR_NULLPAD;\n      CSET "
+                  "H5T_CSET_ASCII;\n      CTYPE H5T_C_S1;\n   }",
+                  str_len)) {
+        HDprintf("dt=\n%s\n", dt_str);
+        HDfree(dt_str);
+        goto out;
     }
 
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
     return 0;
 
 out:
-    if(dt_str)
-      HDfree(dt_str);
+    if (dt_str)
+        HDfree(dt_str);
 
     H5_FAILED();
     return -1;
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_opaques().
-*-------------------------------------------------------------------------
-*/
-static int test_opaques(void)
+ * subroutine for test_text_dtype(): test_opaques().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_opaques(void)
 {
-    hid_t   dtype;
-    size_t  opq_size;
+    hid_t       dtype;
+    size_t      opq_size;
     H5T_class_t type_class;
-    char*   dt_str;
-    size_t  str_len;
+    char *      dt_str;
+    size_t      str_len;
 
     HL_TESTING3("        text for opaque types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_OPAQUE { OPQ_SIZE 19; OPQ_TAG \"This is a tag for opaque type\"; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_OPAQUE { OPQ_SIZE 19; OPQ_TAG \"This is a tag for opaque type\"; }",
+                                   H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_OPAQUE)
+    if (type_class != H5T_OPAQUE)
         goto out;
 
-    if((opq_size = H5Tget_size(dtype)) == 0)
+    if ((opq_size = H5Tget_size(dtype)) == 0)
         goto out;
-    if(opq_size != 19)
+    if (opq_size != 19)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_OPAQUE {\n      OPQ_SIZE 19;\n      OPQ_TAG \"This is a tag for opaque type\";\n   }")) {
+    if (HDstrcmp(
+            dt_str,
+            "H5T_OPAQUE {\n      OPQ_SIZE 19;\n      OPQ_TAG \"This is a tag for opaque type\";\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1370,63 +1343,66 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_enums().
-*-------------------------------------------------------------------------
-*/
-static int test_enums(void)
+ * subroutine for test_text_dtype(): test_enums().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_enums(void)
 {
-    hid_t   dtype;
-    size_t  size = 16;
-    char    name1[16];
-    int     value1 = 7;
-    const char    *name2 = "WHITE";
-    int     value2;
+    hid_t       dtype;
+    size_t      size = 16;
+    char        name1[16];
+    int         value1 = 7;
+    const char *name2  = "WHITE";
+    int         value2;
     H5T_class_t type_class;
-    char*   dt_str;
-    size_t  str_len;
+    char *      dt_str;
+    size_t      str_len;
 
     HL_TESTING3("        text for enum types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_ENUM { H5T_STD_I32LE; \"RED\" 5; \"GREEN\" 6; \"BLUE\" 7; \"WHITE\" 8; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(
+             "H5T_ENUM { H5T_STD_I32LE; \"RED\" 5; \"GREEN\" 6; \"BLUE\" 7; \"WHITE\" 8; }", H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_ENUM)
+    if (type_class != H5T_ENUM)
         goto out;
 
     /* Convert the variable before using it */
-    if(!H5Tequal(H5T_STD_I32LE, H5T_NATIVE_INT)) {
-        if(H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32LE, 1, &value1, NULL, H5P_DEFAULT) < 0)
+    if (!H5Tequal(H5T_STD_I32LE, H5T_NATIVE_INT)) {
+        if (H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32LE, 1, &value1, NULL, H5P_DEFAULT) < 0)
             goto out;
     }
 
-    if(H5Tenum_nameof(dtype, &value1, name1, size)<0)
+    if (H5Tenum_nameof(dtype, &value1, name1, size) < 0)
         goto out;
-    if(HDstrcmp(name1, "BLUE"))
+    if (HDstrcmp(name1, "BLUE"))
         goto out;
 
-    if(H5Tenum_valueof(dtype, name2, &value2)<0)
+    if (H5Tenum_valueof(dtype, name2, &value2) < 0)
         goto out;
 
     /* Convert the variable before comparing it */
-    if(!H5Tequal(H5T_STD_I32LE, H5T_NATIVE_INT)) {
-        if(H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32LE, 1, &value2, NULL, H5P_DEFAULT) < 0)
+    if (!H5Tequal(H5T_STD_I32LE, H5T_NATIVE_INT)) {
+        if (H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32LE, 1, &value2, NULL, H5P_DEFAULT) < 0)
             goto out;
     }
 
-    if(value2 != 8)
+    if (value2 != 8)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_ENUM {\n      H5T_STD_I32LE;\n      \"RED\"              5;\n      \"GREEN\"            6;\n      \"BLUE\"             7;\n      \"WHITE\"            8;\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_ENUM {\n      H5T_STD_I32LE;\n      \"RED\"              5;\n      \"GREEN\"   "
+                         "         6;\n      \"BLUE\"             7;\n      \"WHITE\"            8;\n   }")) {
 
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
@@ -1435,7 +1411,7 @@ static int test_enums(void)
 
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1447,54 +1423,55 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_variables().
-*-------------------------------------------------------------------------
-*/
-static int test_variables(void)
+ * subroutine for test_text_dtype(): test_variables().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_variables(void)
 {
-    hid_t   dtype;
+    hid_t       dtype;
     H5T_class_t type_class;
-    char*   dt_str;
-    size_t  str_len;
+    char *      dt_str;
+    size_t      str_len;
 
     HL_TESTING3("        text for variable types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_VLEN { H5T_NATIVE_CHAR }\n", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_VLEN { H5T_NATIVE_CHAR }\n", H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_VLEN)
+    if (type_class != H5T_VLEN)
         goto out;
 
-    if(H5Tis_variable_str(dtype))
+    if (H5Tis_variable_str(dtype))
         goto out;
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_VLEN { H5T_VLEN { H5T_STD_I32BE } }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_VLEN { H5T_VLEN { H5T_STD_I32BE } }", H5LT_DDL)) < 0)
         goto out;
 
-    if(H5Tis_variable_str(dtype))
+    if (H5Tis_variable_str(dtype))
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_VLEN {\n      H5T_VLEN {\n         H5T_STD_I32BE\n      }\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_VLEN {\n      H5T_VLEN {\n         H5T_STD_I32BE\n      }\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1506,47 +1483,52 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_arrays().
-*-------------------------------------------------------------------------
-*/
-static int test_arrays(void)
+ * subroutine for test_text_dtype(): test_arrays().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_arrays(void)
 {
-    hid_t   dtype;
-    int     ndims;
-    hsize_t dims[3];
+    hid_t       dtype;
+    int         ndims;
+    hsize_t     dims[3];
     H5T_class_t type_class;
-    char*   dt_str;
-    size_t  str_len;
+    char *      dt_str;
+    size_t      str_len;
 
     HL_TESTING3("        text for array types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_ARRAY { [5][7][13] H5T_ARRAY { [17][19] H5T_COMPOUND { H5T_STD_I8BE \"arr_compound_1\"; H5T_STD_I32BE \"arr_compound_2\"; } } }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype("H5T_ARRAY { [5][7][13] H5T_ARRAY { [17][19] H5T_COMPOUND { H5T_STD_I8BE "
+                                   "\"arr_compound_1\"; H5T_STD_I32BE \"arr_compound_2\"; } } }",
+                                   H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_ARRAY)
+    if (type_class != H5T_ARRAY)
         goto out;
 
-    if((ndims = H5Tget_array_ndims(dtype))<0)
+    if ((ndims = H5Tget_array_ndims(dtype)) < 0)
         goto out;
-    if(ndims != 3)
+    if (ndims != 3)
         goto out;
 
-    if(H5Tget_array_dims2(dtype, dims) < 0)
+    if (H5Tget_array_dims2(dtype, dims) < 0)
         goto out;
-    if(dims[0] != 5 || dims[1] != 7 || dims[2] != 13)
+    if (dims[0] != 5 || dims[1] != 7 || dims[2] != 13)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_ARRAY {\n      [5][7][13] H5T_ARRAY {\n         [17][19] H5T_COMPOUND {\n            H5T_STD_I8BE \"arr_compound_1\" : 0;\n            H5T_STD_I32BE \"arr_compound_2\" : 1;\n         }\n      }\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_ARRAY {\n      [5][7][13] H5T_ARRAY {\n         [17][19] H5T_COMPOUND {\n      "
+                         "      H5T_STD_I8BE \"arr_compound_1\" : 0;\n            H5T_STD_I32BE "
+                         "\"arr_compound_2\" : 1;\n         }\n      }\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
@@ -1554,7 +1536,7 @@ static int test_arrays(void)
 
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1566,66 +1548,74 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_compounds().
-*-------------------------------------------------------------------------
-*/
-static int test_compounds(void)
+ * subroutine for test_text_dtype(): test_compounds().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_compounds(void)
 {
-    hid_t   dtype;
-    int     nmembs;
-    char    *memb_name = NULL;
+    hid_t       dtype;
+    int         nmembs;
+    char *      memb_name = NULL;
     H5T_class_t memb_class;
     H5T_class_t type_class;
-    char*   dt_str;
-    size_t  str_len;
+    char *      dt_str;
+    size_t      str_len;
 
     HL_TESTING3("        text for compound types");
 
-    if((dtype = H5LTtext_to_dtype("H5T_COMPOUND { H5T_STD_I16BE \"one_field\" : 2; H5T_STD_U8LE \"two_field\" : 6; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(
+             "H5T_COMPOUND { H5T_STD_I16BE \"one_field\" : 2; H5T_STD_U8LE \"two_field\" : 6; }", H5LT_DDL)) <
+        0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_COMPOUND)
+    if (type_class != H5T_COMPOUND)
         goto out;
 
-    if((nmembs = H5Tget_nmembers(dtype))<0)
+    if ((nmembs = H5Tget_nmembers(dtype)) < 0)
         goto out;
-    if(nmembs != 2)
+    if (nmembs != 2)
         goto out;
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
-    if(HDstrcmp(dt_str, "H5T_COMPOUND {\n      H5T_STD_I16BE \"one_field\" : 2;\n      H5T_STD_U8LE \"two_field\" : 6;\n   }")) {
+    if (HDstrcmp(dt_str, "H5T_COMPOUND {\n      H5T_STD_I16BE \"one_field\" : 2;\n      H5T_STD_U8LE "
+                         "\"two_field\" : 6;\n   }")) {
         HDprintf("dt=\n%s\n", dt_str);
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-    if((dtype = H5LTtext_to_dtype("H5T_COMPOUND { H5T_STD_I32BE \"i32_field\"; H5T_STD_I16BE \"i16_field\"; H5T_COMPOUND  { H5T_STD_I16BE \"sec_field\"; H5T_COMPOUND { H5T_STD_I32BE \"thd_field\"; } \"grandchild\"; } \"child_compound\"; H5T_STD_I8BE  \"i8_field\"; }", H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(
+             "H5T_COMPOUND { H5T_STD_I32BE \"i32_field\"; H5T_STD_I16BE \"i16_field\"; H5T_COMPOUND  { "
+             "H5T_STD_I16BE \"sec_field\"; H5T_COMPOUND { H5T_STD_I32BE \"thd_field\"; } \"grandchild\"; } "
+             "\"child_compound\"; H5T_STD_I8BE  \"i8_field\"; }",
+             H5LT_DDL)) < 0)
         goto out;
 
-    if((memb_name = H5Tget_member_name(dtype, 1)) == NULL)
+    if ((memb_name = H5Tget_member_name(dtype, 1)) == NULL)
         goto out;
-    if(HDstrcmp(memb_name, "i16_field")) {
+    if (HDstrcmp(memb_name, "i16_field")) {
         H5free_memory(memb_name);
         goto out;
     }
     H5free_memory(memb_name);
 
-    if((memb_class = H5Tget_member_class(dtype, 2))<0)
+    if ((memb_class = H5Tget_member_class(dtype, 2)) < 0)
         goto out;
-    if(memb_class != H5T_COMPOUND)
+    if (memb_class != H5T_COMPOUND)
         goto out;
 
     PASSED();
@@ -1637,110 +1627,120 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_compound_bug(). Test case for
-* issue 7701.
-*-------------------------------------------------------------------------
-*/
-static int test_compound_bug(void)
+ * subroutine for test_text_dtype(): test_compound_bug(). Test case for
+ * issue 7701.
+ *-------------------------------------------------------------------------
+ */
+static int
+test_compound_bug(void)
 {
     hid_t       dtype;
     H5T_class_t type_class;
     int         nmembs;
-    char*       memb_name = NULL;
-    char*       dt_str;
+    char *      memb_name = NULL;
+    char *      dt_str;
     size_t      str_len;
-    char text[] = "H5T_COMPOUND { H5T_STD_I32LE \"state_________________________________________________________________________________\"; H5T_STD_I32LE \"desc_________________________________________________________________________________________\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; \"TWO\" 2;  \"THREE\" 3; } \"type____\"; H5T_STD_I32LE \"sub_______________________________________________________________________________________________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE \"final___________________________________________________________________________________________________\"; } } \"sub\"; }";
-    char text2[] =
-     "H5T_COMPOUND {\n"
-     "  H5T_STD_I16LE \"state___________________________"
-         "__________________________________________________"
-         "____\" : 0;\n"
-     "  H5T_STD_I16LE \"desc____________________________"
-         "__________________________________________________"
-         "___________\" : 2;\n"
-     "  H5T_VLEN { H5T_COMPOUND {\n"
-     "    H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" "
-         "1; \"TWO\" 2;  \"THREE\" 3; } \"type____\" : 0;\n"
-     "    H5T_STD_I32LE \"sub___________________________"
-         "__________________________________________________"
-         "__________________________________1\" : 4;\n"
-     "    H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_"
-         "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;"
-         " } \"sub_desc\" : 8;\n"
-     "    H5T_STD_I32LE \"final_________________________"
-         "__________________________________________________"
-         "________________________\" : 16;\n"
-     "  } } \"sub\" : 8;\n"
-     "}\n";
+    char        text[] = "H5T_COMPOUND { H5T_STD_I32LE "
+                  "\"state_________________________________________________________________________________"
+                  "\"; H5T_STD_I32LE "
+                  "\"desc____________________________________________________________________________________"
+                  "_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; "
+                  "\"TWO\" 2;  \"THREE\" 3; } \"type____\"; H5T_STD_I32LE "
+                  "\"sub_____________________________________________________________________________________"
+                  "__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; "
+                  "CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE "
+                  "\"final___________________________________________________________________________________"
+                  "________________\"; } } \"sub\"; }";
+    char text2[] = "H5T_COMPOUND {\n"
+                   "  H5T_STD_I16LE \"state___________________________"
+                   "__________________________________________________"
+                   "____\" : 0;\n"
+                   "  H5T_STD_I16LE \"desc____________________________"
+                   "__________________________________________________"
+                   "___________\" : 2;\n"
+                   "  H5T_VLEN { H5T_COMPOUND {\n"
+                   "    H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" "
+                   "1; \"TWO\" 2;  \"THREE\" 3; } \"type____\" : 0;\n"
+                   "    H5T_STD_I32LE \"sub___________________________"
+                   "__________________________________________________"
+                   "__________________________________1\" : 4;\n"
+                   "    H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_"
+                   "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;"
+                   " } \"sub_desc\" : 8;\n"
+                   "    H5T_STD_I32LE \"final_________________________"
+                   "__________________________________________________"
+                   "________________________\" : 16;\n"
+                   "  } } \"sub\" : 8;\n"
+                   "}\n";
 
     HL_TESTING3("        text for compound type of bug fix");
 
-    if((dtype = H5LTtext_to_dtype(text, H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(text, H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_COMPOUND)
+    if (type_class != H5T_COMPOUND)
         goto out;
 
-    if((memb_name = H5Tget_member_name(dtype, 2)) == NULL)
+    if ((memb_name = H5Tget_member_name(dtype, 2)) == NULL)
         goto out;
-    if(HDstrcmp(memb_name, "sub")) {
+    if (HDstrcmp(memb_name, "sub")) {
         H5free_memory(memb_name);
         goto out;
     }
     H5free_memory(memb_name);
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
 
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
-
     /* Test similar datatype in another format */
-    if((dtype = H5LTtext_to_dtype(text2, H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(text2, H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_COMPOUND)
+    if (type_class != H5T_COMPOUND)
         goto out;
 
-    if((nmembs = H5Tget_nmembers(dtype))<0)
+    if ((nmembs = H5Tget_nmembers(dtype)) < 0)
         goto out;
-    if(nmembs != 3)
+    if (nmembs != 3)
         goto out;
 
-    if((memb_name = H5Tget_member_name(dtype, 1)) == NULL)
+    if ((memb_name = H5Tget_member_name(dtype, 1)) == NULL)
         goto out;
-    if(HDstrcmp(memb_name, "desc_________________________________________________________________________________________")) {
+    if (HDstrcmp(memb_name, "desc____________________________________________________________________________"
+                            "_____________")) {
         H5free_memory(memb_name);
         goto out;
     }
     H5free_memory(memb_name);
 
-    if(H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len)<0)
+    if (H5LTdtype_to_text(dtype, NULL, H5LT_DDL, &str_len) < 0)
         goto out;
 
-    if(NULL==(dt_str = (char*)HDcalloc(str_len, sizeof(char))))
+    if (NULL == (dt_str = (char *)HDcalloc(str_len, sizeof(char))))
         goto out;
-    if(H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len)<0) {
+    if (H5LTdtype_to_text(dtype, dt_str, H5LT_DDL, &str_len) < 0) {
         HDfree(dt_str);
         goto out;
     }
 
     HDfree(dt_str);
 
-    if(H5Tclose(dtype)<0)
+    if (H5Tclose(dtype) < 0)
         goto out;
 
     PASSED();
@@ -1752,66 +1752,67 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* subroutine for test_text_dtype(): test_complicated_compound().
-*-------------------------------------------------------------------------
-*/
-static int test_complicated_compound(void)
+ * subroutine for test_text_dtype(): test_complicated_compound().
+ *-------------------------------------------------------------------------
+ */
+static int
+test_complicated_compound(void)
 {
-    hid_t   dtype;
-    int     nmembs;
+    hid_t       dtype;
+    int         nmembs;
     H5T_class_t type_class;
-    char   *line = NULL;
-    FILE   *fp = NULL;
-    size_t  size = 1024;
+    char *      line     = NULL;
+    FILE *      fp       = NULL;
+    size_t      size     = 1024;
     const char *filename = H5_get_srcdir_filename(INPUT_FILE);
 
     HL_TESTING3("        text for complicated compound types");
 
     /* Open input file */
     fp = HDfopen(filename, "r");
-    if(fp == NULL) {
-        HDprintf( "Could not find file %s. Try set $srcdir \n", filename);
+    if (fp == NULL) {
+        HDprintf("Could not find file %s. Try set $srcdir \n", filename);
         goto out;
     }
 
     /* This part reads in the input as a string in a slow manner.  GNU C
-    * Library has convenient function getline() but isn't available on
-    * all machines.
-    */
-    if((line = (char*)HDcalloc(size, sizeof(char)))==NULL)
+     * Library has convenient function getline() but isn't available on
+     * all machines.
+     */
+    if ((line = (char *)HDcalloc(size, sizeof(char))) == NULL)
         goto out;
-    if(HDfgets(line, (int)size, fp)==NULL)
+    if (HDfgets(line, (int)size, fp) == NULL)
         goto out;
-    while(HDstrlen(line)==size-1) {
+    while (HDstrlen(line) == size - 1) {
         size *= 2;
-        if(line)
+        if (line)
             HDfree(line);
-        if((line = (char*)HDcalloc(size, sizeof(char)))==NULL)
+        if ((line = (char *)HDcalloc(size, sizeof(char))) == NULL)
             goto out;
-        if(HDfseek(fp, 0L, SEEK_SET)!=0)
+        if (HDfseek(fp, 0L, SEEK_SET) != 0)
             goto out;
-        if(HDfgets(line, (int)size, fp)==NULL)
+        if (HDfgets(line, (int)size, fp) == NULL)
             goto out;
     }
 
     HDfclose(fp);
     fp = NULL;
 
-    if((dtype = H5LTtext_to_dtype(line, H5LT_DDL))<0)
+    if ((dtype = H5LTtext_to_dtype(line, H5LT_DDL)) < 0)
         goto out;
 
-    if((type_class = H5Tget_class(dtype))<0)
+    if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
-    if(type_class != H5T_COMPOUND)
+    if (type_class != H5T_COMPOUND)
         goto out;
 
     /* There should be 101 compound members */
-    if((nmembs = H5Tget_nmembers(dtype))<0)
+    if ((nmembs = H5Tget_nmembers(dtype)) < 0)
         goto out;
-    if(nmembs != 101)
+    if (nmembs != 101)
         goto out;
 
-    if(line)
+    if (line)
         HDfree(line);
 
     PASSED();
@@ -1819,9 +1820,9 @@ static int test_complicated_compound(void)
 
 out:
 
-    if(line)
+    if (line)
         HDfree(line);
-    if(fp)
+    if (fp)
         HDfclose(fp);
 
     H5_FAILED();
@@ -1829,41 +1830,42 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* test H5LTtext_to_dtype function
-*-------------------------------------------------------------------------
-*/
-static int test_text_dtype(void)
+ * test H5LTtext_to_dtype function
+ *-------------------------------------------------------------------------
+ */
+static int
+test_text_dtype(void)
 {
     HL_TESTING2("H5LTtext_to_dtype");
 
-    if(test_integers()<0)
+    if (test_integers() < 0)
         goto out;
 
-    if(test_fps()<0)
+    if (test_fps() < 0)
         goto out;
 
-    if(test_strings()<0)
+    if (test_strings() < 0)
         goto out;
 
-    if(test_opaques()<0)
+    if (test_opaques() < 0)
         goto out;
 
-    if(test_enums()<0)
+    if (test_enums() < 0)
         goto out;
 
-    if(test_variables()<0)
+    if (test_variables() < 0)
         goto out;
 
-    if(test_arrays()<0)
+    if (test_arrays() < 0)
         goto out;
 
-    if(test_compounds()<0)
+    if (test_compounds() < 0)
         goto out;
 
-    if(test_compound_bug()<0)
+    if (test_compound_bug() < 0)
         goto out;
 
-    if(test_complicated_compound()<0)
+    if (test_complicated_compound() < 0)
         goto out;
 
     return 0;
@@ -1876,362 +1878,364 @@ out:
  * test H5LTpath_valid function
  *-------------------------------------------------------------------------
  */
-static int test_valid_path(void)
+static int
+test_valid_path(void)
 {
-  hid_t file_id, group;
-  htri_t path_valid;
-  const char *data_string_in = "test";
-
-  HL_TESTING2("H5LTpath_valid");
-
-  /* Create a new file using default properties. */
-
-  /**************************************************************
-   *  The file structure should look like this:
-   *
-   *        +----------------------------------+
-   *        |                 /                |
-   *        +----------------------------------+
-   *                  /       |   \       \
-   *                 /        |    \       \
-   *                /         |     \       \
-   *               /          |      \       G8 (dangled external link)
-   *              /          DS       \
-   *             /                     \
-   *            G1                    G2
-   *            | --> DS1              |
-   *           / \--> DS3             / \
-   *          /                      /   \
-   *        G2                     DS4    G7
-   *         |                 (hard link   (dangled soft link
-   *         |                 to /G1/DS3)  to /G1/G20 )
-   *         |
-   *         |
-   *         | --- Gcyc (soft link to /G1)
-   *        /  \
-   *       /    \
-   *     G5      \
-   *  (soft link  G6 (external link /G1 in FILENAME4)
-   *  to /G2)
-   *
-   ****************************************************************/
-
-  file_id = H5Fcreate(FILE_NAME3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-  /*
-   * Create dataset "/DS"
-   */
-  if(H5LTmake_dataset_string(file_id, "DS", data_string_in)<0)
-    goto out;
-
-  /*
-   * Create an external dangled link
-   */
-  if(H5Lcreate_external("NonExistant_File.h5", "G8", file_id, "DangledExternalLink",  H5P_DEFAULT,  H5P_DEFAULT)<0)
-    goto out;
-
-  /*
-   * Create a group named "G2" in the file.
-   */
-  if((group = H5Gcreate2(file_id, "G2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT))<0)
-    goto out;
-
-  /*
-   * Create a dataset named "G2/DS4" in the file.
-   */
-  if(H5LTmake_dataset_string(group, "/G2/DS4", data_string_in)<0)
-    goto out;
-
-  /*
-   * Create a soft link
-   */
-  if(H5Lcreate_soft("/G1/G20", file_id, "/G2/G7", H5P_DEFAULT, H5P_DEFAULT) <0)
-    goto out;
-
-  if(H5Gclose(group)<0)
-    goto out;
-
-  /*
-   * Create a group named "G1" in the file.
-   */
-  if((group = H5Gcreate2(file_id, "G1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT))<0)
-    goto out;
-
-  /*
-   * Create a group named "G1/DS1" in the file.
-   */
-  if(H5LTmake_dataset_string(group, "/G1/DS1", data_string_in)<0)
-    goto out;
-
-  if(H5Gclose(group)<0)
-     goto out;
-
-  /*
-   * Create a hard link
-   */
-  if(H5Lcreate_hard(file_id, "/G2/DS4", file_id, "/G1/DS3",H5P_DEFAULT, H5P_DEFAULT)<0)
-       goto out;
-  /*
-   * Create a group named "/G1/G2" in the file.
-   */
-  if((group = H5Gcreate2(file_id, "/G1/G2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT))<0)
-    goto out;
-
-  /*
-   * Create a soft link
-   */
-  if(H5Lcreate_soft("/G2", file_id, "/G1/G2/G5", H5P_DEFAULT, H5P_DEFAULT)<0)
-    goto out;
-
-  /*
-   * Create a cyclic soft link
-   */
-  if(H5Lcreate_soft("/G1", file_id, "/G1/G2/Gcyc", H5P_DEFAULT, H5P_DEFAULT)<0)
-    goto out;
-
-  if(H5Gclose(group)<0)
-    goto out;
-
-  /*
-   * Create a group named "/G1/G2/G6" in the file.
-   */
-  if((group = H5Gcreate2(file_id, "/G1/G2/G6", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT))<0)
-    goto out;
-
-  /*
-   * Create an external link
-   */
-  if(H5Lcreate_external( FILE_NAME4, "G1", group, "ExternalLink",  H5P_DEFAULT,  H5P_DEFAULT)<0)
-    goto out;
-
-  if(H5Gclose(group)<0)
-    goto out;
-  /*
-   * Close the file.
-   */
-  if(H5Fclose (file_id) < 0)
-      goto out;
-
-  /* Create another file for checking external links */
-
-  /**************************************************************
-   *  The file structure should look like this:
-   *
-   *               +----+
-   *               |  / |
-   *               +----+
-   *                 |
-   *                 |
-   *                 |
-   *                 G1
-   *                /  \
-   *               /    \
-   *            DS1      G2
-   *                    (dangled soft link to /G1/G20)
-   *
-   ****************************************************************/
-
-  /* Make external link file */
-  file_id = H5Fcreate(FILE_NAME4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-  /*
-   * Create a group named "G1" in the file.
-   */
-  if((group = H5Gcreate2(file_id, "G1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT))<0)
-    goto out;
-  /*
-   * Create a dataset named "G1/DS1" in the file.
-   */
-  if(H5LTmake_dataset_string(group, "/G1/DS1", data_string_in)<0)
-    goto out;
-
-  /*
-   * Create a dangling soft link
-   */
-
-  if(H5Lcreate_soft("/G1/G2", file_id, "/G1/G20", H5P_DEFAULT, H5P_DEFAULT)<0)
-    goto out;
-
-  if(H5Gclose(group)<0)
-    goto out;
-
-  H5Fclose(file_id);
-
-  /* Open input file */
-  if((file_id = H5Fopen(FILE_NAME3,H5F_ACC_RDONLY, H5P_DEFAULT))<0)
-    goto out;
-
-  /**************************************
-   * CHECK ABSOLUTE PATHS
-   **************************************/
-
-  if( (path_valid = H5LTpath_valid(file_id, "/", TRUE)) != TRUE) {
-    goto out;
-  }
-
-  if( (path_valid = H5LTpath_valid(file_id, "/", FALSE)) != TRUE) {
-    goto out;
-  }
-
-  if( (path_valid = H5LTpath_valid(file_id, "/G1", TRUE)) != TRUE) {
-    goto out;
-  }
-
-  if((path_valid = H5LTpath_valid(file_id, "/G1/DS1", TRUE)) != TRUE)
-    goto out;
-
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/DS3", TRUE)) != TRUE)
-    goto out;
-
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2", TRUE)) != TRUE)
-    goto out;
-
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G5", TRUE)) != TRUE)
-    goto out;
+    hid_t       file_id, group;
+    htri_t      path_valid;
+    const char *data_string_in = "test";
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/DS1", FALSE)) != TRUE)
-    goto out;
+    HL_TESTING2("H5LTpath_valid");
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/DS1", TRUE)) != TRUE)
-    goto out;
+    /* Create a new file using default properties. */
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G2", TRUE)) != TRUE)
-    goto out;
+    /**************************************************************
+     *  The file structure should look like this:
+     *
+     *        +----------------------------------+
+     *        |                 /                |
+     *        +----------------------------------+
+     *                  /       |   \       \
+     *                 /        |    \       \
+     *                /         |     \       \
+     *               /          |      \       G8 (dangled external link)
+     *              /          DS       \
+     *             /                     \
+     *            G1                    G2
+     *            | --> DS1              |
+     *           / \--> DS3             / \
+     *          /                      /   \
+     *        G2                     DS4    G7
+     *         |                 (hard link   (dangled soft link
+     *         |                 to /G1/DS3)  to /G1/G20 )
+     *         |
+     *         |
+     *         | --- Gcyc (soft link to /G1)
+     *        /  \
+     *       /    \
+     *     G5      \
+     *  (soft link  G6 (external link /G1 in FILENAME4)
+     *  to /G2)
+     *
+     ****************************************************************/
 
-  /* check soft link points to a valid object*/
-  if( (path_valid = H5LTpath_valid(file_id, "/G2/DS4", TRUE)) != TRUE)
-    goto out;
+    file_id = H5Fcreate(FILE_NAME3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-  /* check if path exist, but not the object */
-  if( (path_valid = H5LTpath_valid(file_id, "/G2/G7", FALSE)) != TRUE )
-    goto out;
-  /* check if path exist and if the object exists. It should fail
-   * since it is a dangling soft link
-   */
-  if( (path_valid = H5LTpath_valid(file_id, "/G2/G7", TRUE)) == TRUE)
-    goto out;
+    /*
+     * Create dataset "/DS"
+     */
+    if (H5LTmake_dataset_string(file_id, "DS", data_string_in) < 0)
+        goto out;
 
-  /* check soft links */
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G5/DS4", TRUE)) != TRUE)
-    goto out;
+    /*
+     * Create an external dangled link
+     */
+    if (H5Lcreate_external("NonExistant_File.h5", "G8", file_id, "DangledExternalLink", H5P_DEFAULT,
+                           H5P_DEFAULT) < 0)
+        goto out;
 
-  /**************************************
-   * CHECK RELATIVE PATHS
-   ***************************************/
+    /*
+     * Create a group named "G2" in the file.
+     */
+    if ((group = H5Gcreate2(file_id, "G2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-  if( (group = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0)
-    goto out;
+    /*
+     * Create a dataset named "G2/DS4" in the file.
+     */
+    if (H5LTmake_dataset_string(group, "/G2/DS4", data_string_in) < 0)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(group, "/", TRUE)) != TRUE) {
-    goto out;
-  }
+    /*
+     * Create a soft link
+     */
+    if (H5Lcreate_soft("/G1/G20", file_id, "/G2/G7", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(group, "/", FALSE)) != TRUE) {
-    goto out;
-  }
+    if (H5Gclose(group) < 0)
+        goto out;
 
-  if(H5Gclose(group)<0)
-    goto out;
+    /*
+     * Create a group named "G1" in the file.
+     */
+    if ((group = H5Gcreate2(file_id, "G1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-  if( (group = H5Gopen2(file_id, "/G1", H5P_DEFAULT)) < 0)
-    goto out;
+    /*
+     * Create a group named "G1/DS1" in the file.
+     */
+    if (H5LTmake_dataset_string(group, "/G1/DS1", data_string_in) < 0)
+        goto out;
 
-  /* The identifier (file id) is the object itself, i.e. "." */
+    if (H5Gclose(group) < 0)
+        goto out;
 
-  if((path_valid = H5LTpath_valid(file_id, ".", FALSE)) != TRUE)
-    goto out;
+    /*
+     * Create a hard link
+     */
+    if (H5Lcreate_hard(file_id, "/G2/DS4", file_id, "/G1/DS3", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    /*
+     * Create a group named "/G1/G2" in the file.
+     */
+    if ((group = H5Gcreate2(file_id, "/G1/G2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, ".", TRUE)) != TRUE)
-    goto out;
+    /*
+     * Create a soft link
+     */
+    if (H5Lcreate_soft("/G2", file_id, "/G1/G2/G5", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
 
-  /* The identifier (group id) is the object itself, i.e. "." */
+    /*
+     * Create a cyclic soft link
+     */
+    if (H5Lcreate_soft("/G1", file_id, "/G1/G2/Gcyc", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    if (H5Gclose(group) < 0)
+        goto out;
+
+    /*
+     * Create a group named "/G1/G2/G6" in the file.
+     */
+    if ((group = H5Gcreate2(file_id, "/G1/G2/G6", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*
+     * Create an external link
+     */
+    if (H5Lcreate_external(FILE_NAME4, "G1", group, "ExternalLink", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    if (H5Gclose(group) < 0)
+        goto out;
+    /*
+     * Close the file.
+     */
+    if (H5Fclose(file_id) < 0)
+        goto out;
+
+    /* Create another file for checking external links */
+
+    /**************************************************************
+     *  The file structure should look like this:
+     *
+     *               +----+
+     *               |  / |
+     *               +----+
+     *                 |
+     *                 |
+     *                 |
+     *                 G1
+     *                /  \
+     *               /    \
+     *            DS1      G2
+     *                    (dangled soft link to /G1/G20)
+     *
+     ****************************************************************/
+
+    /* Make external link file */
+    file_id = H5Fcreate(FILE_NAME4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Create a group named "G1" in the file.
+     */
+    if ((group = H5Gcreate2(file_id, "G1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    /*
+     * Create a dataset named "G1/DS1" in the file.
+     */
+    if (H5LTmake_dataset_string(group, "/G1/DS1", data_string_in) < 0)
+        goto out;
+
+    /*
+     * Create a dangling soft link
+     */
+
+    if (H5Lcreate_soft("/G1/G2", file_id, "/G1/G20", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    if (H5Gclose(group) < 0)
+        goto out;
+
+    H5Fclose(file_id);
+
+    /* Open input file */
+    if ((file_id = H5Fopen(FILE_NAME3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /**************************************
+     * CHECK ABSOLUTE PATHS
+     **************************************/
+
+    if ((path_valid = H5LTpath_valid(file_id, "/", TRUE)) != TRUE) {
+        goto out;
+    }
+
+    if ((path_valid = H5LTpath_valid(file_id, "/", FALSE)) != TRUE) {
+        goto out;
+    }
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1", TRUE)) != TRUE) {
+        goto out;
+    }
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/DS1", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/DS3", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G5", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/DS1", FALSE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/DS1", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G2", TRUE)) != TRUE)
+        goto out;
+
+    /* check soft link points to a valid object*/
+    if ((path_valid = H5LTpath_valid(file_id, "/G2/DS4", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(group, ".", TRUE)) != TRUE)
-    goto out;
+    /* check if path exist, but not the object */
+    if ((path_valid = H5LTpath_valid(file_id, "/G2/G7", FALSE)) != TRUE)
+        goto out;
+    /* check if path exist and if the object exists. It should fail
+     * since it is a dangling soft link
+     */
+    if ((path_valid = H5LTpath_valid(file_id, "/G2/G7", TRUE)) == TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(group, "DS3", FALSE)) != TRUE)
-    goto out;
+    /* check soft links */
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G5/DS4", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(group, "DS3", TRUE)) != TRUE)
-    goto out;
+    /**************************************
+     * CHECK RELATIVE PATHS
+     ***************************************/
 
-  if( (path_valid = H5LTpath_valid(group, "G2/G5", TRUE)) != TRUE)
-    goto out;
+    if ((group = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0)
+        goto out;
 
-  /* Check the "./" case */
-  if( (path_valid = H5LTpath_valid(group, "./DS3", TRUE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "/", TRUE)) != TRUE) {
+        goto out;
+    }
 
-  if( (path_valid = H5LTpath_valid(group, "./G2/G5", TRUE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "/", FALSE)) != TRUE) {
+        goto out;
+    }
+
+    if (H5Gclose(group) < 0)
+        goto out;
 
-  /* Should fail, does not exist */
-  if( (path_valid = H5LTpath_valid(group, "./G2/G20", FALSE)) == TRUE)
-    goto out;
+    if ((group = H5Gopen2(file_id, "/G1", H5P_DEFAULT)) < 0)
+        goto out;
 
-  /* Should fail, does not exist */
-  if( (path_valid = H5LTpath_valid(group, "./G2/G20", TRUE)) == TRUE)
-    goto out;
+    /* The identifier (file id) is the object itself, i.e. "." */
 
-  if(H5Gclose(group)<0)
-    goto out;
+    if ((path_valid = H5LTpath_valid(file_id, ".", FALSE)) != TRUE)
+        goto out;
 
-  /*****************************
-   * Check external links
-   *****************************/
+    if ((path_valid = H5LTpath_valid(file_id, ".", TRUE)) != TRUE)
+        goto out;
 
-  /* The dangled external link path is valid */
-  if( (path_valid = H5LTpath_valid(file_id, "/DangledExternalLink", FALSE)) != TRUE)
-    goto out;
+    /* The identifier (group id) is the object itself, i.e. "." */
 
-  /* The file however does not exists, so the link dangles -> should return false */
-  if( (path_valid = H5LTpath_valid(file_id, "/DangledExternalLink", TRUE)) == TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, ".", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", FALSE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "DS3", FALSE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", TRUE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "DS3", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/DS1", TRUE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "G2/G5", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/G20", FALSE)) != TRUE)
-    goto out;
+    /* Check the "./" case */
+    if ((path_valid = H5LTpath_valid(group, "./DS3", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/DS1", TRUE)) != TRUE)
-    goto out;
+    if ((path_valid = H5LTpath_valid(group, "./G2/G5", TRUE)) != TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/G20", FALSE)) != TRUE)
-    goto out;
+    /* Should fail, does not exist */
+    if ((path_valid = H5LTpath_valid(group, "./G2/G20", FALSE)) == TRUE)
+        goto out;
 
-  /* Should fail, does not exist */
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/G20", TRUE)) == TRUE)
-    goto out;
+    /* Should fail, does not exist */
+    if ((path_valid = H5LTpath_valid(group, "./G2/G20", TRUE)) == TRUE)
+        goto out;
 
-  if( (path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/G20", TRUE)) == TRUE)
-    goto out;
+    if (H5Gclose(group) < 0)
+        goto out;
 
+    /*****************************
+     * Check external links
+     *****************************/
 
-  if(H5Fclose(file_id)<0)
-    goto out;
+    /* The dangled external link path is valid */
+    if ((path_valid = H5LTpath_valid(file_id, "/DangledExternalLink", FALSE)) != TRUE)
+        goto out;
 
-  PASSED();
-  return 0;
+    /* The file however does not exists, so the link dangles -> should return false */
+    if ((path_valid = H5LTpath_valid(file_id, "/DangledExternalLink", TRUE)) == TRUE)
+        goto out;
 
- out:
-  H5_FAILED();
-  return -1;
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", FALSE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/DS1", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/G20", FALSE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/DS1", TRUE)) != TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/G20", FALSE)) != TRUE)
+        goto out;
+
+    /* Should fail, does not exist */
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/G20", TRUE)) == TRUE)
+        goto out;
+
+    if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/G20", TRUE)) == TRUE)
+        goto out;
+
+    if (H5Fclose(file_id) < 0)
+        goto out;
+
+    PASSED();
+    return 0;
+
+out:
+    H5_FAILED();
+    return -1;
 }
 
 /*-------------------------------------------------------------------------
-* the main program
-*-------------------------------------------------------------------------
-*/
-int main( void )
+ * the main program
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
 {
-    int  nerrors=0;
+    int nerrors = 0;
 
     /* test dataset functions */
     nerrors += test_dsets();
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 61aebc7..fe17d38 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -23,41 +23,34 @@
  *-------------------------------------------------------------------------
  */
 
-#define NRECORDS 8
-#define BIG_TABLE_SIZE  8000
-#define NFIELDS 5
-#define TEST_FILE_NAME "test_packet_table.h5"
+#define NRECORDS           8
+#define BIG_TABLE_SIZE     8000
+#define NFIELDS            5
+#define TEST_FILE_NAME     "test_packet_table.h5"
 #define TEST_COMPRESS_FILE "test_packet_compress.h5"
-#define PT_NAME "Test Packet Table"
-#define H5TB_TABLE_NAME "Table1"
+#define PT_NAME            "Test Packet Table"
+#define H5TB_TABLE_NAME    "Table1"
 
 /*-------------------------------------------------------------------------
  * structure used for some tests, a particle
  *-------------------------------------------------------------------------
  */
-typedef struct particle_t
-{
- char   name[16];
- int    lati;
- int    longi;
- float  pressure;
- double temperature;
+typedef struct particle_t {
+    char   name[16];
+    int    lati;
+    int    longi;
+    float  pressure;
+    double temperature;
 } particle_t;
 
 /*-------------------------------------------------------------------------
  * a static array of particles for writing and checking reads
  *-------------------------------------------------------------------------
  */
-static particle_t testPart[NRECORDS] = {
-    {"zero", 0,0, 0.0f, 0.0f},
-    {"one",  10,10, 1.0f, 10.0f},
-    {"two",  20,20, 2.0f, 20.0f},
-    {"three",30,30, 3.0f, 30.0f},
-    {"four", 40,40, 4.0f, 40.0f},
-    {"five", 50,50, 5.0f, 50.0f},
-    {"six",  60,60, 6.0f, 60.0f},
-    {"seven",70,70, 7.0f, 70.0f}
-  };
+static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0f},    {"one", 10, 10, 1.0f, 10.0f},
+                                        {"two", 20, 20, 2.0f, 20.0f},  {"three", 30, 30, 3.0f, 30.0f},
+                                        {"four", 40, 40, 4.0f, 40.0f}, {"five", 50, 50, 5.0f, 50.0f},
+                                        {"six", 60, 60, 6.0f, 60.0f},  {"seven", 70, 70, 7.0f, 70.0f}};
 
 /*-------------------------------------------------------------------------
  * function that compares one particle
@@ -65,16 +58,15 @@ static particle_t testPart[NRECORDS] = {
  * fields verbatim and not lose any bits.  -JML
  *-------------------------------------------------------------------------
  */
-static int cmp_par(size_t i, size_t j, particle_t *rbuf, particle_t *wbuf )
+static int
+cmp_par(size_t i, size_t j, particle_t *rbuf, particle_t *wbuf)
 {
- if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
-  rbuf[i].lati != wbuf[j].lati ||
-  rbuf[i].longi != wbuf[j].longi ||
-  !H5_FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure) ||
-  !H5_DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) ) {
-  return FAIL;
- }
- return SUCCEED;
+    if ((HDstrcmp(rbuf[i].name, wbuf[j].name) != 0) || rbuf[i].lati != wbuf[j].lati ||
+        rbuf[i].longi != wbuf[j].longi || !H5_FLT_ABS_EQUAL(rbuf[i].pressure, wbuf[j].pressure) ||
+        !H5_DBL_ABS_EQUAL(rbuf[i].temperature, wbuf[j].temperature)) {
+        return FAIL;
+    }
+    return SUCCEED;
 }
 
 /*-------------------------------------------------------------------------
@@ -84,53 +76,51 @@ static int cmp_par(size_t i, size_t j, particle_t *rbuf, particle_t *wbuf )
 static hid_t
 make_particle_type(void)
 {
- hid_t type_id;
- hid_t string_type;
- size_t type_size = sizeof(particle_t);
-
- /* Create the memory data type. */
- if ((type_id = H5Tcreate (H5T_COMPOUND, type_size )) < 0 )
-  return FAIL;
-
- /* Insert fields. */
- if ((string_type = H5Tcopy(H5T_C_S1)) < 0)
-     return FAIL;
- if (H5Tset_size(string_type, (size_t)16) < 0)
-     return FAIL;
-
- if ( H5Tinsert(type_id, "Name", HOFFSET(particle_t, name) , string_type ) < 0 )
-     return FAIL;
- if ( H5Tinsert(type_id, "Lat", HOFFSET(particle_t, lati) , H5T_NATIVE_INT ) < 0 )
-     return FAIL;
- if ( H5Tinsert(type_id, "Long", HOFFSET(particle_t, longi) , H5T_NATIVE_INT ) < 0 )
-     return FAIL;
- if ( H5Tinsert(type_id, "Pressure", HOFFSET(particle_t, pressure) , H5T_NATIVE_FLOAT ) < 0 )
-     return FAIL;
- if ( H5Tinsert(type_id, "Temperature", HOFFSET(particle_t, temperature) , H5T_NATIVE_DOUBLE ) < 0 )
-     return FAIL;
-
- return type_id;
+    hid_t  type_id;
+    hid_t  string_type;
+    size_t type_size = sizeof(particle_t);
+
+    /* Create the memory data type. */
+    if ((type_id = H5Tcreate(H5T_COMPOUND, type_size)) < 0)
+        return FAIL;
+
+    /* Insert fields. */
+    if ((string_type = H5Tcopy(H5T_C_S1)) < 0)
+        return FAIL;
+    if (H5Tset_size(string_type, (size_t)16) < 0)
+        return FAIL;
+
+    if (H5Tinsert(type_id, "Name", HOFFSET(particle_t, name), string_type) < 0)
+        return FAIL;
+    if (H5Tinsert(type_id, "Lat", HOFFSET(particle_t, lati), H5T_NATIVE_INT) < 0)
+        return FAIL;
+    if (H5Tinsert(type_id, "Long", HOFFSET(particle_t, longi), H5T_NATIVE_INT) < 0)
+        return FAIL;
+    if (H5Tinsert(type_id, "Pressure", HOFFSET(particle_t, pressure), H5T_NATIVE_FLOAT) < 0)
+        return FAIL;
+    if (H5Tinsert(type_id, "Temperature", HOFFSET(particle_t, temperature), H5T_NATIVE_DOUBLE) < 0)
+        return FAIL;
+
+    return type_id;
 }
 
-    /* Create a normal HL table just like the HL examples do */
-static int create_hl_table(hid_t fid)
+/* Create a normal HL table just like the HL examples do */
+static int
+create_hl_table(hid_t fid)
 {
-  /* Calculate the offsets of the particle struct members in memory */
-  size_t part_offset[NFIELDS] = { HOFFSET( particle_t, name ),
-                                  HOFFSET( particle_t, lati ),
-                                  HOFFSET( particle_t, longi ),
-                                  HOFFSET( particle_t, pressure ),
-                                  HOFFSET( particle_t, temperature )};
+    /* Calculate the offsets of the particle struct members in memory */
+    size_t part_offset[NFIELDS] = {HOFFSET(particle_t, name), HOFFSET(particle_t, lati),
+                                   HOFFSET(particle_t, longi), HOFFSET(particle_t, pressure),
+                                   HOFFSET(particle_t, temperature)};
 
     /* Define field information */
-    const char *field_names[NFIELDS]  =
-      { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
-    hid_t      field_type[NFIELDS];
-    hid_t      string_type;
-    hsize_t    chunk_size = 10;
-    int        *fill_data = NULL;
-    int        compress  = 0;
-    herr_t     status;
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hsize_t     chunk_size = 10;
+    int *       fill_data  = NULL;
+    int         compress   = 0;
+    herr_t      status;
 
     /* Initialize the field field_type */
     if ((string_type = H5Tcopy(H5T_C_S1)) < 0)
@@ -143,27 +133,24 @@ static int create_hl_table(hid_t fid)
     field_type[3] = H5T_NATIVE_FLOAT;
     field_type[4] = H5T_NATIVE_DOUBLE;
 
+    /*------------------------------------------------------------------------
+     * H5TBmake_table
+     *-------------------------------------------------------------------------
+     */
 
-  /*------------------------------------------------------------------------
-  * H5TBmake_table
-  *-------------------------------------------------------------------------
-  */
-
-  status=H5TBmake_table( "Table Title", fid, H5TB_TABLE_NAME, (hsize_t)NFIELDS,
-                        (hsize_t)NRECORDS, sizeof(particle_t),
-                        field_names, part_offset, field_type,
-                        chunk_size, fill_data, compress, testPart  );
+    status = H5TBmake_table("Table Title", fid, H5TB_TABLE_NAME, (hsize_t)NFIELDS, (hsize_t)NRECORDS,
+                            sizeof(particle_t), field_names, part_offset, field_type, chunk_size, fill_data,
+                            compress, testPart);
 
-  if (H5Tclose(string_type) < 0)
-    return FAIL;
+    if (H5Tclose(string_type) < 0)
+        return FAIL;
 
-  if(status<0)
-    return FAIL;
-  else
-    return SUCCEED;
+    if (status < 0)
+        return FAIL;
+    else
+        return SUCCEED;
 }
 
-
 /*-------------------------------------------------------------------------
  * test_create_close
  *
@@ -172,11 +159,12 @@ static int create_hl_table(hid_t fid)
  *-------------------------------------------------------------------------
  */
 
-static int test_create_close(hid_t fid)
+static int
+test_create_close(hid_t fid)
 {
     herr_t err;
-    hid_t table;
-    hid_t part_t;
+    hid_t  table;
+    hid_t  part_t;
 
     HL_TESTING2("H5PTcreate_fl and H5PTclose");
 
@@ -188,23 +176,23 @@ static int test_create_close(hid_t fid)
     /* Create the table */
     table = H5PTcreate_fl(fid, PT_NAME, part_t, (hsize_t)100, -1);
     if (H5Tclose(part_t) < 0)
-    goto error;
-    if( H5PTis_valid(table) < 0)
-    goto error;
-    if( H5PTis_varlen(table) != 0)
-    goto error;
+        goto error;
+    if (H5PTis_valid(table) < 0)
+        goto error;
+    if (H5PTis_varlen(table) != 0)
+        goto error;
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-      H5_FAILED();
-      return FAIL;
+    H5_FAILED();
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -214,32 +202,34 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_open(hid_t fid)
+static int
+test_open(hid_t fid)
 {
     herr_t err;
-    hid_t table;
+    hid_t  table;
 
     HL_TESTING2("H5PTopen");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
-    if( H5PTis_varlen(table) != 0)
+    if (H5PTis_varlen(table) != 0)
         goto error;
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-      if (table > 0) H5PTclose(table);
-      H5_FAILED();
-      return FAIL;
+    if (table > 0)
+        H5PTclose(table);
+    H5_FAILED();
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -249,63 +239,64 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_append(hid_t fid)
+static int
+test_append(hid_t fid)
 {
-    herr_t err;
-    hid_t table;
+    herr_t  err;
+    hid_t   table;
     hsize_t count = 0;
 
     HL_TESTING2("H5PTappend");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
 
     /* Count the number of packets in the table  */
     err = H5PTget_num_packets(table, &count);
-    if( err < 0)
+    if (err < 0)
         goto error;
     /* There should be 0 records in the table */
-    if( count != 0 )
+    if (count != 0)
         goto error;
 
     /* Append one particle */
     err = H5PTappend(table, (size_t)1, &(testPart[0]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Append several particles */
     err = H5PTappend(table, (size_t)6, &(testPart[1]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Append one more particle */
     err = H5PTappend(table, (size_t)1, &(testPart[7]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Count the number of packets in the table  */
     err = H5PTget_num_packets(table, &count);
-    if( err < 0)
+    if (err < 0)
         goto error;
     /* There should be 8 records in the table now */
-    if( count != 8 )
+    if (count != 8)
         goto error;
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-        H5_FAILED();
-        if( H5PTis_valid(table) > 0)
-            H5PTclose(table);
-        return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(table) > 0)
+        H5PTclose(table);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -315,45 +306,45 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_read(hid_t fid)
+static int
+test_read(hid_t fid)
 {
-    herr_t err;
-    hid_t table;
+    herr_t     err;
+    hid_t      table;
     particle_t readBuf[NRECORDS];
-    size_t c;
+    size_t     c;
 
     HL_TESTING2("H5PTread_packets");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
 
     /* Read several particles */
     err = H5PTread_packets(table, (hsize_t)0, 3, &(readBuf[0]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Read one particle */
     err = H5PTread_packets(table, (hsize_t)3, 1, &(readBuf[3]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Read several particles */
-    err = H5PTread_packets(table, (hsize_t)4, (NRECORDS - 4 ), &(readBuf[4]));
-    if( err < 0)
+    err = H5PTread_packets(table, (hsize_t)4, (NRECORDS - 4), &(readBuf[4]));
+    if (err < 0)
         goto error;
 
     /* Ensure that particles were read correctly */
-    for(c=0; c<NRECORDS; c++)
-    {
-        if( cmp_par(c%8, c, testPart, readBuf) != 0)
+    for (c = 0; c < NRECORDS; c++) {
+        if (cmp_par(c % 8, c, testPart, readBuf) != 0)
             goto error;
     }
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
@@ -361,10 +352,10 @@ static int test_read(hid_t fid)
     return SUCCEED;
 
 error:
-        H5_FAILED();
-        if( H5PTis_valid(table) > 0)
-            H5PTclose(table);
-        return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(table) > 0)
+        H5PTclose(table);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -375,66 +366,63 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_get_next(hid_t fid)
+static int
+test_get_next(hid_t fid)
 {
-    herr_t err;
-    hid_t table;
+    herr_t     err;
+    hid_t      table;
     particle_t readBuf[NRECORDS];
     particle_t readBuf2[NRECORDS];
-    size_t c;
+    size_t     c;
 
     HL_TESTING2("H5PTget_next");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
 
     /* Read several particles consecutively */
-    for(c=0; c < NRECORDS; c++)
-    {
+    for (c = 0; c < NRECORDS; c++) {
         err = H5PTget_next(table, (size_t)1, &readBuf[c]);
-        if(err < 0)
+        if (err < 0)
             goto error;
     }
 
     /* Ensure that particles were read correctly */
-    for(c=0; c<NRECORDS; c++)
-    {
-        if( cmp_par(c, c, testPart, readBuf) != 0)
+    for (c = 0; c < NRECORDS; c++) {
+        if (cmp_par(c, c, testPart, readBuf) != 0)
             goto error;
     }
 
     H5PTcreate_index(table);
 
     /* Read particles two by two */
-    for(c=0; c < NRECORDS / 2; c++)
-    {
+    for (c = 0; c < NRECORDS / 2; c++) {
         err = H5PTget_next(table, (size_t)2, &readBuf2[c * 2]);
-        if(err < 0)
+        if (err < 0)
             goto error;
     }
 
     /* Ensure that particles were read correctly */
-    for(c=0; c<NRECORDS; c++)
-    {
-        if( cmp_par(c, c, testPart, readBuf2) != 0)
+    for (c = 0; c < NRECORDS; c++) {
+        if (cmp_par(c, c, testPart, readBuf2) != 0)
             goto error;
     }
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-        H5_FAILED();
-        if( H5PTis_valid(table) > 0)
-            H5PTclose(table);
-        return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(table) > 0)
+        H5PTclose(table);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -445,14 +433,15 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int    test_big_table(hid_t fid)
+static int
+test_big_table(hid_t fid)
 {
-    herr_t err;
-    hid_t table;
-    hid_t part_t;
-    size_t c;
+    herr_t     err;
+    hid_t      table;
+    hid_t      part_t;
+    size_t     c;
     particle_t readPart;
-    hsize_t count;
+    hsize_t    count;
 
     HL_TESTING2("large packet table");
 
@@ -465,52 +454,50 @@ static int    test_big_table(hid_t fid)
     table = H5PTcreate_fl(fid, "Packet Test Dataset2", part_t, (hsize_t)33, -1);
     if (H5Tclose(part_t) < 0)
         goto error;
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
 
-        /* Add many particles */
-    for(c = 0; c < BIG_TABLE_SIZE ; c+=8)
-    {
+    /* Add many particles */
+    for (c = 0; c < BIG_TABLE_SIZE; c += 8) {
         /* Append eight particles at once*/
         err = H5PTappend(table, (size_t)8, &(testPart[0]));
-        if( err < 0)
+        if (err < 0)
             goto error;
     }
 
     /* Count the number of packets in the table  */
     err = H5PTget_num_packets(table, &count);
-    if( err < 0)
+    if (err < 0)
         goto error;
-    if( count != BIG_TABLE_SIZE )
+    if (count != BIG_TABLE_SIZE)
         goto error;
 
     /* Read particles to ensure that all of them were written correctly  */
     /* Also, ensure that H5PTcreate_fl set the current packet to */
     /* the first packet in the table                                     */
-    for(c = 0; c < BIG_TABLE_SIZE; c++)
-    {
+    for (c = 0; c < BIG_TABLE_SIZE; c++) {
         err = H5PTget_next(table, (size_t)1, &readPart);
-        if(err < 0)
+        if (err < 0)
             goto error;
 
         /* Ensure that particles were read correctly */
-        if( cmp_par(c % 8, 0, testPart, &readPart) != 0)
+        if (cmp_par(c % 8, 0, testPart, &readPart) != 0)
             goto error;
     }
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-        H5_FAILED();
-        if( H5PTis_valid(table) > 0)
-            H5PTclose(table);
-        return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(table) > 0)
+        H5PTclose(table);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -520,63 +507,63 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int    test_opaque(hid_t fid)
+static int
+test_opaque(hid_t fid)
 {
-    herr_t err;
-    hid_t table;
-    hid_t part_t;
-    size_t c;
+    herr_t     err;
+    hid_t      table;
+    hid_t      part_t;
+    size_t     c;
     particle_t readBuf[NRECORDS];
 
     HL_TESTING2("opaque data");
 
     /* Create an opaque datatype for the particle struct */
-    if ((part_t = H5Tcreate (H5T_OPAQUE, sizeof(particle_t) )) < 0 )
+    if ((part_t = H5Tcreate(H5T_OPAQUE, sizeof(particle_t))) < 0)
         return FAIL;
 
     HDassert(part_t != -1);
 
     /* Tag the opaque datatype */
-    if ( H5Tset_tag(part_t,  "Opaque Particle"  ) < 0)
+    if (H5Tset_tag(part_t, "Opaque Particle") < 0)
         return FAIL;
 
     /* Create a new table */
     table = H5PTcreate_fl(fid, "Packet Test Dataset3", part_t, (hsize_t)100, -1);
-    if( H5Tclose(part_t) < 0)
+    if (H5Tclose(part_t) < 0)
         goto error;
-    if( H5PTis_valid(table) < 0)
+    if (H5PTis_valid(table) < 0)
         goto error;
 
     /* Append several particles, starting at particle 1 */
     err = H5PTappend(table, (size_t)(NRECORDS - 1), &(testPart[1]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Read the particles back */
     err = H5PTread_packets(table, (hsize_t)0, 7, &(readBuf[0]));
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     /* Ensure that particles were read correctly */
-    for(c=0; c<NRECORDS - 1; c++)
-    {
-        if( cmp_par(c+1, c, testPart, readBuf) != 0)
+    for (c = 0; c < NRECORDS - 1; c++) {
+        if (cmp_par(c + 1, c, testPart, readBuf) != 0)
             goto error;
     }
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0)
+    if (err < 0)
         goto error;
 
     PASSED();
     return SUCCEED;
 
 error:
-        H5_FAILED();
-        if( H5PTis_valid(table) > 0)
-            H5PTclose(table);
-        return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(table) > 0)
+        H5PTclose(table);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -590,22 +577,23 @@ error:
 static int
 test_compress(void)
 {
-    hid_t fid1 = H5I_INVALID_HID;
-    herr_t err;
-    hid_t table = H5I_INVALID_HID;
-    hid_t part_t = H5I_INVALID_HID;
-    hid_t dset_id = H5I_INVALID_HID;
-    hid_t plist_id = H5I_INVALID_HID;
-    size_t c;
-    size_t num_elems = 1;
-    unsigned filter_vals[1];
+    hid_t      fid1 = H5I_INVALID_HID;
+    herr_t     err;
+    hid_t      table    = H5I_INVALID_HID;
+    hid_t      part_t   = H5I_INVALID_HID;
+    hid_t      dset_id  = H5I_INVALID_HID;
+    hid_t      plist_id = H5I_INVALID_HID;
+    size_t     c;
+    size_t     num_elems = 1;
+    unsigned   filter_vals[1];
     particle_t readPart[1];
-    hsize_t count;
+    hsize_t    count;
 
     HL_TESTING2("packet table compression");
 
     /* Create a file. */
-    if((fid1 = H5Fcreate(TEST_COMPRESS_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR;
+    if ((fid1 = H5Fcreate(TEST_COMPRESS_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
 
     /* Create a datatype for the particle struct */
     part_t = make_particle_type();
@@ -614,106 +602,129 @@ test_compress(void)
 
     /* Create a new table with compression level 8 */
     table = H5PTcreate_fl(fid1, "Compressed Test Dataset", part_t, (hsize_t)80, 8);
-    if( H5PTis_valid(table) < 0) TEST_ERROR;
+    if (H5PTis_valid(table) < 0)
+        TEST_ERROR;
 
     /* We can now use this table exactly the same way we use a normal uncompressed
      * packet table, and it should pass the same tests. */
-        /* Add many particles */
-    for(c = 0; c < BIG_TABLE_SIZE ; c+=8)
-    {
+    /* Add many particles */
+    for (c = 0; c < BIG_TABLE_SIZE; c += 8) {
         /* Append eight particles at once*/
         err = H5PTappend(table, (size_t)8, &(testPart[0]));
-        if( err < 0) TEST_ERROR;
+        if (err < 0)
+            TEST_ERROR;
     }
 
     /* Count the number of packets in the table  */
     err = H5PTget_num_packets(table, &count);
-    if( err < 0) TEST_ERROR;
-    if( count != BIG_TABLE_SIZE ) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
+    if (count != BIG_TABLE_SIZE)
+        TEST_ERROR;
 
     /* Read particles to ensure that all of them were written correctly  */
     HDmemset(readPart, 0, sizeof(readPart));
-    for(c = 0; c < BIG_TABLE_SIZE; c++)
-    {
+    for (c = 0; c < BIG_TABLE_SIZE; c++) {
         err = H5PTget_next(table, (size_t)1, readPart);
-        if(err < 0) TEST_ERROR;
+        if (err < 0)
+            TEST_ERROR;
 
         /* Ensure that particles were read correctly */
-        if( cmp_par(c % 8, 0, testPart, readPart) != 0) TEST_ERROR;
+        if (cmp_par(c % 8, 0, testPart, readPart) != 0)
+            TEST_ERROR;
     }
 
     /* Close the table */
     err = H5PTclose(table);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
 
     /* Open the packet table as a regular dataset and make sure that the
      * compression filter is set.
      */
     dset_id = H5Dopen2(fid1, "Compressed Test Dataset", H5P_DEFAULT);
-    if( dset_id < 0) TEST_ERROR;
+    if (dset_id < 0)
+        TEST_ERROR;
 
     plist_id = H5Dget_create_plist(dset_id);
-    if( plist_id < 0) TEST_ERROR;
+    if (plist_id < 0)
+        TEST_ERROR;
 
-    err = H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems,
-                      filter_vals, 0, NULL, NULL);
-    if( err < 0) TEST_ERROR;
+    err = H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, filter_vals, 0, NULL, NULL);
+    if (err < 0)
+        TEST_ERROR;
 
     /* The compression level should be 8, the value we passed in */
-    if(filter_vals[0] != 8) TEST_ERROR;
+    if (filter_vals[0] != 8)
+        TEST_ERROR;
 
     /* Clean up */
     err = H5Pclose(plist_id);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
     err = H5Dclose(dset_id);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
 
     /* Create a new table without compression. */
     table = H5PTcreate_fl(fid1, "Uncompressed Dataset", part_t, (hsize_t)80, -1);
-    if(table < 0) TEST_ERROR;
+    if (table < 0)
+        TEST_ERROR;
 
     /* Close the packet table */
     err = H5PTclose(table);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
 
     /* Open the packet table as a regular dataset and make sure that the
      * compression filter is not set.
      */
     dset_id = H5Dopen2(fid1, "Uncompressed Dataset", H5P_DEFAULT);
-    if( dset_id < 0) TEST_ERROR;
+    if (dset_id < 0)
+        TEST_ERROR;
 
     plist_id = H5Dget_create_plist(dset_id);
-    if( plist_id < 0) TEST_ERROR;
+    if (plist_id < 0)
+        TEST_ERROR;
 
-    H5E_BEGIN_TRY {
-    err = H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems,
-                      filter_vals, 0, NULL, NULL);
-    if( err >= 0) TEST_ERROR;
-    } H5E_END_TRY
+    H5E_BEGIN_TRY
+    {
+        err =
+            H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, filter_vals, 0, NULL, NULL);
+        if (err >= 0)
+            TEST_ERROR;
+    }
+    H5E_END_TRY
 
     /* Clean up */
     err = H5Pclose(plist_id);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
     err = H5Dclose(dset_id);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
 
     /* Close the datatype and the file */
     err = H5Tclose(part_t);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
     err = H5Fclose(fid1);
-    if( err < 0) TEST_ERROR;
+    if (err < 0)
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
 
 error:
-    H5E_BEGIN_TRY {
-       H5Pclose(plist_id);
-       H5Dclose(dset_id);
-       H5Tclose(part_t);
-       H5PTclose(table);
-       H5Fclose(fid1);
-    } H5E_END_TRY
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(plist_id);
+        H5Dclose(dset_id);
+        H5Tclose(part_t);
+        H5PTclose(table);
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY
     H5_FAILED();
     return FAIL;
 }
@@ -726,83 +737,85 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_rw_nonnative_dt(hid_t fid)
+static int
+test_rw_nonnative_dt(hid_t fid)
 {
- hid_t          ptable;     /* Packet table identifier */
+    hid_t ptable; /* Packet table identifier */
 
- herr_t         err;        /* Function return status */
- hsize_t        count;      /* Number of records in the table */
+    herr_t  err;   /* Function return status */
+    hsize_t count; /* Number of records in the table */
 
- int            x;          /* Loop variable */
+    int x; /* Loop variable */
 
- /* Buffers to hold data */
- int writeBuffer[5];
- int readBuffer[5];
+    /* Buffers to hold data */
+    int writeBuffer[5];
+    int readBuffer[5];
 
- HL_TESTING2("reading/writing non-native packet table");
+    HL_TESTING2("reading/writing non-native packet table");
 
- /* Initialize buffers */
- for(x=0; x<5; x++) {
-   writeBuffer[x]=x;
-   readBuffer[x] = -1;
- }
+    /* Initialize buffers */
+    for (x = 0; x < 5; x++) {
+        writeBuffer[x] = x;
+        readBuffer[x]  = -1;
+    }
 
- /* Create a fixed-length packet table within the file */
- /* This table's "packets" will be simple integers and it will use no compression */
- if(H5Tget_order(H5T_NATIVE_INT) == H5T_ORDER_LE) {
-   ptable = H5PTcreate(fid, "Packet Test Dataset, Non-native", H5T_STD_I32BE, (hsize_t)100, H5P_DEFAULT);
- } else {
-   ptable = H5PTcreate(fid, "Packet Test Dataset, Non-native", H5T_STD_I32LE, (hsize_t)100, H5P_DEFAULT);
- }
- if(ptable == H5I_INVALID_HID)
+    /* Create a fixed-length packet table within the file */
+    /* This table's "packets" will be simple integers and it will use no compression */
+    if (H5Tget_order(H5T_NATIVE_INT) == H5T_ORDER_LE) {
+        ptable = H5PTcreate(fid, "Packet Test Dataset, Non-native", H5T_STD_I32BE, (hsize_t)100, H5P_DEFAULT);
+    }
+    else {
+        ptable = H5PTcreate(fid, "Packet Test Dataset, Non-native", H5T_STD_I32LE, (hsize_t)100, H5P_DEFAULT);
+    }
+    if (ptable == H5I_INVALID_HID)
         goto error;
 
- /* Write one packet to the packet table */
- if( (err = H5PTappend(ptable, (size_t)1, &(writeBuffer[0]))) < 0 )
+    /* Write one packet to the packet table */
+    if ((err = H5PTappend(ptable, (size_t)1, &(writeBuffer[0]))) < 0)
         goto error;
 
- /* Write several packets to the packet table */
- if( (err = H5PTappend(ptable, (size_t)4, &(writeBuffer[1]))) < 0)
+    /* Write several packets to the packet table */
+    if ((err = H5PTappend(ptable, (size_t)4, &(writeBuffer[1]))) < 0)
         goto error;
 
- if( (err = H5PTclose(ptable)) < 0)
+    if ((err = H5PTclose(ptable)) < 0)
         goto error;
 
- /* Open the Packet table */
- if( (ptable = H5PTopen(fid, "Packet Test Dataset, Non-native")) < 0)
+    /* Open the Packet table */
+    if ((ptable = H5PTopen(fid, "Packet Test Dataset, Non-native")) < 0)
         goto error;
 
- /* Get the number of packets in the packet table.  This should be five. */
- if( (err = H5PTget_num_packets(ptable, &count)) < 0)
+    /* Get the number of packets in the packet table.  This should be five. */
+    if ((err = H5PTget_num_packets(ptable, &count)) < 0)
         goto error;
 
- if( (int)count != 5 )
+    if ((int)count != 5)
         goto error;
 
- /* Initialize packet table's "current record" */
- if( (err = H5PTcreate_index(ptable)) < 0)
+    /* Initialize packet table's "current record" */
+    if ((err = H5PTcreate_index(ptable)) < 0)
         goto error;
 
- /* Iterate through packets, read each one back */
- for(x=0; x<5; x++) {
-   if( (err = H5PTget_next(ptable, (size_t)1, &(readBuffer[x]))) < 0)
-        goto error;
-   if( x != readBuffer[x])
-        goto error;
- }
+    /* Iterate through packets, read each one back */
+    for (x = 0; x < 5; x++) {
+        if ((err = H5PTget_next(ptable, (size_t)1, &(readBuffer[x]))) < 0)
+            goto error;
+        if (x != readBuffer[x])
+            goto error;
+    }
 
- /* Close the packet table */
- if( (err = H5PTclose(ptable)) < 0)
+    /* Close the packet table */
+    if ((err = H5PTclose(ptable)) < 0)
         goto error;
 
- PASSED();
- return SUCCEED;
+    PASSED();
+    return SUCCEED;
 
 error:
-     H5_FAILED();
-     if( H5PTis_valid(ptable) > 0)
-       H5PTclose(ptable);
-     return FAIL;
+    H5_FAILED();
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -813,109 +826,110 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_error(hid_t fid)
+static int
+test_error(hid_t fid)
 {
-  hid_t id = H5I_INVALID_HID;
-  int id_open=0;
-  particle_t readBuf[1];
+    hid_t      id      = H5I_INVALID_HID;
+    int        id_open = 0;
+    particle_t readBuf[1];
 
-  HL_TESTING2("error conditions");
+    HL_TESTING2("error conditions");
 
-  /* Create a HL table */
-  if(create_hl_table(fid) < 0)
+    /* Create a HL table */
+    if (create_hl_table(fid) < 0)
         goto error;
 
-  /* Try to open things that are not packet tables */
-  H5E_BEGIN_TRY
-  if(H5PTopen(fid, "Bogus_name") >= 0)
+    /* Try to open things that are not packet tables */
+    H5E_BEGIN_TRY
+    if (H5PTopen(fid, "Bogus_name") >= 0)
         goto error;
-  if(H5PTopen(fid, "group1") >= 0)
+    if (H5PTopen(fid, "group1") >= 0)
         goto error;
-  H5E_END_TRY
+    H5E_END_TRY
 
-  /* Try to execute packet table commands on an invalid ID */
-  H5E_BEGIN_TRY
-  if(H5PTis_valid(id) >= 0)
+    /* Try to execute packet table commands on an invalid ID */
+    H5E_BEGIN_TRY
+    if (H5PTis_valid(id) >= 0)
         goto error;
-  if(H5PTis_varlen(id) >= 0)
+    if (H5PTis_varlen(id) >= 0)
         goto error;
-  if(H5PTclose(id) >= 0)
+    if (H5PTclose(id) >= 0)
         goto error;
-  if(H5PTappend(id, (size_t)1, testPart) >= 0)
+    if (H5PTappend(id, (size_t)1, testPart) >= 0)
         goto error;
-  if(H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
+    if (H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
         goto error;
-  if(H5PTcreate_index(id) >= 0)
+    if (H5PTcreate_index(id) >= 0)
         goto error;
-  if(H5PTset_index(id, (hsize_t)1) >= 0)
+    if (H5PTset_index(id, (hsize_t)1) >= 0)
         goto error;
-  if(H5PTget_index(id, NULL) >= 0)
+    if (H5PTget_index(id, NULL) >= 0)
         goto error;
-  H5E_END_TRY
+    H5E_END_TRY
 
-  /* Open a high-level non-packet (H5TB) table and try to */
-  /* execute commands on it. */
-  if((id=H5Dopen2(fid, H5TB_TABLE_NAME, H5P_DEFAULT)) <0)
+    /* Open a high-level non-packet (H5TB) table and try to */
+    /* execute commands on it. */
+    if ((id = H5Dopen2(fid, H5TB_TABLE_NAME, H5P_DEFAULT)) < 0)
         goto error;
-  id_open = 1;
+    id_open = 1;
 
-  H5E_BEGIN_TRY
-  if(H5PTis_valid(id) >= 0)
+    H5E_BEGIN_TRY
+    if (H5PTis_valid(id) >= 0)
         goto error;
-  if(H5PTis_varlen(id) >= 0)
+    if (H5PTis_varlen(id) >= 0)
         goto error;
-  if(H5PTclose(id) >= 0)
+    if (H5PTclose(id) >= 0)
         goto error;
-  if(H5PTappend(id, (size_t)1, testPart) >= 0)
+    if (H5PTappend(id, (size_t)1, testPart) >= 0)
         goto error;
-  if(H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
+    if (H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
         goto error;
-  if(H5PTcreate_index(id) >= 0)
+    if (H5PTcreate_index(id) >= 0)
         goto error;
-  if(H5PTset_index(id, (hsize_t)1) >= 0)
+    if (H5PTset_index(id, (hsize_t)1) >= 0)
         goto error;
-  if(H5PTget_index(id, NULL) >= 0)
+    if (H5PTget_index(id, NULL) >= 0)
         goto error;
-  H5E_END_TRY
+    H5E_END_TRY
 
-  id_open=0;
-  if(H5Dclose(id) <0)
+    id_open = 0;
+    if (H5Dclose(id) < 0)
         goto error;
 
-  /* Open and close a packet table.  Try to execute */
-  /* commands on the closed ID. */
-  if((id=H5PTopen(fid, PT_NAME))<0)
+    /* Open and close a packet table.  Try to execute */
+    /* commands on the closed ID. */
+    if ((id = H5PTopen(fid, PT_NAME)) < 0)
         goto error;
-  if(H5PTclose(id) <0)
+    if (H5PTclose(id) < 0)
         goto error;
 
-  H5E_BEGIN_TRY
-  if(H5PTis_valid(id) >= 0)
+    H5E_BEGIN_TRY
+    if (H5PTis_valid(id) >= 0)
         goto error;
-  if(H5PTis_varlen(id) >= 0)
+    if (H5PTis_varlen(id) >= 0)
         goto error;
-  if(H5PTclose(id) >= 0)
+    if (H5PTclose(id) >= 0)
         goto error;
-  if(H5PTappend(id, (size_t)1, testPart) >= 0)
+    if (H5PTappend(id, (size_t)1, testPart) >= 0)
         goto error;
-  if(H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
+    if (H5PTread_packets(id, (hsize_t)0, 1, readBuf) >= 0)
         goto error;
-  if(H5PTcreate_index(id) >= 0)
+    if (H5PTcreate_index(id) >= 0)
         goto error;
-  if(H5PTset_index(id, (hsize_t)1) >= 0)
+    if (H5PTset_index(id, (hsize_t)1) >= 0)
         goto error;
-  if(H5PTget_index(id, NULL) >= 0)
+    if (H5PTget_index(id, NULL) >= 0)
         goto error;
-  H5E_END_TRY
+    H5E_END_TRY
 
-  PASSED();
-  return SUCCEED;
+    PASSED();
+    return SUCCEED;
 
 error:
-  H5_FAILED();
-  if(id_open)
-    H5Dclose(id);
-  return FAIL;
+    H5_FAILED();
+    if (id_open)
+        H5Dclose(id);
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -925,18 +939,19 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static int test_packet_table(hid_t fid)
+static int
+test_packet_table(hid_t fid)
 {
 
-    if( test_create_close(fid) < 0 )
+    if (test_create_close(fid) < 0)
         return FAIL;
 
-    if( test_open(fid) < 0 )
+    if (test_open(fid) < 0)
         return FAIL;
 
     /* test_append must be run before test_count and test_read, as it */
     /* creates the packet table they use. */
-    if( test_append(fid) < 0 )
+    if (test_append(fid) < 0)
         return FAIL;
 
     /* These tests will not necessarily cause failures in each other,
@@ -954,22 +969,23 @@ static int test_packet_table(hid_t fid)
 
 /*
  *
-*/
-int main(void)
+ */
+int
+main(void)
 {
     /* identifier for the file that is used in FL PT tests */
-    hid_t       fid;
-    int         status = 0;
+    hid_t fid;
+    int   status = 0;
 
-/*-------------------------------------------------------------------------
- * Packet test: test each function of the packet table library
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * Packet test: test each function of the packet table library
+     *-------------------------------------------------------------------------
+     */
 
- /* create a file using default properties */
- fid=H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a file using default properties */
+    fid = H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- HDputs("Testing packet table");
+    HDputs("Testing packet table");
 
     /* Test packet table with fixed length */
     if (test_packet_table(fid) < 0)
@@ -981,7 +997,7 @@ int main(void)
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    status = 1;
+        status = 1;
 
     return status;
 }
diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c
index b41e73d..d2331d7 100644
--- a/hl/test/test_packet_vlen.c
+++ b/hl/test/test_packet_vlen.c
@@ -18,17 +18,17 @@
  *-------------------------------------------------------------------------
  */
 
-#define NRECORDS 5
-#define TEST_FILE_NAME "test_packet_table_vlen.h5"
+#define NRECORDS         5
+#define TEST_FILE_NAME   "test_packet_table_vlen.h5"
 #define TESTFL_FILE_NAME "testfl_packet_table_vlen.h5"
-#define PT_VLEN_ATOMIC "Dataset with VL of Atomic types"
-#define PT_VLEN_COMP "Dataset with VL of Compound Types"
-#define PT_COMP_VLEN "Dataset with Compound Type of VL types"
-#define PT_VLEN_VLEN "Dataset with VL of VL types"
-#define PT_FIXED_LEN "Fixed-length Packet Table"
-#define L1_INCM         16
-#define L2_INCM         8
-#define NAME_BUF_SIZE   80
+#define PT_VLEN_ATOMIC   "Dataset with VL of Atomic types"
+#define PT_VLEN_COMP     "Dataset with VL of Compound Types"
+#define PT_COMP_VLEN     "Dataset with Compound Type of VL types"
+#define PT_VLEN_VLEN     "Dataset with VL of VL types"
+#define PT_FIXED_LEN     "Fixed-length Packet Table"
+#define L1_INCM          16
+#define L2_INCM          8
+#define NAME_BUF_SIZE    80
 
 /*-------------------------------------------------------------------------
  * Local functions
@@ -51,17 +51,18 @@ static int verify_attribute(hid_t fid, const char *table_name, const char *attr_
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_VLof_atomic(void)
+static int
+test_VLof_atomic(void)
 {
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
-    hsize_t count;        /* Number of records in the table */
-    unsigned uu, vv;        /* Loop variables */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t    fid    = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vltype = H5I_INVALID_HID; /* Variable length datatype */
+    hsize_t  count;                    /* Number of records in the table */
+    unsigned uu, vv;                   /* Loop variables */
+    hvl_t    writeBuf[NRECORDS];       /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];        /* Buffer to hold read data */
+    char     msg[80];                  /* For error message */
+    herr_t   ret;                      /* Returned status from a callee */
 
     HL_TESTING3("        with vlen of atomic");
 
@@ -71,84 +72,86 @@ static int test_VLof_atomic(void)
         if (writeBuf[uu].p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++)
-        ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
+            ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
     } /* end for */
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a vlen type that uses an atomic datatype as its base type */
-    vltype = H5Tvlen_create (H5T_NATIVE_UINT);
+    vltype = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vltype < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of an atomic type */
     ptable = H5PTcreate(fid, PT_VLEN_ATOMIC, vltype, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Close the vlen datatype */
     if (H5Tclose(vltype) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     for (uu = 0; uu < NRECORDS; uu++)
-        for (vv = 0; vv < (uu + 1); vv++)
-        {
-        if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
-        HDprintf("Packet %u's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
-        HDprintf("Packet %u's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
-        }
+        for (vv = 0; vv < (uu + 1); vv++) {
+            if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
+                HDprintf("Packet %u's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
+                HDprintf("Packet %u's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
+            }
         }
 
     /* Free the buffers */
-    ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf );
+    ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vltype > 0) H5Tclose(vltype);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vltype > 0)
+        H5Tclose(vltype);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -162,134 +165,142 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_VLof_comptype(void)
+static int
+test_VLof_comptype(void)
 {
     /* Struct that the VL sequences are composed of */
     typedef struct {
         unsigned u;
-        float f;
+        float    f;
     } VLcomp_t;
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   cmptype=H5I_INVALID_HID;    /* Compound datatype */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    hsize_t count;        /* Number of records in the table */
-    unsigned uu, vv;        /* Loop variables */
-    char    msg[80];        /* For error message */
-    herr_t ret;
+    hid_t    fid     = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable  = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vltype  = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t    cmptype = H5I_INVALID_HID; /* Compound datatype */
+    hvl_t    writeBuf[NRECORDS];        /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];         /* Buffer to hold read data */
+    hsize_t  count;                     /* Number of records in the table */
+    unsigned uu, vv;                    /* Loop variables */
+    char     msg[80];                   /* For error message */
+    herr_t   ret;
 
     HL_TESTING3("        with vlen of compound datatypes");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(VLcomp_t));
-        if(writeBuf[uu].p == NULL) {
+        if (writeBuf[uu].p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++) {
             ((VLcomp_t *)writeBuf[uu].p)[vv].u = uu + vv;
             ((VLcomp_t *)writeBuf[uu].p)[vv].f = (float)(uu + vv) / 3.0F;
-          } /* end for */
-    } /* end for */
+        } /* end for */
+    }     /* end for */
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create the base compound type */
     cmptype = H5Tcreate(H5T_COMPOUND, sizeof(VLcomp_t));
     if (cmptype < 0)
-    goto error;
+        goto error;
 
     /* Insert fields */
     ret = H5Tinsert(cmptype, "u", HOFFSET(VLcomp_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(cmptype, "f", HOFFSET(VLcomp_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Create a variable length type that uses the VLcomp_t as its base type */
     vltype = H5Tvlen_create(cmptype);
     if (vltype < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of compound datatype */
     ptable = H5PTcreate(fid, PT_VLEN_COMP, vltype, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release the datatypes */
     if (H5Tclose(cmptype) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vltype) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)5, writeBuf );
+    ret = H5PTappend(ptable, (size_t)5, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].len != readBuf[uu].len) {
-            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%d, readBuf[%u].len=%d\n", __LINE__, uu, (int)writeBuf[uu].len, uu, (int)readBuf[uu].len);
-        continue;
-    } /* write len != read len */
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%d, readBuf[%u].len=%d\n",
+                      __LINE__, uu, (int)writeBuf[uu].len, uu, (int)readBuf[uu].len);
+            continue;
+        } /* write len != read len */
 
         for (vv = 0; vv < (uu + 1); vv++) {
-            if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv] ) {
-                HDfprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%d]=%d, readBuf[uu].p[%d]=%d\n", vv, (int)((unsigned int *)writeBuf[uu].p)[vv], vv, (int)((unsigned int *)readBuf[uu].p)[vv]);
+            if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv]) {
+                HDfprintf(
+                    stderr, "VL data values don't match!, writeBuf[uu].p[%d]=%d, readBuf[uu].p[%d]=%d\n", vv,
+                    (int)((unsigned int *)writeBuf[uu].p)[vv], vv, (int)((unsigned int *)readBuf[uu].p)[vv]);
                 continue;
-        } /* write value != read value */
-    }
+            } /* write value != read value */
+        }
     } /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (cmptype > 0) H5Tclose(cmptype);
-    if (vltype > 0) H5Tclose(vltype);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (cmptype > 0)
+        H5Tclose(cmptype);
+    if (vltype > 0)
+        H5Tclose(vltype);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -304,47 +315,47 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_compound_VL_VLtype(void)
+static int
+test_compound_VL_VLtype(void)
 {
     /* Struct that the VL sequences are composed of */
     typedef struct {
         unsigned u;
-        float f;
-    hvl_t v;
+        float    f;
+        hvl_t    v;
     } compVLVL_t;
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   comp_vlvl=H5I_INVALID_HID;    /* ID of a compound datatype containing
-                    a VL of VL of atomic datatype */
-    hsize_t count;        /* Number of records in the table */
-    compVLVL_t writeBuf[NRECORDS];/* Buffer to hold data to be written */
-    compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
-    hvl_t   *t1, *t2;
-    unsigned uu, vv, ww;    /* Loop variables */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t fid       = H5I_INVALID_HID; /* Test file identifier */
+    hid_t ptable    = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t vlatomic  = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t vlofvl    = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t comp_vlvl = H5I_INVALID_HID; /* ID of a compound datatype containing
+                 a VL of VL of atomic datatype */
+    hsize_t    count;                  /* Number of records in the table */
+    compVLVL_t writeBuf[NRECORDS];     /* Buffer to hold data to be written */
+    compVLVL_t readBuf[NRECORDS];      /* Buffer to hold read data */
+    hvl_t *    t1, *t2;
+    unsigned   uu, vv, ww; /* Loop variables */
+    char       msg[80];    /* For error message */
+    herr_t     ret;        /* Returned status from a callee */
 
     HL_TESTING3("        with compound datatype containing vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
-        writeBuf[uu].u = uu * 10;
-        writeBuf[uu].f = (float)(uu * 20) / 3.0F;
+        writeBuf[uu].u   = uu * 10;
+        writeBuf[uu].f   = (float)(uu * 20) / 3.0F;
         writeBuf[uu].v.p = HDmalloc((uu + L1_INCM) * sizeof(hvl_t));
         if (writeBuf[uu].v.p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].v.len = uu + L1_INCM;
-        for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++)
-    {
+        for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++) {
             t1->p = HDmalloc((vv + L2_INCM) * sizeof(unsigned int));
-        if (t1->p == NULL) {
-        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-        goto error;
-        }
+            if (t1->p == NULL) {
+                HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+                goto error;
+            }
             t1->len = vv + L2_INCM;
             for (ww = 0; ww < vv + L2_INCM; ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
@@ -354,123 +365,135 @@ static int test_compound_VL_VLtype(void)
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of an atomic type */
-    vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
+    vlatomic = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vlatomic < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of the VL of atomic datatype */
-    vlofvl = H5Tvlen_create (vlatomic);
+    vlofvl = H5Tvlen_create(vlatomic);
     if (vlofvl < 0)
-    goto error;
+        goto error;
 
     /* Create the base compound type */
     comp_vlvl = H5Tcreate(H5T_COMPOUND, sizeof(compVLVL_t));
     if (comp_vlvl < 0)
-    goto error;
+        goto error;
 
     /* Insert fields: atomic, atomic, vlen */
     ret = H5Tinsert(comp_vlvl, "u", HOFFSET(compVLVL_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(comp_vlvl, "f", HOFFSET(compVLVL_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(comp_vlvl, "v", HOFFSET(compVLVL_t, v), vlofvl);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a compound datatype of vlen datatype */
     ptable = H5PTcreate(fid, PT_COMP_VLEN, comp_vlvl, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vlofvl) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(comp_vlvl) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf );
+    ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].u != readBuf[uu].u) {
-            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
+            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu,
+                      writeBuf[uu].u, uu, readBuf[uu].u);
             continue;
         } /* end if */
-        if (!H5_FLT_ABS_EQUAL(writeBuf[uu].f,readBuf[uu].f)) {
-            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
+        if (!H5_FLT_ABS_EQUAL(writeBuf[uu].f, readBuf[uu].f)) {
+            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu,
+                      (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
             continue;
         } /* end if */
 
         if (writeBuf[uu].v.len != readBuf[uu].v.len) {
-            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%d].v.len=%zu, readBuf[%d].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
+            HDfprintf(stderr,
+                      "%d: VL data length don't match!, writeBuf[%d].v.len=%zu, readBuf[%d].v.len=%zu\n",
+                      __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
             continue;
         } /* end if */
 
-        for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0; (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
+        for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0;
+             (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
             if (t1->len != t2->len) {
-                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
+                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n",
+                          __LINE__, uu, vv, t1->len, t2->len);
                 continue;
             } /* end if */
             for (ww = 0; (size_t)ww < t2->len; ww++) {
-                if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww] ) {
-                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
+                if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww]) {
+                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww,
+                              ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
                     continue;
                 } /* end if */
-            } /* end for */
-        } /* end for */
-    } /* end for */
+            }     /* end for */
+        }         /* end for */
+    }             /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vlatomic > 0) H5Tclose(vlatomic);
-    if (vlofvl > 0) H5Tclose(vlofvl);
-    if (comp_vlvl > 0) H5Tclose(comp_vlvl);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vlatomic > 0)
+        H5Tclose(vlatomic);
+    if (vlofvl > 0)
+        H5Tclose(vlofvl);
+    if (comp_vlvl > 0)
+        H5Tclose(comp_vlvl);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -485,19 +508,20 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_VLof_VLtype(void)
+static int
+test_VLof_VLtype(void)
 {
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;    /* VL datatype of VL datatypes */
-    hsize_t count;        /* Number of records in the table */
-    hvl_t   *t1;        /* pointer to advance */
-    unsigned uu, vv, ww;    /* Loop variables */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t    fid      = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable   = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vlatomic = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t    vlofvl   = H5I_INVALID_HID; /* VL datatype of VL datatypes */
+    hsize_t  count;                      /* Number of records in the table */
+    hvl_t *  t1;                         /* pointer to advance */
+    unsigned uu, vv, ww;                 /* Loop variables */
+    hvl_t    writeBuf[NRECORDS];         /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];          /* Buffer to hold read data */
+    char     msg[80];                    /* For error message */
+    herr_t   ret;                        /* Returned status from a callee */
 
     HL_TESTING3("        with vlen datatype of vlen datatype");
 
@@ -509,89 +533,92 @@ static int test_VLof_VLtype(void)
             goto error;
         } /* end if */
         writeBuf[uu].len = uu + 1;
-        for (t1=(hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++)
-    {
+        for (t1 = (hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++) {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
-        if (t1->p == NULL) {
-        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-        goto error;
-        }
+            if (t1->p == NULL) {
+                HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+                goto error;
+            }
             t1->len = vv * 1;
             for (ww = 0; ww < (vv * 1); ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of an atomic type */
-    vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
+    vlatomic = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vlatomic < 0)
-    goto error;
+        goto error;
 
-    vlofvl = H5Tvlen_create (vlatomic);
+    vlofvl = H5Tvlen_create(vlatomic);
     if (vlofvl < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of vlen datatype */
     ptable = H5PTcreate(fid, PT_VLEN_VLEN, vlofvl, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vlofvl) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)5, writeBuf );
+    ret = H5PTappend(ptable, (size_t)5, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vlatomic > 0) H5Tclose(vlatomic);
-    if (vlofvl > 0) H5Tclose(vlofvl);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vlatomic > 0)
+        H5Tclose(vlatomic);
+    if (vlofvl > 0)
+        H5Tclose(vlofvl);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -606,40 +633,41 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int verify_ptlengthtype(hid_t fid, const char *table_name, herr_t expected_value)
+static int
+verify_ptlengthtype(hid_t fid, const char *table_name, herr_t expected_value)
 {
-    hid_t   ptable = H5I_INVALID_HID;    /* Packet table identifier */
-    herr_t  is_varlen = 0;
-    herr_t  ret = FAIL;
+    hid_t  ptable    = H5I_INVALID_HID; /* Packet table identifier */
+    herr_t is_varlen = 0;
+    herr_t ret       = FAIL;
 
     /* Open the named packet table */
-    if( (ptable = H5PTopen(fid, table_name)) < 0)
-    goto error;
+    if ((ptable = H5PTopen(fid, table_name)) < 0)
+        goto error;
 
     /* Verify the value returned from H5PTis_varlen is as expected */
     is_varlen = H5PTis_varlen(ptable);
     if (is_varlen == FAIL)
-    goto error;
+        goto error;
     else if (is_varlen == expected_value)
-    ret = SUCCEED;
-    else
-    {
-    char lenthtype[20];
-    HDstrcpy(lenthtype, "fixed-length");
-    if (expected_value == 1)
-        HDstrcpy(lenthtype, "variable-length");
-    HDfprintf(stderr, "\nPacket table '%s' should be %s but is not\n", table_name, lenthtype);
-    ret = FAIL;
+        ret = SUCCEED;
+    else {
+        char lenthtype[20];
+        HDstrcpy(lenthtype, "fixed-length");
+        if (expected_value == 1)
+            HDstrcpy(lenthtype, "variable-length");
+        HDfprintf(stderr, "\nPacket table '%s' should be %s but is not\n", table_name, lenthtype);
+        ret = FAIL;
     }
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-    goto error;
+        goto error;
 
     return ret;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
     return ret;
 } /* verify_ptlengthtype */
 
@@ -655,67 +683,69 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_H5PTis_varlen(void)
+static int
+test_H5PTis_varlen(void)
 {
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t  fid    = H5I_INVALID_HID; /* Test file identifier */
+    hid_t  ptable = H5I_INVALID_HID; /* Packet table identifier */
+    herr_t ret;                      /* Returned status from a callee */
 
     HL_TESTING2("H5PTis_varlen");
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a new table */
     ptable = H5PTcreate(fid, PT_FIXED_LEN, H5T_STD_I32BE, (hsize_t)100, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Open each packet table, and verify that H5PTis_varlen returns correct
        type for each table */
     ret = verify_ptlengthtype(fid, PT_VLEN_ATOMIC, 1); /* vlen of atomic */
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_ptlengthtype(fid, PT_VLEN_COMP, 1); /* vlen of compound */
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_ptlengthtype(fid, PT_COMP_VLEN, 0); /* compound of vlen, no vlen */
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_ptlengthtype(fid, PT_VLEN_VLEN, 1); /* vlen of vlen */
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_ptlengthtype(fid, PT_FIXED_LEN, 0); /* no vlen */
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (fid > 0) H5Fclose(fid);
+    if (fid > 0)
+        H5Fclose(fid);
     H5_FAILED();
     return FAIL;
 } /* test_H5PTis_varlen */
@@ -731,60 +761,64 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-#define ATTR_RANK      1
-#define ATTR_DIM       3
-int attr_data[ATTR_DIM]={256,11945,-22107}; /* values to be written to attr */
+#define ATTR_RANK 1
+#define ATTR_DIM  3
+int attr_data[ATTR_DIM] = {256, 11945, -22107}; /* values to be written to attr */
 
-static int adding_attribute(hid_t fid, const char *table_name, const char *attr_name)
+static int
+adding_attribute(hid_t fid, const char *table_name, const char *attr_name)
 {
-    hid_t ptable = H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t space_id = H5I_INVALID_HID;    /* Dataspace for the attribute */
-    hid_t attr_id = H5I_INVALID_HID;    /* Attribute identifier */
-    hid_t dset_id = H5I_INVALID_HID;    /* Dataset identifier */
-    hsize_t dims[] = {ATTR_DIM};    /* Dimension for dataspace */
-    int ret = FAIL;        /* Returned status from a callee */
+    hid_t   ptable   = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t   space_id = H5I_INVALID_HID; /* Dataspace for the attribute */
+    hid_t   attr_id  = H5I_INVALID_HID; /* Attribute identifier */
+    hid_t   dset_id  = H5I_INVALID_HID; /* Dataset identifier */
+    hsize_t dims[]   = {ATTR_DIM};      /* Dimension for dataspace */
+    int     ret      = FAIL;            /* Returned status from a callee */
 
     /* Create dataspace for attribute */
     space_id = H5Screate_simple(ATTR_RANK, dims, NULL);
     if (space_id < 0)
-    goto error;
+        goto error;
 
     /* Open the named packet table */
-    if( (ptable = H5PTopen(fid, table_name)) < 0)
-    goto error;
+    if ((ptable = H5PTopen(fid, table_name)) < 0)
+        goto error;
 
     dset_id = H5PTget_dataset(ptable);
     if (dset_id < 0)
-    goto error;
+        goto error;
 
     /* Add the specified attribute to it */
     attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT);
     if (attr_id < 0)
-    goto error;
+        goto error;
 
     /* Write attribute values */
     ret = H5Awrite(attr_id, H5T_NATIVE_INT, attr_data);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the attribute */
     if (H5Aclose(attr_id) < 0)
-    goto error;
+        goto error;
 
     /* Close the dataspace */
     if (H5Sclose(space_id) < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-    goto error;
+        goto error;
 
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (attr_id > 0) H5Aclose(attr_id);
-    if (space_id > 0) H5Sclose(space_id);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
+    if (attr_id > 0)
+        H5Aclose(attr_id);
+    if (space_id > 0)
+        H5Sclose(space_id);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
     return ret;
 } /* adding_attribute */
 
@@ -795,53 +829,57 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static herr_t verify_attribute(hid_t fid, const char *table_name, const char *attr_name)
+static herr_t
+verify_attribute(hid_t fid, const char *table_name, const char *attr_name)
 {
-    hid_t ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t attr_id=H5I_INVALID_HID;    /* Attribute identifier */
-    hid_t dset_id=H5I_INVALID_HID;    /* Dataset associated with the pt */
-    int read_data[ATTR_DIM];        /* Output buffer */
-    int ii;
-    herr_t ret = FAIL;        /* Returned status from a callee */
+    hid_t  ptable  = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t  attr_id = H5I_INVALID_HID; /* Attribute identifier */
+    hid_t  dset_id = H5I_INVALID_HID; /* Dataset associated with the pt */
+    int    read_data[ATTR_DIM];       /* Output buffer */
+    int    ii;
+    herr_t ret = FAIL; /* Returned status from a callee */
 
     /* Open the named packet table */
     ptable = H5PTopen(fid, table_name);
     if (ptable < 0)
-    goto error;
+        goto error;
 
     /* Get the dataset id of this packet table */
     dset_id = H5PTget_dataset(ptable);
     if (dset_id < 0)
-    goto error;
+        goto error;
 
     /* Open first attribute for the dataset */
     attr_id = H5Aopen(dset_id, attr_name, H5P_DEFAULT);
     if (attr_id < 0)
-    goto error;
+        goto error;
 
     /* Read attribute values */
     ret = H5Aread(attr_id, H5T_NATIVE_INT, read_data);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Verify values read in */
     for (ii = 0; ii < ATTR_DIM; ii++)
         if (attr_data[ii] != read_data[ii])
-            TestErrPrintf("%d: attribute data different: attr_data[%d]=%d, read_data[%d]=%d\n", __LINE__, ii, attr_data[ii], ii, read_data[ii]);
+            TestErrPrintf("%d: attribute data different: attr_data[%d]=%d, read_data[%d]=%d\n", __LINE__, ii,
+                          attr_data[ii], ii, read_data[ii]);
 
     /* Close the attribute */
     if (H5Aclose(attr_id) < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-    goto error;
+        goto error;
 
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (attr_id > 0) H5Aclose(attr_id);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
+    if (attr_id > 0)
+        H5Aclose(attr_id);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
     return ret;
 } /* verify_attribute */
 
@@ -854,59 +892,61 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_attributes(void)
+static int
+test_attributes(void)
 {
-    hid_t fid=H5I_INVALID_HID;        /* File identifier */
-    hid_t attr_id=H5I_INVALID_HID;    /* Attribute identifier */
-    herr_t ret = FAIL;        /* Returned status from a callee */
+    hid_t  fid     = H5I_INVALID_HID; /* File identifier */
+    hid_t  attr_id = H5I_INVALID_HID; /* Attribute identifier */
+    herr_t ret     = FAIL;            /* Returned status from a callee */
 
     HL_TESTING2("adding attributes to packet tables");
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Add an arbitrary attribute to a few packet tables, using helper func */
     attr_id = adding_attribute(fid, PT_VLEN_ATOMIC, "Attribute 1");
     if (attr_id < 0)
-    goto error;
+        goto error;
     attr_id = adding_attribute(fid, PT_VLEN_COMP, "Attribute 2");
     if (attr_id < 0)
-    goto error;
+        goto error;
     attr_id = adding_attribute(fid, PT_COMP_VLEN, "Attribute 3");
     if (attr_id < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     /* Open the file again */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Read each attribute and verify the values, using helper function */
     ret = verify_attribute(fid, PT_VLEN_ATOMIC, "Attribute 1");
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_attribute(fid, PT_VLEN_COMP, "Attribute 2");
     if (ret < 0)
-    goto error;
+        goto error;
     ret = verify_attribute(fid, PT_COMP_VLEN, "Attribute 3");
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
-    return(ret);
+    return (ret);
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (fid > 0) H5Fclose(fid);
+    if (fid > 0)
+        H5Fclose(fid);
     H5_FAILED();
     return FAIL;
 } /* test_attributes */
@@ -928,35 +968,36 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static herr_t verify_accessors(hid_t fid, const char *table_name, hbool_t uses_vlen_type)
+static herr_t
+verify_accessors(hid_t fid, const char *table_name, hbool_t uses_vlen_type)
 {
-    hid_t ptable = H5I_INVALID_HID;     /* Packet table identifier */
-    hid_t dset_id = H5I_INVALID_HID;    /* Dataset associated with the pt */
-    hid_t dtype_id = H5I_INVALID_HID;   /* Dataset identifier */
-    char buf[NAME_BUF_SIZE];
+    hid_t   ptable   = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t   dset_id  = H5I_INVALID_HID; /* Dataset associated with the pt */
+    hid_t   dtype_id = H5I_INVALID_HID; /* Dataset identifier */
+    char    buf[NAME_BUF_SIZE];
     ssize_t name_size;
-    htri_t vlen_check_result = -1;
+    htri_t  vlen_check_result = -1;
 
     /* Open the named packet table. */
-    if((ptable = H5PTopen(fid, table_name)) < 0)
+    if ((ptable = H5PTopen(fid, table_name)) < 0)
         goto error;
 
     /* Get the associated dataset ID. */
-    if((dset_id = H5PTget_dataset(ptable)) < 0)
+    if ((dset_id = H5PTget_dataset(ptable)) < 0)
         goto error;
 
     /* Check if the packet table's name matches its associated dataset's. */
     *buf = '\0';
-    if((name_size = H5Iget_name(dset_id, (char*)buf, NAME_BUF_SIZE)) < 0)
+    if ((name_size = H5Iget_name(dset_id, (char *)buf, NAME_BUF_SIZE)) < 0)
         goto error;
     VERIFY(HDstrcmp(buf, table_name), "Names of dataset and packet table don't match");
 
     /* Get the packet table's datatype ID */
-    if((dtype_id = H5PTget_type(ptable)) < 0)
+    if ((dtype_id = H5PTget_type(ptable)) < 0)
         goto error;
 
     /* Check if the type class matches that of the packet table. */
-    if((vlen_check_result = H5Tdetect_class(dtype_id, H5T_VLEN)) < 0)
+    if ((vlen_check_result = H5Tdetect_class(dtype_id, H5T_VLEN)) < 0)
         goto error;
 
     /* Check if length types match */
@@ -996,10 +1037,11 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int test_accessors(void)
+static int
+test_accessors(void)
 {
-    hid_t fid=H5I_INVALID_HID;        /* File identifier */
-    herr_t ret = FAIL;        /* Returned status from a callee */
+    hid_t  fid = H5I_INVALID_HID; /* File identifier */
+    herr_t ret = FAIL;            /* Returned status from a callee */
 
     HL_TESTING2("accessor functions");
 
@@ -1044,17 +1086,18 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int testfl_VLof_atomic(void)
+static int
+testfl_VLof_atomic(void)
 {
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
-    hsize_t count;        /* Number of records in the table */
-    unsigned uu, vv;        /* Loop variables */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t    fid    = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vltype = H5I_INVALID_HID; /* Variable length datatype */
+    hsize_t  count;                    /* Number of records in the table */
+    unsigned uu, vv;                   /* Loop variables */
+    hvl_t    writeBuf[NRECORDS];       /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];        /* Buffer to hold read data */
+    char     msg[80];                  /* For error message */
+    herr_t   ret;                      /* Returned status from a callee */
 
     HL_TESTING3("        with vlen of atomic");
 
@@ -1064,84 +1107,86 @@ static int testfl_VLof_atomic(void)
         if (writeBuf[uu].p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++)
-        ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
+            ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
     } /* end for */
 
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a vlen type that uses an atomic datatype as its base type */
-    vltype = H5Tvlen_create (H5T_NATIVE_UINT);
+    vltype = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vltype < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of an atomic type */
     ptable = H5PTcreate_fl(fid, PT_VLEN_ATOMIC, vltype, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Close the vlen datatype */
     if (H5Tclose(vltype) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     for (uu = 0; uu < NRECORDS; uu++)
-        for (vv = 0; vv < (uu + 1); vv++)
-        {
-        if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
-        HDprintf("Packet %d's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
-        HDprintf("Packet %d's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
-        }
+        for (vv = 0; vv < (uu + 1); vv++) {
+            if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
+                HDprintf("Packet %d's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
+                HDprintf("Packet %d's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
+            }
         }
 
     /* Free the buffers */
-    ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf );
+    ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vltype > 0) H5Tclose(vltype);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vltype > 0)
+        H5Tclose(vltype);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -1155,134 +1200,142 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int testfl_VLof_comptype(void)
+static int
+testfl_VLof_comptype(void)
 {
     /* Struct that the VL sequences are composed of */
     typedef struct {
         unsigned u;
-        float f;
+        float    f;
     } VLcomp_t;
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   cmptype=H5I_INVALID_HID;    /* Compound datatype */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    hsize_t count;        /* Number of records in the table */
-    unsigned uu, vv;        /* Loop variables */
-    char    msg[80];        /* For error message */
-    herr_t ret;
+    hid_t    fid     = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable  = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vltype  = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t    cmptype = H5I_INVALID_HID; /* Compound datatype */
+    hvl_t    writeBuf[NRECORDS];        /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];         /* Buffer to hold read data */
+    hsize_t  count;                     /* Number of records in the table */
+    unsigned uu, vv;                    /* Loop variables */
+    char     msg[80];                   /* For error message */
+    herr_t   ret;
 
     HL_TESTING3("        with vlen of compound datatypes");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(VLcomp_t));
-        if(writeBuf[uu].p == NULL) {
+        if (writeBuf[uu].p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++) {
             ((VLcomp_t *)writeBuf[uu].p)[vv].u = uu + vv;
             ((VLcomp_t *)writeBuf[uu].p)[vv].f = (float)(uu + vv) / 3.0F;
-          } /* end for */
-    } /* end for */
+        } /* end for */
+    }     /* end for */
 
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create the base compound type */
     cmptype = H5Tcreate(H5T_COMPOUND, sizeof(VLcomp_t));
     if (cmptype < 0)
-    goto error;
+        goto error;
 
     /* Insert fields */
     ret = H5Tinsert(cmptype, "u", HOFFSET(VLcomp_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(cmptype, "f", HOFFSET(VLcomp_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Create a variable length type that uses the VLcomp_t as its base type */
     vltype = H5Tvlen_create(cmptype);
     if (vltype < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of compound datatype */
     ptable = H5PTcreate_fl(fid, PT_VLEN_COMP, vltype, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release the datatypes */
     if (H5Tclose(cmptype) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vltype) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)5, writeBuf );
+    ret = H5PTappend(ptable, (size_t)5, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].len != readBuf[uu].len) {
-            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%zu, readBuf[%u].len=%zu\n",__LINE__, uu, writeBuf[uu].len, uu, readBuf[uu].len);
-        continue;
-    } /* write len != read len */
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%zu, readBuf[%u].len=%zu\n",
+                      __LINE__, uu, writeBuf[uu].len, uu, readBuf[uu].len);
+            continue;
+        } /* write len != read len */
 
         for (vv = 0; vv < (uu + 1); vv++) {
-            if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv] ) {
-                HDfprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%u]=%u, readBuf[uu].p[%u]=%u\n", vv, ((unsigned int *)writeBuf[uu].p)[vv], vv, ((unsigned int *)readBuf[uu].p)[vv]);
+            if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv]) {
+                HDfprintf(stderr,
+                          "VL data values don't match!, writeBuf[uu].p[%u]=%u, readBuf[uu].p[%u]=%u\n", vv,
+                          ((unsigned int *)writeBuf[uu].p)[vv], vv, ((unsigned int *)readBuf[uu].p)[vv]);
                 continue;
-        } /* write value != read value */
-    }
+            } /* write value != read value */
+        }
     } /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (cmptype > 0) H5Tclose(cmptype);
-    if (vltype > 0) H5Tclose(vltype);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (cmptype > 0)
+        H5Tclose(cmptype);
+    if (vltype > 0)
+        H5Tclose(vltype);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -1297,173 +1350,185 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int testfl_compound_VL_VLtype(void)
+static int
+testfl_compound_VL_VLtype(void)
 {
     /* Struct that the VL sequences are composed of */
     typedef struct {
         unsigned u;
-        float f;
-    hvl_t v;
+        float    f;
+        hvl_t    v;
     } compVLVL_t;
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   comp_vlvl=H5I_INVALID_HID;    /* ID of a compound datatype containing
-                    a VL of VL of atomic datatype */
-    hsize_t count;        /* Number of records in the table */
-    compVLVL_t writeBuf[NRECORDS];/* Buffer to hold data to be written */
-    compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
-    hvl_t   *t1, *t2;
-    unsigned uu, vv, ww;    /* Loop variables */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t fid       = H5I_INVALID_HID; /* Test file identifier */
+    hid_t ptable    = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t vlatomic  = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t vlofvl    = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t comp_vlvl = H5I_INVALID_HID; /* ID of a compound datatype containing
+                 a VL of VL of atomic datatype */
+    hsize_t    count;                  /* Number of records in the table */
+    compVLVL_t writeBuf[NRECORDS];     /* Buffer to hold data to be written */
+    compVLVL_t readBuf[NRECORDS];      /* Buffer to hold read data */
+    hvl_t *    t1, *t2;
+    unsigned   uu, vv, ww; /* Loop variables */
+    char       msg[80];    /* For error message */
+    herr_t     ret;        /* Returned status from a callee */
 
     HL_TESTING3("        with compound datatype containing vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
-        writeBuf[uu].u = uu * 10;
-        writeBuf[uu].f = (float)(uu * 20) / 3.0F;
+        writeBuf[uu].u   = uu * 10;
+        writeBuf[uu].f   = (float)(uu * 20) / 3.0F;
         writeBuf[uu].v.p = HDmalloc((uu + L1_INCM) * sizeof(hvl_t));
         if (writeBuf[uu].v.p == NULL) {
             HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-    }
+        }
         writeBuf[uu].v.len = uu + L1_INCM;
-        for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++)
-    {
+        for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++) {
             t1->p = HDmalloc((vv + L2_INCM) * sizeof(unsigned int));
-        if (t1->p == NULL) {
-        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-        goto error;
-        }
+            if (t1->p == NULL) {
+                HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+                goto error;
+            }
             t1->len = vv + L2_INCM;
             for (ww = 0; ww < vv + L2_INCM; ww++)
-                ((unsigned int*)t1->p)[ww] = uu * 100 + vv * 10 + ww;
+                ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
         }
     } /* end for */
 
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of an atomic type */
-    vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
+    vlatomic = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vlatomic < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of the VL of atomic datatype */
-    vlofvl = H5Tvlen_create (vlatomic);
+    vlofvl = H5Tvlen_create(vlatomic);
     if (vlofvl < 0)
-    goto error;
+        goto error;
 
     /* Create the base compound type */
     comp_vlvl = H5Tcreate(H5T_COMPOUND, sizeof(compVLVL_t));
     if (comp_vlvl < 0)
-    goto error;
+        goto error;
 
     /* Insert fields: atomic, atomic, vlen */
     ret = H5Tinsert(comp_vlvl, "u", HOFFSET(compVLVL_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(comp_vlvl, "f", HOFFSET(compVLVL_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5Tinsert(comp_vlvl, "v", HOFFSET(compVLVL_t, v), vlofvl);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a compound datatype of vlen datatype */
     ptable = H5PTcreate_fl(fid, PT_COMP_VLEN, comp_vlvl, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vlofvl) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(comp_vlvl) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf );
+    ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].u != readBuf[uu].u) {
-            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
+            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu,
+                      writeBuf[uu].u, uu, readBuf[uu].u);
             continue;
         } /* end if */
         if (!H5_FLT_ABS_EQUAL(writeBuf[uu].f, readBuf[uu].f)) {
-            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
+            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu,
+                      (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
             continue;
         } /* end if */
 
         if (writeBuf[uu].v.len != readBuf[uu].v.len) {
-            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].v.len=%zu, readBuf[%u].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
+            HDfprintf(stderr,
+                      "%d: VL data length don't match!, writeBuf[%u].v.len=%zu, readBuf[%u].v.len=%zu\n",
+                      __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
             continue;
         } /* end if */
 
-        for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0; (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
+        for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0;
+             (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
             if (t1->len != t2->len) {
-                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
+                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n",
+                          __LINE__, uu, vv, t1->len, t2->len);
                 continue;
             } /* end if */
             for (ww = 0; (size_t)ww < t2->len; ww++) {
-                if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww] ) {
-                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
+                if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww]) {
+                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww,
+                              ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
                     continue;
                 } /* end if */
-            } /* end for */
-        } /* end for */
-    } /* end for */
+            }     /* end for */
+        }         /* end for */
+    }             /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vlatomic > 0) H5Tclose(vlatomic);
-    if (vlofvl > 0) H5Tclose(vlofvl);
-    if (comp_vlvl > 0) H5Tclose(comp_vlvl);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vlatomic > 0)
+        H5Tclose(vlatomic);
+    if (vlofvl > 0)
+        H5Tclose(vlofvl);
+    if (comp_vlvl > 0)
+        H5Tclose(comp_vlvl);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -1478,19 +1543,20 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-static int testfl_VLof_VLtype(void)
+static int
+testfl_VLof_VLtype(void)
 {
-    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;    /* VL datatype of VL datatypes */
-    hsize_t count;        /* Number of records in the table */
-    hvl_t   *t1;        /* pointer to advance */
-    unsigned uu, vv, ww;    /* Loop variables */
-    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
-    char    msg[80];        /* For error message */
-    herr_t  ret;        /* Returned status from a callee */
+    hid_t    fid      = H5I_INVALID_HID; /* Test file identifier */
+    hid_t    ptable   = H5I_INVALID_HID; /* Packet table identifier */
+    hid_t    vlatomic = H5I_INVALID_HID; /* Variable length datatype */
+    hid_t    vlofvl   = H5I_INVALID_HID; /* VL datatype of VL datatypes */
+    hsize_t  count;                      /* Number of records in the table */
+    hvl_t *  t1;                         /* pointer to advance */
+    unsigned uu, vv, ww;                 /* Loop variables */
+    hvl_t    writeBuf[NRECORDS];         /* Buffer to hold data to be written */
+    hvl_t    readBuf[NRECORDS];          /* Buffer to hold read data */
+    char     msg[80];                    /* For error message */
+    herr_t   ret;                        /* Returned status from a callee */
 
     HL_TESTING3("        with vlen datatype of vlen datatype");
 
@@ -1502,89 +1568,92 @@ static int testfl_VLof_VLtype(void)
             goto error;
         } /* end if */
         writeBuf[uu].len = uu + 1;
-        for (t1 = (hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++)
-    {
+        for (t1 = (hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++) {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
-        if (t1->p == NULL) {
-        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-        goto error;
-        }
+            if (t1->p == NULL) {
+                HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+                goto error;
+            }
             t1->len = vv + 1;
             for (ww = 0; ww < (vv + 1); ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-    goto error;
+        goto error;
 
     /* Create a VL datatype of an atomic type */
-    vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
+    vlatomic = H5Tvlen_create(H5T_NATIVE_UINT);
     if (vlatomic < 0)
-    goto error;
+        goto error;
 
-    vlofvl = H5Tvlen_create (vlatomic);
+    vlofvl = H5Tvlen_create(vlatomic);
     if (vlofvl < 0)
-    goto error;
+        goto error;
 
     /* Create a packet table that uses a vlen datatype of vlen datatype */
     ptable = H5PTcreate_fl(fid, PT_VLEN_VLEN, vlofvl, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-    goto error;
+        goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-    goto error;
+        goto error;
     if (H5Tclose(vlofvl) < 0)
-    goto error;
+        goto error;
 
     /* Write the entire buffer to the packet table */
-    ret = H5PTappend(ptable, (size_t)5, writeBuf );
+    ret = H5PTappend(ptable, (size_t)5, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-    goto error;
+        goto error;
 
     HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
-    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
+    ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void *)readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-    goto error;
+        goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-    goto error;
+        goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-    goto error;
+        goto error;
 
     PASSED();
     return SUCCEED;
 
 error: /* An error has occurred.  Clean up and exit. */
-    if (vlatomic > 0) H5Tclose(vlatomic);
-    if (vlofvl > 0) H5Tclose(vlofvl);
-    if (H5PTis_valid(ptable) > 0) H5PTclose(ptable);
-    if (fid > 0) H5Fclose(fid);
+    if (vlatomic > 0)
+        H5Tclose(vlatomic);
+    if (vlofvl > 0)
+        H5Tclose(vlofvl);
+    if (H5PTis_valid(ptable) > 0)
+        H5PTclose(ptable);
+    if (fid > 0)
+        H5Fclose(fid);
     H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     H5_FAILED();
@@ -1599,19 +1668,20 @@ error: /* An error has occurred.  Clean up and exit. */
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
-int test_packet_table_with_varlen(void)
+int
+test_packet_table_with_varlen(void)
 {
-    hid_t fid=H5I_INVALID_HID;        /* File identifier */
-    int status = SUCCEED;
+    hid_t fid    = H5I_INVALID_HID; /* File identifier */
+    int   status = SUCCEED;
 
     /* Create a file using default properties */
     fid = H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
-    return FAIL;
+        return FAIL;
 
     /* Close the file.  The file will be opened by each test function below */
     if (H5Fclose(fid) < 0)
-    return FAIL;
+        return FAIL;
 
     HDputs("Testing packet table with various variable-length datatypes");
 
@@ -1620,46 +1690,46 @@ int test_packet_table_with_varlen(void)
 
     /* Test variable length of a simple type */
     if (test_VLof_atomic() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test variable length of a compound type */
     if (test_VLof_comptype() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test compound type with variable length */
     if (test_compound_VL_VLtype() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test variable length of a variable length */
     if (test_VLof_VLtype() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test variable length of a variable length */
     if (test_H5PTis_varlen() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test adding attributes to packet table */
     if (test_attributes() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test accessor functions */
     if (test_accessors() < 0)
-    status = FAIL;
+        status = FAIL;
 
-/**************************************************************************
-    Calling test functions for deprecated function H5PTcreate_fl
-    Mar 2016, -BMR
+    /**************************************************************************
+        Calling test functions for deprecated function H5PTcreate_fl
+        Mar 2016, -BMR
 
-**************************************************************************/
+    **************************************************************************/
 
     /* Create a file using default properties */
     fid = H5Fcreate(TESTFL_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
-    return FAIL;
+        return FAIL;
 
     /* Close the file.  The file will be opened by each test function below */
     if (H5Fclose(fid) < 0)
-    return FAIL;
+        return FAIL;
 
     HDputs("Testing packet table with various variable-length datatypes - H5PTcreate_fl");
 
@@ -1668,19 +1738,19 @@ int test_packet_table_with_varlen(void)
 
     /* Test variable length of a simple type */
     if (testfl_VLof_atomic() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test variable length of a compound type */
     if (testfl_VLof_comptype() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test compound type with variable length */
     if (testfl_compound_VL_VLtype() < 0)
-    status = FAIL;
+        status = FAIL;
 
     /* Test variable length of a variable length */
     if (testfl_VLof_VLtype() < 0)
-    status = FAIL;
+        status = FAIL;
 
-    return(status);
+    return (status);
 }
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 1d6bcec..3f953d4 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
 #include <string.h>
@@ -17,46 +17,44 @@
 #include "H5srcdir.h"
 #include "H5TBpublic.h"
 
-#define TEST_FILE_BE "test_table_be.h5"
-#define TEST_FILE_LE "test_table_le.h5"
+#define TEST_FILE_BE   "test_table_be.h5"
+#define TEST_FILE_LE   "test_table_le.h5"
 #define TEST_FILE_CRAY "test_table_cray.h5"
 
-
 /*-------------------------------------------------------------------------
-* Table API test
-*
-* Functions tested:
-*
-* H5TBmake_table
-* H5TBread_table
-* H5TBwrite_records
-* H5TBread_records
-* H5TBappend_records
-* H5TBinsert_record
-* H5TBdelete_record
-* H5TBcombine_tables
-* H5TBwrite_fields_name
-* H5TBread_fields_name
-* H5TBwrite_fields_index
-* H5TBinsert_field
-* H5TBdelete_field
-* H5TBget_table_info
-* H5TBget_field_info
-*
-*-------------------------------------------------------------------------
-*/
-
-#define TITLE           "Title"
-#define NFIELDS          5
-#define NRECORDS         8
-#define NRECORDS_ADD     3
+ * Table API test
+ *
+ * Functions tested:
+ *
+ * H5TBmake_table
+ * H5TBread_table
+ * H5TBwrite_records
+ * H5TBread_records
+ * H5TBappend_records
+ * H5TBinsert_record
+ * H5TBdelete_record
+ * H5TBcombine_tables
+ * H5TBwrite_fields_name
+ * H5TBread_fields_name
+ * H5TBwrite_fields_index
+ * H5TBinsert_field
+ * H5TBdelete_field
+ * H5TBget_table_info
+ * H5TBget_field_info
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#define TITLE        "Title"
+#define NFIELDS      5
+#define NRECORDS     8
+#define NRECORDS_ADD 3
 
 /*-------------------------------------------------------------------------
-* structure used for all tests, a particle with properties
-*-------------------------------------------------------------------------
-*/
-typedef struct particle_t
-{
+ * structure used for all tests, a particle with properties
+ *-------------------------------------------------------------------------
+ */
+typedef struct particle_t {
     char   name[16];
     long   longi;
     float  pressure;
@@ -65,31 +63,28 @@ typedef struct particle_t
 } particle_t;
 
 /*-------------------------------------------------------------------------
-* a subset of particle_t, with latitude and longitude fields
-*-------------------------------------------------------------------------
-*/
-typedef struct position_t
-{
-    long   longi;
-    int    lati;
+ * a subset of particle_t, with latitude and longitude fields
+ *-------------------------------------------------------------------------
+ */
+typedef struct position_t {
+    long longi;
+    int  lati;
 } position_t;
 
 /*-------------------------------------------------------------------------
-* a subset of particle_t, with name and pressure fields
-*-------------------------------------------------------------------------
-*/
-typedef struct namepressure_t
-{
-    char   name[16];
-    float  pressure;
+ * a subset of particle_t, with name and pressure fields
+ *-------------------------------------------------------------------------
+ */
+typedef struct namepressure_t {
+    char  name[16];
+    float pressure;
 } namepressure_t;
 
 /*-------------------------------------------------------------------------
-* an extended particle, used in the insert field test
-*-------------------------------------------------------------------------
-*/
-typedef struct particle2_t
-{
+ * an extended particle, used in the insert field test
+ *-------------------------------------------------------------------------
+ */
+typedef struct particle2_t {
     char   name[16];
     long   longi;
     float  pressure;
@@ -99,11 +94,10 @@ typedef struct particle2_t
 } particle2_t;
 
 /*-------------------------------------------------------------------------
-* a particle with one field less, used in the delete field test
-*-------------------------------------------------------------------------
-*/
-typedef struct particle3_t
-{
+ * a particle with one field less, used in the delete field test
+ *-------------------------------------------------------------------------
+ */
+typedef struct particle3_t {
     char   name[16];
     long   longi;
     double temperature;
@@ -118,35 +112,34 @@ typedef struct particle3_t
 /*  Push current alignment rule forcing 4-byte alignment boundary
  *  to the internal stack ...
  */
-#pragma pack(push,4)
-    typedef struct particle4_t {
-        uint32_t   state;
-        double     posx;
-        double     posy;
-        float      atx[3];
-        float      aty[3];
-        float      rro[2];
-    } particle4_t;
+#pragma pack(push, 4)
+typedef struct particle4_t {
+    uint32_t state;
+    double   posx;
+    double   posy;
+    float    atx[3];
+    float    aty[3];
+    float    rro[2];
+} particle4_t;
 /*
  * ... and restore original alignment rules from stack
  */
 #pragma pack(pop)
 
-
 /*-------------------------------------------------------------------------
-* function to open an HDF5 file and return its file identifier
-*-------------------------------------------------------------------------
-*/
-static hid_t h5file_open(const char *fname, unsigned flags)
+ * function to open an HDF5 file and return its file identifier
+ *-------------------------------------------------------------------------
+ */
+static hid_t
+h5file_open(const char *fname, unsigned flags)
 {
 
-    hid_t fid;                        /* identifier for the file */
+    hid_t       fid; /* identifier for the file */
     const char *data_file = H5_get_srcdir_filename(fname);
 
     /* open */
-    if ((fid = H5Fopen(data_file,flags,H5P_DEFAULT))<0)
-    {
-        HDfprintf(stderr,"Error: Cannot open file <%s>\n",data_file );
+    if ((fid = H5Fopen(data_file, flags, H5P_DEFAULT)) < 0) {
+        HDfprintf(stderr, "Error: Cannot open file <%s>\n", data_file);
         HDexit(1);
     }
 
@@ -154,74 +147,68 @@ static hid_t h5file_open(const char *fname, unsigned flags)
 }
 
 /*-------------------------------------------------------------------------
-* function that compares one particle
-*-------------------------------------------------------------------------
-*/
-static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
+ * function that compares one particle
+ *-------------------------------------------------------------------------
+ */
+static int
+cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf)
 {
-    if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
-        rbuf[i].lati != wbuf[j].lati ||
-        rbuf[i].longi != wbuf[j].longi ||
-    !H5_FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure)  ||
-    !H5_DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) )
-    {
-        HDfprintf(stderr,"read and write buffers have differences\n");
-        HDfprintf(stderr,"%s %ld %f %f %d\n",
-        rbuf[i].name,rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
-        HDfprintf(stderr,"%s %ld %f %f %d\n",
-        wbuf[j].name,wbuf[j].longi,(double)wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
+    if ((HDstrcmp(rbuf[i].name, wbuf[j].name) != 0) || rbuf[i].lati != wbuf[j].lati ||
+        rbuf[i].longi != wbuf[j].longi || !H5_FLT_ABS_EQUAL(rbuf[i].pressure, wbuf[j].pressure) ||
+        !H5_DBL_ABS_EQUAL(rbuf[i].temperature, wbuf[j].temperature)) {
+        HDfprintf(stderr, "read and write buffers have differences\n");
+        HDfprintf(stderr, "%s %ld %f %f %d\n", rbuf[i].name, rbuf[i].longi, (double)rbuf[i].pressure,
+                  rbuf[i].temperature, rbuf[i].lati);
+        HDfprintf(stderr, "%s %ld %f %f %d\n", wbuf[j].name, wbuf[j].longi, (double)wbuf[j].pressure,
+                  wbuf[j].temperature, wbuf[j].lati);
         return -1;
     }
     return 0;
 }
 
 /*-------------------------------------------------------------------------
-* function to compare deleted records
-*-------------------------------------------------------------------------
-*/
-static int compare_deleted(hsize_t rrecords, hsize_t dstart, hsize_t drecords,
-                           particle_t *rbuf, particle_t *wbuf)
+ * function to compare deleted records
+ *-------------------------------------------------------------------------
+ */
+static int
+compare_deleted(hsize_t rrecords, hsize_t dstart, hsize_t drecords, particle_t *rbuf, particle_t *wbuf)
 {
-    hsize_t i,j;
-    for( i=0; i<rrecords; i++)
-    {
-        if (i<dstart)
-        {
-            if (cmp_par(i,i,rbuf,wbuf)<0)
+    hsize_t i, j;
+    for (i = 0; i < rrecords; i++) {
+        if (i < dstart) {
+            if (cmp_par(i, i, rbuf, wbuf) < 0)
                 return -1;
         }
-        else
-        {
-            j=i+drecords;
-            if (cmp_par(i,j,rbuf,wbuf)<0)
+        else {
+            j = i + drecords;
+            if (cmp_par(i, j, rbuf, wbuf) < 0)
                 return -1;
         }
     }
     return 0;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* the test program
-*-------------------------------------------------------------------------
-*/
+ * the test program
+ *-------------------------------------------------------------------------
+ */
 
-static int test_table(hid_t fid, int do_write)
+static int
+test_table(hid_t fid, int do_write)
 {
-    hid_t       fid1;
-    hid_t       fid2;
-    hsize_t     chunk_size=10;
-    int         compress=0;
-    int         *fill=NULL;
-    particle_t  fill1[1] = { {"no data",-1, -99.0f, -99.0f, -1} };
-    int         fill1_new[1] = { -100 };
-    hsize_t     position;
-    char        tname[20];
-    hsize_t     i, j;
+    hid_t      fid1;
+    hid_t      fid2;
+    hsize_t    chunk_size   = 10;
+    int        compress     = 0;
+    int *      fill         = NULL;
+    particle_t fill1[1]     = {{"no data", -1, -99.0f, -99.0f, -1}};
+    int        fill1_new[1] = {-100};
+    hsize_t    position;
+    char       tname[20];
+    hsize_t    i, j;
     /* write, read, append, delete, insert some records and fields */
-    hsize_t FIELDS   = NFIELDS;
-    hsize_t RECORDS  = NRECORDS;
+    hsize_t FIELDS  = NFIELDS;
+    hsize_t RECORDS = NRECORDS;
     hsize_t start;
     hsize_t wstart;
     hsize_t rstart;
@@ -235,210 +222,157 @@ static int test_table(hid_t fid, int do_write)
     hsize_t drecords;
     hsize_t nfields;
     hsize_t rfields;
-    hsize_t start1;      /* record to start reading from 1st table */
-    hsize_t start2;      /* record to start writing in 2nd table */
+    hsize_t start1; /* record to start reading from 1st table */
+    hsize_t start2; /* record to start writing in 2nd table */
     /* read, write, insert, append buffers */
-    particle_t  rbuf[NRECORDS+4];
+    particle_t  rbuf[NRECORDS + 4];
     particle2_t rbuf2[NRECORDS];
     particle3_t rbuf3[NRECORDS];
-    particle_t  rbufc[NRECORDS*2];
-    particle_t  abuf[2]={{"eight",80,8.0f,80.0f,80},{"nine",90,9.0f,90.0f,90}};
-    particle_t  ibuf[2]={{"zero", 0, 0.0f, 0.0f, 0},{"zero", 0, 0.0f, 0.0f, 0}};
+    particle_t  rbufc[NRECORDS * 2];
+    particle_t  abuf[2] = {{"eight", 80, 8.0f, 80.0f, 80}, {"nine", 90, 9.0f, 90.0f, 90}};
+    particle_t  ibuf[2] = {{"zero", 0, 0.0f, 0.0f, 0}, {"zero", 0, 0.0f, 0.0f, 0}};
     particle_t  wbufd[NRECORDS];
-    particle_t  wbuf[NRECORDS] = {
-        {"zero", 0, 0.0f, 0.0f, 0,},
-        {"one",  10, 1.0f, 10.0f, 10},
-        {"two",  20, 2.0f, 20.0f, 20},
-        {"three",30, 3.0f, 30.0f, 30},
-        {"four", 40, 4.0f, 40.0f, 40},
-        {"five", 50, 5.0f, 50.0f, 50},
-        {"six",  60, 6.0f, 60.0f, 60},
-        {"seven",70, 7.0f, 70.0f, 70}
-    };
+    particle_t  wbuf[NRECORDS] = {{
+                                     "zero",
+                                     0,
+                                     0.0f,
+                                     0.0f,
+                                     0,
+                                 },
+                                 {"one", 10, 1.0f, 10.0f, 10},
+                                 {"two", 20, 2.0f, 20.0f, 20},
+                                 {"three", 30, 3.0f, 30.0f, 30},
+                                 {"four", 40, 4.0f, 40.0f, 40},
+                                 {"five", 50, 5.0f, 50.0f, 50},
+                                 {"six", 60, 6.0f, 60.0f, 60},
+                                 {"seven", 70, 7.0f, 70.0f, 70}};
     /* buffers for the field "Pressure" and "New_field" */
-    float           pressure_in [NRECORDS] = { 0.0f,1.0f,2.0f,3.0f,4.0f,5.0f,6.0f,7.0f };
-    float           pressure_out [NRECORDS];
-    int             buf_new[NRECORDS] = { 0,1,2,3,4,5,6,7 };
+    float pressure_in[NRECORDS] = {0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f};
+    float pressure_out[NRECORDS];
+    int   buf_new[NRECORDS] = {0, 1, 2, 3, 4, 5, 6, 7};
     /* buffers for the fields "Latitude,Longitude"  */
-    position_t      position_out[NRECORDS_ADD];
-    position_t      position_in[NRECORDS_ADD] = { {0,0},
-    {10,10},
-    {20,20}};
+    position_t position_out[NRECORDS_ADD];
+    position_t position_in[NRECORDS_ADD] = {{0, 0}, {10, 10}, {20, 20}};
     /* buffers for the fields "Name,Pressure"  */
-    namepressure_t   namepre_out[NRECORDS];
-    namepressure_t   namepre_in[NRECORDS] =
-    { {"zero",0.0f},
-    {"one",   1.0f},
-    {"two",   2.0f},
-    {"three", 3.0f},
-    {"four",  4.0f},
-    {"five",  5.0f},
-    {"six",   6.0f},
-    {"seven", 7.0f},
+    namepressure_t namepre_out[NRECORDS];
+    namepressure_t namepre_in[NRECORDS] = {
+        {"zero", 0.0f}, {"one", 1.0f},  {"two", 2.0f}, {"three", 3.0f},
+        {"four", 4.0f}, {"five", 5.0f}, {"six", 6.0f}, {"seven", 7.0f},
     };
 
-
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * field offsets and sizes used in the fields functions
-    *-------------------------------------------------------------------------
-    */
-
-    size_t field_offset_pos[2]=
-    {
-        HOFFSET( position_t, longi ),
-        HOFFSET( position_t, lati )
-    };
-    size_t field_offset_namepre[2]=
-    {
-        HOFFSET( namepressure_t, name ),
-        HOFFSET( namepressure_t, pressure )
-    };
-    size_t field_sizes_pos[2]=
-    {
-        sizeof(position_in[0].longi),
-        sizeof(position_in[0].lati)
-    };
-    size_t field_sizes_namepre[2]=
-    {
-        sizeof(namepre_in[0].name),
-        sizeof(namepre_in[0].pressure)
-    };
-    size_t field_sizes_pre[1]=
-    {
-        sizeof(namepre_in[0].pressure)
-    };
+     * initialize table parameters
+     * field offsets and sizes used in the fields functions
+     *-------------------------------------------------------------------------
+     */
+
+    size_t field_offset_pos[2]     = {HOFFSET(position_t, longi), HOFFSET(position_t, lati)};
+    size_t field_offset_namepre[2] = {HOFFSET(namepressure_t, name), HOFFSET(namepressure_t, pressure)};
+    size_t field_sizes_pos[2]      = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
+    size_t field_sizes_namepre[2]  = {sizeof(namepre_in[0].name), sizeof(namepre_in[0].pressure)};
+    size_t field_sizes_pre[1]      = {sizeof(namepre_in[0].pressure)};
 
     /*-------------------------------------------------------------------------
-    * query table test
-    *-------------------------------------------------------------------------
-    */
-    char    **names_out;
-    size_t  sizes_out[NFIELDS];
-    size_t  offset_out[NFIELDS];
-    size_t  size_out;
+     * query table test
+     *-------------------------------------------------------------------------
+     */
+    char **names_out;
+    size_t sizes_out[NFIELDS];
+    size_t offset_out[NFIELDS];
+    size_t size_out;
 
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * field indexes (zero based) used in the fields functions
-    * "Name 0","Longitude 1","Pressure 2","Temperature 3","Latitude 4"
-    *-------------------------------------------------------------------------
-    */
-    int    field_index_pre[1]     = { 2 };
-    int    field_index_pos[2]     = { 1,4 };
-    int    field_index_namepre[2] = { 0,2 };
-    int    field_index[NFIELDS]   = { 0,1,2,3,4 };
+     * initialize table parameters
+     * field indexes (zero based) used in the fields functions
+     * "Name 0","Longitude 1","Pressure 2","Temperature 3","Latitude 4"
+     *-------------------------------------------------------------------------
+     */
+    int field_index_pre[1]     = {2};
+    int field_index_pos[2]     = {1, 4};
+    int field_index_namepre[2] = {0, 2};
+    int field_index[NFIELDS]   = {0, 1, 2, 3, 4};
 
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * size and the offsets of struct members in memory
-    * define the inserted field HDF5 type and buffers
-    * these are used for the insert field test
-    *-------------------------------------------------------------------------
-    */
-    hid_t   field_type_new = H5T_NATIVE_INT;
-    size_t  dst_size2 =  sizeof( particle2_t );
-    size_t  dst_offset2[NFIELDS+1] = { HOFFSET( particle2_t, name ),
-        HOFFSET( particle2_t, longi ),
-        HOFFSET( particle2_t, pressure ),
-        HOFFSET( particle2_t, temperature ),
-        HOFFSET( particle2_t, lati ),
-        HOFFSET( particle2_t, new_field )};
-    size_t dst_sizes2[NFIELDS+1] = { sizeof( rbuf2[0].name),
-        sizeof( rbuf2[0].longi),
-        sizeof( rbuf2[0].pressure),
-        sizeof( rbuf2[0].temperature),
-        sizeof( rbuf2[0].lati),
-        sizeof( rbuf2[0].new_field)};
+     * initialize table parameters
+     * size and the offsets of struct members in memory
+     * define the inserted field HDF5 type and buffers
+     * these are used for the insert field test
+     *-------------------------------------------------------------------------
+     */
+    hid_t  field_type_new           = H5T_NATIVE_INT;
+    size_t dst_size2                = sizeof(particle2_t);
+    size_t dst_offset2[NFIELDS + 1] = {HOFFSET(particle2_t, name),     HOFFSET(particle2_t, longi),
+                                       HOFFSET(particle2_t, pressure), HOFFSET(particle2_t, temperature),
+                                       HOFFSET(particle2_t, lati),     HOFFSET(particle2_t, new_field)};
+    size_t dst_sizes2[NFIELDS + 1]  = {sizeof(rbuf2[0].name),     sizeof(rbuf2[0].longi),
+                                      sizeof(rbuf2[0].pressure), sizeof(rbuf2[0].temperature),
+                                      sizeof(rbuf2[0].lati),     sizeof(rbuf2[0].new_field)};
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * size and the offsets of struct members in memory
-    * these are used for the delete field test
-    *-------------------------------------------------------------------------
-    */
-    size_t dst_size3 =  sizeof( particle3_t );
-    size_t dst_offset3[NFIELDS-1] = { HOFFSET( particle3_t, name ),
-        HOFFSET( particle3_t, longi ),
-        HOFFSET( particle3_t, temperature ),
-        HOFFSET( particle3_t, lati )};
-
-    size_t dst_sizes3[NFIELDS-1] = { sizeof( rbuf3[0].name),
-        sizeof( rbuf3[0].longi),
-        sizeof( rbuf3[0].temperature),
-        sizeof( rbuf3[0].lati)};
+     * initialize table parameters
+     * size and the offsets of struct members in memory
+     * these are used for the delete field test
+     *-------------------------------------------------------------------------
+     */
+    size_t dst_size3                = sizeof(particle3_t);
+    size_t dst_offset3[NFIELDS - 1] = {HOFFSET(particle3_t, name), HOFFSET(particle3_t, longi),
+                                       HOFFSET(particle3_t, temperature), HOFFSET(particle3_t, lati)};
+
+    size_t dst_sizes3[NFIELDS - 1] = {sizeof(rbuf3[0].name), sizeof(rbuf3[0].longi),
+                                      sizeof(rbuf3[0].temperature), sizeof(rbuf3[0].lati)};
 
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * size and the offsets of struct members in memory
-    * these are used for the delete field test with differing memory layout
-    *-------------------------------------------------------------------------
-    */
+     * initialize table parameters
+     * size and the offsets of struct members in memory
+     * these are used for the delete field test with differing memory layout
+     *-------------------------------------------------------------------------
+     */
 
     /* Calculate the size and the offsets of our struct members in memory */
-    size_t tbl_size = sizeof(particle4_t);
-    size_t tbl_offset[NFIELDS+1] = { HOFFSET(particle4_t, state),
-                                   HOFFSET(particle4_t, posx),
-                                   HOFFSET(particle4_t, posy),
-                                   HOFFSET(particle4_t, atx),
-                                   HOFFSET(particle4_t, aty),
-                                   HOFFSET(particle4_t, rro)
-                                 };
+    size_t tbl_size                = sizeof(particle4_t);
+    size_t tbl_offset[NFIELDS + 1] = {HOFFSET(particle4_t, state), HOFFSET(particle4_t, posx),
+                                      HOFFSET(particle4_t, posy),  HOFFSET(particle4_t, atx),
+                                      HOFFSET(particle4_t, aty),   HOFFSET(particle4_t, rro)};
 
     /* Define an array of Particles */
-    particle4_t  p_data[NRECORDS] = {
-        {12112, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12113, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12114, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12115, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12116, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12117, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12118, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
-        {12119, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}}
-    };
+    particle4_t p_data[NRECORDS] = {{12112, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12113, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12114, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12115, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12116, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12117, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12118, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}},
+                                    {12119, 1.4f, 2.5f, {1, 2, 3}, {4, 5, 6}, {99, 100}}};
 
     /*-------------------------------------------------------------------------
-    * initialize table parameters
-    * 1) size and the offsets of struct members in memory
-    * 2) field names
-    * 3) define a HDF5 type for the fields
-    *-------------------------------------------------------------------------
-    */
-
-    size_t type_size_mem =  sizeof( particle_t );
-    size_t field_offset[NFIELDS]=
-    {
-        HOFFSET( particle_t, name ),
-        HOFFSET( particle_t, longi ),
-        HOFFSET( particle_t, pressure ),
-        HOFFSET( particle_t, temperature ),
-        HOFFSET( particle_t, lati )
-    };
-    size_t field_size[NFIELDS] =
-    {
-        sizeof( rbuf[0].name),
-        sizeof( rbuf[0].longi),
-        sizeof( rbuf[0].pressure),
-        sizeof( rbuf[0].temperature),
-        sizeof( rbuf[0].lati)
-    };
+     * initialize table parameters
+     * 1) size and the offsets of struct members in memory
+     * 2) field names
+     * 3) define a HDF5 type for the fields
+     *-------------------------------------------------------------------------
+     */
+
+    size_t type_size_mem         = sizeof(particle_t);
+    size_t field_offset[NFIELDS] = {HOFFSET(particle_t, name), HOFFSET(particle_t, longi),
+                                    HOFFSET(particle_t, pressure), HOFFSET(particle_t, temperature),
+                                    HOFFSET(particle_t, lati)};
+    size_t field_size[NFIELDS]   = {sizeof(rbuf[0].name), sizeof(rbuf[0].longi), sizeof(rbuf[0].pressure),
+                                  sizeof(rbuf[0].temperature), sizeof(rbuf[0].lati)};
 
-    const char *field_names4[NFIELDS+1] =
-      { "F1", "F2", "F3", "F4", "F5", "F6"};
-    hid_t       field_type4[NFIELDS+1];
-    particle4_t fill_data[1] = { {9999999, -9999999, 999999, {999,999,999},{999,999,999}, {999,999}} };
+    const char *field_names4[NFIELDS + 1] = {"F1", "F2", "F3", "F4", "F5", "F6"};
+    hid_t       field_type4[NFIELDS + 1];
+    particle4_t fill_data[1] = {{9999999, -9999999, 999999, {999, 999, 999}, {999, 999, 999}, {999, 999}}};
 
-    hsize_t    nfields_out;
-    hsize_t    nrecords_out;
-    hid_t      arry3_32f;
-    hid_t      arry2_32f;
-    hsize_t    dims;
+    hsize_t nfields_out;
+    hsize_t nrecords_out;
+    hid_t   arry3_32f;
+    hid_t   arry2_32f;
+    hsize_t dims;
 
-    const char *field_names[NFIELDS]  =
-      { "Name","Longitude","Pressure","Temperature","Latitude" };
-    hid_t field_type[NFIELDS];
-    hid_t string_type = H5Tcopy( H5T_C_S1 );
+    const char *field_names[NFIELDS] = {"Name", "Longitude", "Pressure", "Temperature", "Latitude"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type = H5Tcopy(H5T_C_S1);
 
-    H5Tset_size( string_type, 16 );
+    H5Tset_size(string_type, 16);
     field_type[0] = string_type;
     field_type[1] = H5T_NATIVE_LONG;
     field_type[2] = H5T_NATIVE_FLOAT;
@@ -446,21 +380,19 @@ static int test_table(hid_t fid, int do_write)
     field_type[4] = H5T_NATIVE_INT;
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBmake_table
-    * H5TBread_table
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBmake_table
+     * H5TBread_table
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("making table");
 
-        if (H5TBmake_table(TITLE,fid,"table1",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table1", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
         PASSED();
     }
@@ -468,61 +400,56 @@ static int test_table(hid_t fid, int do_write)
     HL_TESTING2("reading table");
 
     /*-------------------------------------------------------------------------
-    * read the table
-    *-------------------------------------------------------------------------
-    */
+     * read the table
+     *-------------------------------------------------------------------------
+     */
 
-    if (H5TBread_table(fid,"table1",type_size_mem,field_offset,field_size,rbuf)<0)
+    if (H5TBread_table(fid, "table1", type_size_mem, field_offset, field_size, rbuf) < 0)
         goto out;
 
     /* compare the extracted table with the original array */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-        if (cmp_par(i,i,rbuf,wbuf)<0)
+    for (i = 0; i < NRECORDS; i++) {
+        if (cmp_par(i, i, rbuf, wbuf) < 0)
             goto out;
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBwrite_records
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBwrite_records
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("writing records");
 
         /* create an empty table */
-        if (H5TBmake_table(TITLE,fid,"table2",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,0)<0)
+        if (H5TBmake_table(TITLE, fid, "table2", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, 0) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * write records, start at 0, write 8
-        * pos = 0 1 2 3 4 5 6 7
-        * data= 0 1 2 3 4 5 6 7
-        *-------------------------------------------------------------------------
-        */
-        wstart=0;
-        wrecords=8;
-        if (H5TBwrite_records(fid,"table2",wstart,wrecords,type_size_mem,field_offset,
-            field_size,wbuf)<0)
+         * write records, start at 0, write 8
+         * pos = 0 1 2 3 4 5 6 7
+         * data= 0 1 2 3 4 5 6 7
+         *-------------------------------------------------------------------------
+         */
+        wstart   = 0;
+        wrecords = 8;
+        if (H5TBwrite_records(fid, "table2", wstart, wrecords, type_size_mem, field_offset, field_size,
+                              wbuf) < 0)
             goto out;
 
         /* read it back */
-        if (H5TBread_table(fid,"table2",type_size_mem,field_offset,field_size,rbuf)<0)
+        if (H5TBread_table(fid, "table2", type_size_mem, field_offset, field_size, rbuf) < 0)
             goto out;
 
         /* compare  */
-        for( i = 0; i < NRECORDS; i++ )
-        {
-            if (cmp_par(i,i,rbuf,wbuf)<0)
+        for (i = 0; i < NRECORDS; i++) {
+            if (cmp_par(i, i, rbuf, wbuf) < 0)
                 goto out;
         }
 
@@ -530,147 +457,139 @@ static int test_table(hid_t fid, int do_write)
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBread_records
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBread_records
+     *
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("reading records");
 
     /*-------------------------------------------------------------------------
-    * read records, start at 0, read 8
-    * pos = 0 1 2 3 4 5 6 7
-    * data= 0 1 2 3 4 5 6 7
-    *-------------------------------------------------------------------------
-    */
+     * read records, start at 0, read 8
+     * pos = 0 1 2 3 4 5 6 7
+     * data= 0 1 2 3 4 5 6 7
+     *-------------------------------------------------------------------------
+     */
 
     /*-------------------------------------------------------------------------
-    * for the read test we cannot use "table2" because it has been appended
-    * we use the original "table1" instead
-    *-------------------------------------------------------------------------
-    */
-    if(do_write)
-        HDstrcpy(tname,"table2");
+     * for the read test we cannot use "table2" because it has been appended
+     * we use the original "table1" instead
+     *-------------------------------------------------------------------------
+     */
+    if (do_write)
+        HDstrcpy(tname, "table2");
     else
-        HDstrcpy(tname,"table1");
+        HDstrcpy(tname, "table1");
 
-    rstart=0;
-    rrecords=8;
-    if (H5TBread_records(fid,tname,rstart,rrecords,type_size_mem,field_offset,
-        field_size,rbuf)<0)
+    rstart   = 0;
+    rrecords = 8;
+    if (H5TBread_records(fid, tname, rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) < 0)
         goto out;
 
     /* compare */
-    for( i = rstart; i < rrecords; i++)
-    {
-        if (cmp_par(i,i,rbuf,wbuf)<0)
+    for (i = rstart; i < rrecords; i++) {
+        if (cmp_par(i, i, rbuf, wbuf) < 0)
             goto out;
     }
     PASSED();
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBappend_records
-    * H5TBread_records
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBappend_records
+     * H5TBread_records
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("appending records");
 
         /*-------------------------------------------------------------------------
-        * append 2 records
-        * pos = 0 1 2 3 4 5 6 7 8 9
-        * data= 0 1 2 3 4 5 6 7 8 9
-        *-------------------------------------------------------------------------
-        */
-        arecords=2;
-        if (H5TBappend_records(fid,"table2",arecords,type_size_mem,field_offset,field_size,abuf)<0)
+         * append 2 records
+         * pos = 0 1 2 3 4 5 6 7 8 9
+         * data= 0 1 2 3 4 5 6 7 8 9
+         *-------------------------------------------------------------------------
+         */
+        arecords = 2;
+        if (H5TBappend_records(fid, "table2", arecords, type_size_mem, field_offset, field_size, abuf) < 0)
             return 1;
 
-        if (H5TBget_table_info(fid,"table2",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table2", &rfields, &rrecords) < 0)
             return 1;
 
-        rstart=0; rrecords=NRECORDS+arecords;
-        if (H5TBread_records(fid,"table2",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        rstart   = 0;
+        rrecords = NRECORDS + arecords;
+        if (H5TBread_records(fid, "table2", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             return 1;
 
         /* compare */
-        wrecords=8;
-        for( i = rstart; i< wrecords; i++)
-        {
-            if (cmp_par(i,i,rbuf,wbuf)<0)
+        wrecords = 8;
+        for (i = rstart; i < wrecords; i++) {
+            if (cmp_par(i, i, rbuf, wbuf) < 0)
                 goto out;
         }
-        for( i = wrecords, j = 0; i < rrecords; i++,j++)
-        {
-            if (cmp_par(i,j,rbuf,abuf)<0)
+        for (i = wrecords, j = 0; i < rrecords; i++, j++) {
+            if (cmp_par(i, j, rbuf, abuf) < 0)
                 goto out;
         }
         PASSED();
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBinsert_record
-    * H5TBread_records
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBinsert_record
+     * H5TBread_records
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("inserting records");
 
         /*-------------------------------------------------------------------------
-        * insert 2 records
-        * pos = 0 1 2 3 4 5 6 7 8 9 10 11
-        * data= 0 0 0 1 2 3 4 5 6 7 8  9
-        *-------------------------------------------------------------------------
-        */
-        istart=1; irecords=2;
-        if (H5TBinsert_record(fid,"table2",istart,irecords,type_size_mem,field_offset,field_size,ibuf)<0)
+         * insert 2 records
+         * pos = 0 1 2 3 4 5 6 7 8 9 10 11
+         * data= 0 0 0 1 2 3 4 5 6 7 8  9
+         *-------------------------------------------------------------------------
+         */
+        istart   = 1;
+        irecords = 2;
+        if (H5TBinsert_record(fid, "table2", istart, irecords, type_size_mem, field_offset, field_size,
+                              ibuf) < 0)
             return 1;
 
-        if (H5TBget_table_info(fid,"table2",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table2", &rfields, &rrecords) < 0)
             return 1;
 
-        if (H5TBread_records(fid,"table2",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        if (H5TBread_records(fid, "table2", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             return 1;
 
         /* compare */
-        for( i = 0; i < 12; i++)
-        {
-            if (i < istart)
-            {
-                if (cmp_par(i,i,rbuf,wbuf)<0)
+        for (i = 0; i < 12; i++) {
+            if (i < istart) {
+                if (cmp_par(i, i, rbuf, wbuf) < 0)
                     goto out;
             }
-            else if (i >= istart && i < istart + irecords)
-            {
+            else if (i >= istart && i < istart + irecords) {
                 j = i - istart;
-                if (cmp_par(i,j,rbuf,ibuf)<0)
+                if (cmp_par(i, j, rbuf, ibuf) < 0)
                     goto out;
             }
-            else if ( i >= istart + irecords && i < 10 )
-            {
+            else if (i >= istart + irecords && i < 10) {
                 j = i - irecords;
-                if (cmp_par(i,j,rbuf,wbuf)<0)
+                if (cmp_par(i, j, rbuf, wbuf) < 0)
                     goto out;
             }
-            else
-            {
+            else {
                 j = i - 10;
-                if (cmp_par(i,j,rbuf,abuf)<0)
+                if (cmp_par(i, j, rbuf, abuf) < 0)
                     goto out;
             }
         }
@@ -678,198 +597,192 @@ static int test_table(hid_t fid, int do_write)
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBdelete_record
-    * H5TBread_records
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBdelete_record
+     * H5TBread_records
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("deleting records");
 
         /*-------------------------------------------------------------------------
-        * Create a table
-        * pos = 0 1 2 3 4 5 6 7
-        * data= 0 1 2 3 4 5 6 7
-        *-------------------------------------------------------------------------
-        */
-
-        for( i=0; i<NRECORDS; i++)
-        {
-            wbufd[i].lati = wbuf[i].lati;
-            wbufd[i].longi = wbuf[i].longi;
-            wbufd[i].pressure = wbuf[i].pressure;
+         * Create a table
+         * pos = 0 1 2 3 4 5 6 7
+         * data= 0 1 2 3 4 5 6 7
+         *-------------------------------------------------------------------------
+         */
+
+        for (i = 0; i < NRECORDS; i++) {
+            wbufd[i].lati        = wbuf[i].lati;
+            wbufd[i].longi       = wbuf[i].longi;
+            wbufd[i].pressure    = wbuf[i].pressure;
             wbufd[i].temperature = wbuf[i].temperature;
-            HDstrcpy(wbufd[i].name, wbuf[i].name );
-
+            HDstrcpy(wbufd[i].name, wbuf[i].name);
         }
 
-
-        if (H5TBmake_table(TITLE,fid,"table3",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbufd)<0)
+        if (H5TBmake_table(TITLE, fid, "table3", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbufd) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * Delete records, start at 2, delete 3
-        * pos = 0 1 2 3 4
-        * data= 0 1 5 6 7
-        *-------------------------------------------------------------------------
-        */
-        dstart=2; drecords=3;
-        if (H5TBdelete_record(fid,"table3",dstart,drecords)<0)
+         * Delete records, start at 2, delete 3
+         * pos = 0 1 2 3 4
+         * data= 0 1 5 6 7
+         *-------------------------------------------------------------------------
+         */
+        dstart   = 2;
+        drecords = 3;
+        if (H5TBdelete_record(fid, "table3", dstart, drecords) < 0)
             goto out;
 
-        if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table3", &rfields, &rrecords) < 0)
             goto out;
 
-        rstart=0;
-        if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        rstart = 0;
+        if (H5TBread_records(fid, "table3", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             goto out;
 
         /* compare */
-        nrecords=NRECORDS;
-        assert(rrecords == nrecords-drecords);
-        if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0)
+        nrecords = NRECORDS;
+        assert(rrecords == nrecords - drecords);
+        if (compare_deleted(rrecords, dstart, drecords, rbuf, wbufd) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * reset compare buffer
-        *-------------------------------------------------------------------------
-        */
-        nrecords=rrecords;
-        for( i=0; i<nrecords; i++)
-        {
+         * reset compare buffer
+         *-------------------------------------------------------------------------
+         */
+        nrecords = rrecords;
+        for (i = 0; i < nrecords; i++) {
             wbufd[i] = rbuf[i];
         }
 
         /*-------------------------------------------------------------------------
-        * Delete records, start at 0, delete 2
-        * pos = 0 1 2
-        * data= 5 6 7
-        *-------------------------------------------------------------------------
-        */
-        dstart=0; drecords=2;
-        if (H5TBdelete_record(fid,"table3",dstart,drecords)<0)
+         * Delete records, start at 0, delete 2
+         * pos = 0 1 2
+         * data= 5 6 7
+         *-------------------------------------------------------------------------
+         */
+        dstart   = 0;
+        drecords = 2;
+        if (H5TBdelete_record(fid, "table3", dstart, drecords) < 0)
             goto out;
 
-        if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table3", &rfields, &rrecords) < 0)
             goto out;
 
-        rstart=0;
-        if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        rstart = 0;
+        if (H5TBread_records(fid, "table3", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             goto out;
 
         /* Compare */
-        assert(rrecords == nrecords-drecords);
-        if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0)
+        assert(rrecords == nrecords - drecords);
+        if (compare_deleted(rrecords, dstart, drecords, rbuf, wbufd) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * reset compare buffer
-        *-------------------------------------------------------------------------
-        */
-        nrecords=rrecords;
-        for( i=0; i<nrecords; i++)
-        {
+         * reset compare buffer
+         *-------------------------------------------------------------------------
+         */
+        nrecords = rrecords;
+        for (i = 0; i < nrecords; i++) {
             wbufd[i] = rbuf[i];
         }
 
         /*-------------------------------------------------------------------------
-        * Delete records, start at 1, delete 1
-        * pos = 0 1
-        * data= 5 7
-        *-------------------------------------------------------------------------
-        */
-        dstart=1; drecords=1;
-        if (H5TBdelete_record(fid,"table3",dstart,drecords)<0)
+         * Delete records, start at 1, delete 1
+         * pos = 0 1
+         * data= 5 7
+         *-------------------------------------------------------------------------
+         */
+        dstart   = 1;
+        drecords = 1;
+        if (H5TBdelete_record(fid, "table3", dstart, drecords) < 0)
             goto out;
 
-        if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table3", &rfields, &rrecords) < 0)
             goto out;
 
-        rstart=0;
-        if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        rstart = 0;
+        if (H5TBread_records(fid, "table3", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             goto out;
 
         /* Compare */
-        assert(rrecords == nrecords-drecords);
-        if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0)
+        assert(rrecords == nrecords - drecords);
+        if (compare_deleted(rrecords, dstart, drecords, rbuf, wbufd) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * reset compare buffer
-        *-------------------------------------------------------------------------
-        */
-        nrecords=rrecords;
-        for( i=0; i<nrecords; i++)
-        {
+         * reset compare buffer
+         *-------------------------------------------------------------------------
+         */
+        nrecords = rrecords;
+        for (i = 0; i < nrecords; i++) {
             wbufd[i] = rbuf[i];
         }
 
         /*-------------------------------------------------------------------------
-        * Delete records, start at 0, delete 1
-        * pos = 0
-        * data= 7
-        *-------------------------------------------------------------------------
-        */
-        dstart=0; drecords=1;
-        if (H5TBdelete_record(fid,"table3",dstart,drecords)<0)
+         * Delete records, start at 0, delete 1
+         * pos = 0
+         * data= 7
+         *-------------------------------------------------------------------------
+         */
+        dstart   = 0;
+        drecords = 1;
+        if (H5TBdelete_record(fid, "table3", dstart, drecords) < 0)
             goto out;
 
-        if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table3", &rfields, &rrecords) < 0)
             goto out;
 
-        rstart=0;
-        if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
-            field_size,rbuf)<0)
+        rstart = 0;
+        if (H5TBread_records(fid, "table3", rstart, rrecords, type_size_mem, field_offset, field_size, rbuf) <
+            0)
             goto out;
 
         /* Compare */
-        assert(rrecords == nrecords-drecords);
-        if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0)
+        assert(rrecords == nrecords - drecords);
+        if (compare_deleted(rrecords, dstart, drecords, rbuf, wbufd) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * reset compare buffer
-        *-------------------------------------------------------------------------
-        */
-        nrecords=rrecords;
-        for( i=0; i<nrecords; i++)
-        {
+         * reset compare buffer
+         *-------------------------------------------------------------------------
+         */
+        nrecords = rrecords;
+        for (i = 0; i < nrecords; i++) {
             wbufd[i] = rbuf[i];
         }
 
         /* Read complete table */
-        if (H5TBread_table(fid,"table3",type_size_mem,field_offset,field_size,rbuf)<0)
+        if (H5TBread_table(fid, "table3", type_size_mem, field_offset, field_size, rbuf) < 0)
             goto out;
 
         /* Compare */
-        for( i=0; i<rrecords; i++)
-        {
-            if (cmp_par(i,i,rbuf,wbufd)<0)
-            {
+        for (i = 0; i < rrecords; i++) {
+            if (cmp_par(i, i, rbuf, wbufd) < 0) {
                 goto out;
             }
         }
 
         /*-------------------------------------------------------------------------
-        * Delete records, start at 0, delete 1
-        * pos = 0
-        * data= empty
-        *-------------------------------------------------------------------------
-        */
-        dstart=0; drecords=1;
-        if (H5TBdelete_record(fid,"table3",dstart,drecords)<0)
+         * Delete records, start at 0, delete 1
+         * pos = 0
+         * data= empty
+         *-------------------------------------------------------------------------
+         */
+        dstart   = 0;
+        drecords = 1;
+        if (H5TBdelete_record(fid, "table3", dstart, drecords) < 0)
             goto out;
 
-        if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0)
+        if (H5TBget_table_info(fid, "table3", &rfields, &rrecords) < 0)
             goto out;
 
         if (rrecords)
@@ -886,104 +799,97 @@ static int test_table(hid_t fid, int do_write)
      *
      *-------------------------------------------------------------------------
      */
-    if (do_write)
-    {
+    if (do_write) {
         HL_TESTING2("deleting records (differing memory layout)");
 
-    dims = 3;
-    arry3_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims);
-
-    dims = 2;
-    arry2_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims);
-
-    /* Initialize the field field_type */
-    field_type4[0] = H5T_NATIVE_UINT32;
-    field_type4[1] = H5T_NATIVE_DOUBLE;
-    field_type4[2] = H5T_NATIVE_DOUBLE;
-    field_type4[3] = arry3_32f;
-    field_type4[4] = arry3_32f;
-    field_type4[5] = arry2_32f;
-
-    /* Make the table */
-    if (H5TBmake_table("Table Title",fid,"table",NFIELDS+1,(hsize_t)NRECORDS,
-                          tbl_size, field_names4, tbl_offset, field_type4,
-                          chunk_size, fill_data, compress, p_data)<0)
-    goto out;
-    /* Delete records */
-    start    = 3;
-    nrecords = 3;
-    if (H5TBdelete_record(fid, "table", start, nrecords)<0)
-    goto out;;
-    /* Get table info */
-    if (H5TBget_table_info(fid,"table", &nfields_out, &nrecords_out)<0)
-    goto out;
-    /* check */
-    if( (int)nfields_out != (int)NFIELDS+1)
-    goto out;
-
-    if( (int)nrecords_out != (int)NRECORDS-3)
-    goto out;
-
-    /* close type */
-    H5Tclose(arry3_32f);
-    H5Tclose(arry2_32f);
+        dims      = 3;
+        arry3_32f = H5Tarray_create2(H5T_NATIVE_FLOAT, 1, &dims);
 
-    PASSED();
+        dims      = 2;
+        arry2_32f = H5Tarray_create2(H5T_NATIVE_FLOAT, 1, &dims);
+
+        /* Initialize the field field_type */
+        field_type4[0] = H5T_NATIVE_UINT32;
+        field_type4[1] = H5T_NATIVE_DOUBLE;
+        field_type4[2] = H5T_NATIVE_DOUBLE;
+        field_type4[3] = arry3_32f;
+        field_type4[4] = arry3_32f;
+        field_type4[5] = arry2_32f;
+
+        /* Make the table */
+        if (H5TBmake_table("Table Title", fid, "table", NFIELDS + 1, (hsize_t)NRECORDS, tbl_size,
+                           field_names4, tbl_offset, field_type4, chunk_size, fill_data, compress,
+                           p_data) < 0)
+            goto out;
+        /* Delete records */
+        start    = 3;
+        nrecords = 3;
+        if (H5TBdelete_record(fid, "table", start, nrecords) < 0)
+            goto out;
+        ;
+        /* Get table info */
+        if (H5TBget_table_info(fid, "table", &nfields_out, &nrecords_out) < 0)
+            goto out;
+        /* check */
+        if ((int)nfields_out != (int)NFIELDS + 1)
+            goto out;
+
+        if ((int)nrecords_out != (int)NRECORDS - 3)
+            goto out;
+
+        /* close type */
+        H5Tclose(arry3_32f);
+        H5Tclose(arry2_32f);
+
+        PASSED();
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBadd_records_from
-    * H5TBread_records
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBadd_records_from
+     * H5TBread_records
+     *
+     *-------------------------------------------------------------------------
+     */
 
-    if (do_write)
-    {
+    if (do_write) {
         HL_TESTING2("adding records");
 
         /* create 2 tables */
-        if (H5TBmake_table(TITLE,fid,"table4",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table4", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
-        if (H5TBmake_table(TITLE,fid,"table5",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table5", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
 
         /* add the records from "table4" to "table5"  */
-        start1    = 3;
-        nrecords  = 2;
-        start2    = 6;
-        if ( H5TBadd_records_from(fid,"table4",start1,nrecords,"table5",start2)<0)
+        start1   = 3;
+        nrecords = 2;
+        start2   = 6;
+        if (H5TBadd_records_from(fid, "table4", start1, nrecords, "table5", start2) < 0)
             goto out;
 
         /* read final table */
-        if (H5TBread_table(fid,"table5",type_size_mem,field_offset,field_size,rbuf)<0)
+        if (H5TBread_table(fid, "table5", type_size_mem, field_offset, field_size, rbuf) < 0)
             goto out;
 
         /* compare */
-        for( i = 0; i < NRECORDS+2; i++ )
-        {
-            if ( i < start2 )
-            {
-                if (cmp_par(i,i,rbuf,wbuf)<0)
+        for (i = 0; i < NRECORDS + 2; i++) {
+            if (i < start2) {
+                if (cmp_par(i, i, rbuf, wbuf) < 0)
                     goto out;
             }
-            else if ( i < start2 + nrecords )
-            {
+            else if (i < start2 + nrecords) {
                 j = i - start1;
-                if (cmp_par(i,j,rbuf,wbuf)<0)
+                if (cmp_par(i, j, rbuf, wbuf) < 0)
                     goto out;
             }
-            else
-            {
+            else {
                 j = i - nrecords;
-                if (cmp_par(i,j,rbuf,wbuf)<0)
+                if (cmp_par(i, j, rbuf, wbuf) < 0)
                     goto out;
             }
         }
@@ -992,90 +898,79 @@ static int test_table(hid_t fid, int do_write)
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBcombine_tables
-    * H5TBread_table
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBcombine_tables
+     * H5TBread_table
+     *
+     *-------------------------------------------------------------------------
+     */
 
-    if (do_write)
-    {
+    if (do_write) {
         HL_TESTING2("combining tables");
 
         /* create 2 tables */
-        if (H5TBmake_table(TITLE,fid,"table6",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table6", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
-        if (H5TBmake_table(TITLE,fid,"table7",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table7", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
 
         /* combine the two tables into a third  */
-        if ( H5TBcombine_tables(fid,"table6",fid,"table7","table8")<0)
+        if (H5TBcombine_tables(fid, "table6", fid, "table7", "table8") < 0)
             goto out;
 
         /* read merged table */
-        if (H5TBread_table(fid,"table8",type_size_mem,field_offset,field_size,rbufc)<0)
+        if (H5TBread_table(fid, "table8", type_size_mem, field_offset, field_size, rbufc) < 0)
             goto out;
 
         /* compare  */
-        for( i = 0; i < NRECORDS*2; i++ )
-        {
-            if ( i < NRECORDS )
-            {
-                if (cmp_par(i,i,rbufc,wbuf)<0)
+        for (i = 0; i < NRECORDS * 2; i++) {
+            if (i < NRECORDS) {
+                if (cmp_par(i, i, rbufc, wbuf) < 0)
                     goto out;
             }
-            else
-            {
-                if (cmp_par(i,i-NRECORDS,rbufc,wbuf)<0)
+            else {
+                if (cmp_par(i, i - NRECORDS, rbufc, wbuf) < 0)
                     goto out;
             }
         }
 
         /*-------------------------------------------------------------------------
-        * multi file test
-        *-------------------------------------------------------------------------
-        */
+         * multi file test
+         *-------------------------------------------------------------------------
+         */
 
         /* create 2 files using default properties. */
-        fid1 = H5Fcreate("combine_tables1.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
-        fid2 = H5Fcreate("combine_tables2.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+        fid1 = H5Fcreate("combine_tables1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        fid2 = H5Fcreate("combine_tables2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
         /* create 2 tables, one in each file */
-        if (H5TBmake_table(TITLE,fid1,"table1",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid1, "table1", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
-        if (H5TBmake_table(TITLE,fid2,"table2",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid2, "table2", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
 
         /* combine the two tables into a third  */
-        if ( H5TBcombine_tables(fid1,"table1",fid2,"table2","table3")<0)
+        if (H5TBcombine_tables(fid1, "table1", fid2, "table2", "table3") < 0)
             goto out;
 
         /* read merged table */
-        if (H5TBread_table(fid1,"table3",type_size_mem,field_offset,field_size,rbufc)<0)
+        if (H5TBread_table(fid1, "table3", type_size_mem, field_offset, field_size, rbufc) < 0)
             goto out;
 
         /* compare  */
-        for( i = 0; i < NRECORDS*2; i++ )
-        {
-            if ( i < NRECORDS )
-            {
-                if (cmp_par(i,i,rbufc,wbuf)<0)
+        for (i = 0; i < NRECORDS * 2; i++) {
+            if (i < NRECORDS) {
+                if (cmp_par(i, i, rbufc, wbuf) < 0)
                     goto out;
             }
-            else
-            {
-                if (cmp_par(i,i-NRECORDS,rbufc,wbuf)<0)
+            else {
+                if (cmp_par(i, i - NRECORDS, rbufc, wbuf) < 0)
                     goto out;
             }
         }
@@ -1087,98 +982,87 @@ static int test_table(hid_t fid, int do_write)
         PASSED();
     }
 
-
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBwrite_fields_name
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBwrite_fields_name
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("writing fields by name");
 
         /* make an empty table with fill values */
-        if (H5TBmake_table(TITLE,fid,"table9",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill1,compress,0)<0)
+        if (H5TBmake_table(TITLE, fid, "table9", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill1, compress, 0) < 0)
             goto out;
 
         /* write the pressure field starting at record 2 */
         start    = 2;
         nrecords = NRECORDS_ADD;
-        if (H5TBwrite_fields_name(fid,"table9","Pressure",start,nrecords,sizeof(float),
-            0,field_sizes_pre,pressure_in)<0)
+        if (H5TBwrite_fields_name(fid, "table9", "Pressure", start, nrecords, sizeof(float), 0,
+                                  field_sizes_pre, pressure_in) < 0)
             goto out;
 
         /* write the new longitude and latitude information starting at record 2 */
         start    = 2;
         nrecords = 3;
-        if (H5TBwrite_fields_name(fid,"table9","Latitude,Longitude",start,nrecords,sizeof(position_t),
-            field_offset_pos,field_sizes_pos,position_in)<0)
+        if (H5TBwrite_fields_name(fid, "table9", "Latitude,Longitude", start, nrecords, sizeof(position_t),
+                                  field_offset_pos, field_sizes_pos, position_in) < 0)
             goto out;
 
         /* read back the all table */
         start    = 0;
         nrecords = NRECORDS;
-        if (H5TBread_table(fid,"table9",type_size_mem,field_offset,field_size,rbuf)<0)
+        if (H5TBread_table(fid, "table9", type_size_mem, field_offset, field_size, rbuf) < 0)
             goto out;
 
         {
 
-
             /* compare the read values with the initial values */
-            for( i = 0; i < NRECORDS; i++ )
-            {
-                if ( i >= 2 && i <= 4 )
-                {
-                    if ( rbuf[i].lati       != position_in[i-NRECORDS_ADD+1].lati ||
-                        rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-            !H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
-                    {
-                        HDfprintf(stderr,"%ld %f %d\n",
-                rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].lati);
-                        HDfprintf(stderr,"%ld %f %d\n",
-                            position_in[i].longi,(double)pressure_in[i],position_in[i].lati);
+            for (i = 0; i < NRECORDS; i++) {
+                if (i >= 2 && i <= 4) {
+                    if (rbuf[i].lati != position_in[i - NRECORDS_ADD + 1].lati ||
+                        rbuf[i].longi != position_in[i - NRECORDS_ADD + 1].longi ||
+                        !H5_FLT_ABS_EQUAL(rbuf[i].pressure, pressure_in[i - NRECORDS_ADD + 1])) {
+                        HDfprintf(stderr, "%ld %f %d\n", rbuf[i].longi, (double)rbuf[i].pressure,
+                                  rbuf[i].lati);
+                        HDfprintf(stderr, "%ld %f %d\n", position_in[i].longi, (double)pressure_in[i],
+                                  position_in[i].lati);
                         goto out;
                     }
                 }
             }
         }
 
-
-
         PASSED();
     } /*write*/
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBread_fields_name
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBread_fields_name
+     *
+     *-------------------------------------------------------------------------
+     */
     HL_TESTING2("reading fields by name");
 
     /*-------------------------------------------------------------------------
-    * write and read the "Pressure" field
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
-        if (H5TBmake_table(TITLE,fid,"table10",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill1,compress,0)<0)
+     * write and read the "Pressure" field
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
+        if (H5TBmake_table(TITLE, fid, "table10", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill1, compress, 0) < 0)
             goto out;
 
         /* write the pressure field to all the records */
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBwrite_fields_name(fid,"table10","Pressure",start,nrecords,
-            sizeof( float ),0,field_sizes_pre,pressure_in)<0)
+        if (H5TBwrite_fields_name(fid, "table10", "Pressure", start, nrecords, sizeof(float), 0,
+                                  field_sizes_pre, pressure_in) < 0)
             goto out;
     }
 
@@ -1186,170 +1070,149 @@ static int test_table(hid_t fid, int do_write)
     nrecords = NRECORDS;
 
     /* read an invalid field, should fail */
-    if ( H5TBread_fields_name(fid,"table10","DoesNotExist",start,nrecords,
-        sizeof(float),0,field_sizes_pre,pressure_out) >=0)
-      goto out;
+    if (H5TBread_fields_name(fid, "table10", "DoesNotExist", start, nrecords, sizeof(float), 0,
+                             field_sizes_pre, pressure_out) >= 0)
+        goto out;
 
     /* read the "Pressure" field */
-    if ( H5TBread_fields_name(fid,"table10","Pressure",start,nrecords,
-        sizeof(float),0,field_sizes_pre,pressure_out)<0)
+    if (H5TBread_fields_name(fid, "table10", "Pressure", start, nrecords, sizeof(float), 0, field_sizes_pre,
+                             pressure_out) < 0)
         goto out;
 
     /* Compare the extracted table with the initial values */
-    for ( i = 0; i < NRECORDS; i++ )
-    {
-        if ( !H5_FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
+    for (i = 0; i < NRECORDS; i++) {
+        if (!H5_FLT_ABS_EQUAL(pressure_out[i], pressure_in[i])) {
             goto out;
         }
     }
 
     /*-------------------------------------------------------------------------
-    * Write and read the "Latitude,Longitude" fields
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     * Write and read the "Latitude,Longitude" fields
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         /* Write the new longitude and latitude information to all the records */
         start    = 0;
         nrecords = NRECORDS_ADD;
-        if ( H5TBwrite_fields_name(fid,"table10", "Latitude,Longitude", start, nrecords,
-            sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+        if (H5TBwrite_fields_name(fid, "table10", "Latitude,Longitude", start, nrecords, sizeof(position_t),
+                                  field_offset_pos, field_sizes_pos, position_in) < 0)
             goto out;
-    }/*write*/
+    } /*write*/
 
     /* Read the "Latitude,Longitude" fields */
     start    = 0;
     nrecords = NRECORDS_ADD;
-    if ( H5TBread_fields_name( fid, "table10", "Latitude,Longitude",
-        start, nrecords, sizeof(position_t), field_offset_pos, field_sizes_pos, position_out ) < 0 )
+    if (H5TBread_fields_name(fid, "table10", "Latitude,Longitude", start, nrecords, sizeof(position_t),
+                             field_offset_pos, field_sizes_pos, position_out) < 0)
         goto out;
 
-
     /* Compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS_ADD; i++ )
-    {
-        if ( position_out[i].lati  != position_in[i].lati ||
-            position_out[i].longi != position_in[i].longi )
+    for (i = 0; i < NRECORDS_ADD; i++) {
+        if (position_out[i].lati != position_in[i].lati || position_out[i].longi != position_in[i].longi)
             goto out;
     }
 
-
     /*-------------------------------------------------------------------------
-    * Write and read the "Name,Pressure" fields
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     * Write and read the "Name,Pressure" fields
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         /* Write the new name and pressure information to all the records */
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBwrite_fields_name( fid, "table10", "Name,Pressure", start, nrecords,
-            sizeof( namepressure_t ), field_offset_namepre, field_sizes_namepre, namepre_in  ) < 0 )
+        if (H5TBwrite_fields_name(fid, "table10", "Name,Pressure", start, nrecords, sizeof(namepressure_t),
+                                  field_offset_namepre, field_sizes_namepre, namepre_in) < 0)
             goto out;
-    }/*write*/
+    } /*write*/
 
     /* Read the "Name,Pressure" fields */
     start    = 0;
     nrecords = NRECORDS;
-    if ( H5TBread_fields_name( fid, "table10", "Name,Pressure",
-        start, nrecords, sizeof(namepressure_t), field_offset_namepre, field_sizes_namepre,
-        namepre_out ) < 0 )
+    if (H5TBread_fields_name(fid, "table10", "Name,Pressure", start, nrecords, sizeof(namepressure_t),
+                             field_offset_namepre, field_sizes_namepre, namepre_out) < 0)
         goto out;
 
-
     /* Compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-        if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
-                goto out;
+    for (i = 0; i < NRECORDS; i++) {
+        if ((HDstrcmp(namepre_out[i].name, namepre_in[i].name) != 0) ||
+            !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[i].pressure)) {
+            goto out;
         }
     }
 
     /* reset buffer */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-        HDstrcpy( namepre_out[i].name,  "\0" );
+    for (i = 0; i < NRECORDS; i++) {
+        HDstrcpy(namepre_out[i].name, "\0");
         namepre_out[i].pressure = -1;
     }
 
     /*-------------------------------------------------------------------------
-    * read only 3 records of the "Name,Pressure" fields, starting at record 2
-    *-------------------------------------------------------------------------
-    */
+     * read only 3 records of the "Name,Pressure" fields, starting at record 2
+     *-------------------------------------------------------------------------
+     */
     start    = 2;
     nrecords = 3;
-    if ( H5TBread_fields_name( fid, "table10", "Name,Pressure",
-        start, nrecords, sizeof(namepressure_t), field_offset_namepre,
-        field_sizes_namepre, namepre_out ) < 0 )
+    if (H5TBread_fields_name(fid, "table10", "Name,Pressure", start, nrecords, sizeof(namepressure_t),
+                             field_offset_namepre, field_sizes_namepre, namepre_out) < 0)
         goto out;
 
-
     /* Compare the extracted table with the initial values */
-    for( i = 0; i < 3; i++ )
-    {
+    for (i = 0; i < 3; i++) {
         hsize_t iistart = start;
-        if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[iistart+i].name ) != 0 ) ||
-        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart+i].pressure) ) {
-                goto out;
+        if ((HDstrcmp(namepre_out[i].name, namepre_in[iistart + i].name) != 0) ||
+            !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart + i].pressure)) {
+            goto out;
         }
     }
 
-
-
     PASSED();
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBwrite_fields_index
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBwrite_fields_index
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("writing fields by index");
 
         /* make an empty table */
-        if (H5TBmake_table(TITLE,fid,"table11",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,NULL)<0)
+        if (H5TBmake_table(TITLE, fid, "table11", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, NULL) < 0)
             goto out;
 
         /* write the pressure field starting at record 2 */
         nfields  = 1;
         start    = 2;
         nrecords = NRECORDS_ADD;
-        if ( H5TBwrite_fields_index(fid, "table11", nfields, field_index_pre, start, nrecords,
-            sizeof( float ), 0, field_sizes_pre, pressure_in  ) < 0 )
+        if (H5TBwrite_fields_index(fid, "table11", nfields, field_index_pre, start, nrecords, sizeof(float),
+                                   0, field_sizes_pre, pressure_in) < 0)
             goto out;
 
-
         /* write the new longitude and latitude information starting at record 2  */
         nfields  = 2;
         start    = 2;
         nrecords = NRECORDS_ADD;
-        if ( H5TBwrite_fields_index(fid, "table11", nfields, field_index_pos, start, nrecords,
-            sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+        if (H5TBwrite_fields_index(fid, "table11", nfields, field_index_pos, start, nrecords,
+                                   sizeof(position_t), field_offset_pos, field_sizes_pos, position_in) < 0)
             goto out;
 
         /* read back the all table */
         nfields  = 5;
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBread_fields_index(fid, "table11", nfields, field_index,
-            start, nrecords, type_size_mem, field_offset, field_size, rbuf ) < 0 )
+        if (H5TBread_fields_index(fid, "table11", nfields, field_index, start, nrecords, type_size_mem,
+                                  field_offset, field_size, rbuf) < 0)
             goto out;
 
         /* Compare the extracted table with the initial values */
-        for( i = 0; i < NRECORDS; i++ )
-        {
-            if ( i >= 2 && i <= 4 )
-            {
-                if ( rbuf[i].lati        != position_in[i-NRECORDS_ADD+1].lati ||
-                    rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-            !H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
+        for (i = 0; i < NRECORDS; i++) {
+            if (i >= 2 && i <= 4) {
+                if (rbuf[i].lati != position_in[i - NRECORDS_ADD + 1].lati ||
+                    rbuf[i].longi != position_in[i - NRECORDS_ADD + 1].longi ||
+                    !H5_FLT_ABS_EQUAL(rbuf[i].pressure, pressure_in[i - NRECORDS_ADD + 1]))
                     goto out;
             }
         }
@@ -1357,37 +1220,34 @@ static int test_table(hid_t fid, int do_write)
         PASSED();
     }
 
-
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBread_fields_index
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBread_fields_index
+     *
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("reading fields by index");
 
-    if (do_write)
-    {
+    if (do_write) {
         /* make an empty table */
-        if (H5TBmake_table(TITLE,fid,"table12",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,NULL)<0)
+        if (H5TBmake_table(TITLE, fid, "table12", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, NULL) < 0)
             goto out;
 
         /*-------------------------------------------------------------------------
-        * write and read the "Pressure" field
-        *-------------------------------------------------------------------------
-        */
+         * write and read the "Pressure" field
+         *-------------------------------------------------------------------------
+         */
 
         /* write the pressure field to all the records */
         nfields  = 1;
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_pre, start, nrecords,
-            sizeof( float ), 0, field_sizes_pre, pressure_in  ) < 0 )
+        if (H5TBwrite_fields_index(fid, "table12", nfields, field_index_pre, start, nrecords, sizeof(float),
+                                   0, field_sizes_pre, pressure_in) < 0)
             goto out;
     }
 
@@ -1395,196 +1255,178 @@ static int test_table(hid_t fid, int do_write)
     nfields  = 1;
     start    = 0;
     nrecords = NRECORDS;
-    if ( H5TBread_fields_index(fid, "table12", nfields, field_index_pre,
-        start, nrecords, sizeof(float), 0, field_sizes_pre, pressure_out ) < 0 )
+    if (H5TBread_fields_index(fid, "table12", nfields, field_index_pre, start, nrecords, sizeof(float), 0,
+                              field_sizes_pre, pressure_out) < 0)
         goto out;
 
     /* compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-      if ( !H5_FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
+    for (i = 0; i < NRECORDS; i++) {
+        if (!H5_FLT_ABS_EQUAL(pressure_out[i], pressure_in[i])) {
             goto out;
         }
     }
 
     /*-------------------------------------------------------------------------
-    * write and read the "Latitude,Longitude" fields
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     * write and read the "Latitude,Longitude" fields
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         /* write the new longitude and latitude information to all the records */
-        nfields = 2;
+        nfields  = 2;
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_pos, start, nrecords,
-            sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+        if (H5TBwrite_fields_index(fid, "table12", nfields, field_index_pos, start, nrecords,
+                                   sizeof(position_t), field_offset_pos, field_sizes_pos, position_in) < 0)
             goto out;
     } /*write*/
 
     /* read the "Latitude,Longitude" fields */
-    nfields = 2;
+    nfields  = 2;
     start    = 0;
     nrecords = NRECORDS_ADD;
-    if ( H5TBread_fields_index(fid, "table12", nfields, field_index_pos,
-        start, nrecords, sizeof(position_t), field_offset_pos, field_sizes_pos, position_out ) < 0 )
+    if (H5TBread_fields_index(fid, "table12", nfields, field_index_pos, start, nrecords, sizeof(position_t),
+                              field_offset_pos, field_sizes_pos, position_out) < 0)
         goto out;
 
     /* compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS_ADD; i++ )
-    {
-        if ( position_out[i].lati  != position_in[i].lati ||
-            position_out[i].longi != position_in[i].longi ) {
-                goto out;
+    for (i = 0; i < NRECORDS_ADD; i++) {
+        if (position_out[i].lati != position_in[i].lati || position_out[i].longi != position_in[i].longi) {
+            goto out;
         }
     }
 
     /*-------------------------------------------------------------------------
-    * write and read the "Name,Pressure" fields
-    *-------------------------------------------------------------------------
-    */
+     * write and read the "Name,Pressure" fields
+     *-------------------------------------------------------------------------
+     */
 
-    if (do_write)
-    {
+    if (do_write) {
         /* write the new name and pressure information to all the records */
-        nfields = 2;
+        nfields  = 2;
         start    = 0;
         nrecords = NRECORDS;
-        if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_namepre, start, nrecords,
-            sizeof( namepressure_t ), field_offset_namepre, field_sizes_namepre, namepre_in  ) < 0 )
+        if (H5TBwrite_fields_index(fid, "table12", nfields, field_index_namepre, start, nrecords,
+                                   sizeof(namepressure_t), field_offset_namepre, field_sizes_namepre,
+                                   namepre_in) < 0)
             goto out;
     }
 
     /* read the "Name,Pressure" fields */
-    nfields = 2;
+    nfields  = 2;
     start    = 0;
     nrecords = NRECORDS;
-    if ( H5TBread_fields_index(fid, "table12", nfields, field_index_namepre,
-        start, nrecords, sizeof(namepressure_t), field_offset_namepre,
-        field_sizes_namepre, namepre_out ) < 0 )
+    if (H5TBread_fields_index(fid, "table12", nfields, field_index_namepre, start, nrecords,
+                              sizeof(namepressure_t), field_offset_namepre, field_sizes_namepre,
+                              namepre_out) < 0)
         goto out;
 
     /* compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-      if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-    !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
-    goto out;
-      }
+    for (i = 0; i < NRECORDS; i++) {
+        if ((HDstrcmp(namepre_out[i].name, namepre_in[i].name) != 0) ||
+            !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[i].pressure)) {
+            goto out;
+        }
     }
 
     /* reset buffer */
-    for( i = 0; i < NRECORDS; i++ )
-    {
-        HDstrcpy( namepre_out[i].name,  "\0" );
+    for (i = 0; i < NRECORDS; i++) {
+        HDstrcpy(namepre_out[i].name, "\0");
         namepre_out[i].pressure = -1;
     }
 
     /*-------------------------------------------------------------------------
-    * read only 3 records of the "Name,Pressure" fields, starting at record 2
-    *-------------------------------------------------------------------------
-    */
+     * read only 3 records of the "Name,Pressure" fields, starting at record 2
+     *-------------------------------------------------------------------------
+     */
 
     /* write the new name and pressure information to all the records */
     nfields  = 2;
     start    = 2;
     nrecords = 3;
-    if ( H5TBread_fields_index(fid, "table12", nfields, field_index_namepre,
-        start, nrecords, sizeof(namepressure_t), field_offset_namepre,
-        field_sizes_namepre, namepre_out ) < 0 )
+    if (H5TBread_fields_index(fid, "table12", nfields, field_index_namepre, start, nrecords,
+                              sizeof(namepressure_t), field_offset_namepre, field_sizes_namepre,
+                              namepre_out) < 0)
         goto out;
 
     /* compare the extracted table with the initial values */
-    for( i = 0; i < 3; i++ )
-    {
-        int iistart = (int) start;
-        if ( ( HDstrcmp( namepre_out[i].name,  wbuf[iistart+(int)i].name ) != 0 ) ||
-        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart+(int)i].pressure) ) {
-                goto out;
+    for (i = 0; i < 3; i++) {
+        int iistart = (int)start;
+        if ((HDstrcmp(namepre_out[i].name, wbuf[iistart + (int)i].name) != 0) ||
+            !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart + (int)i].pressure)) {
+            goto out;
         }
     }
 
     PASSED();
 
-
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBinsert_field
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBinsert_field
+     *
+     *-------------------------------------------------------------------------
+     */
 
-    if (do_write)
-    {
+    if (do_write) {
         HL_TESTING2("inserting fields");
 
         /* make a table */
-        if (H5TBmake_table(TITLE,fid,"table13",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill1,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table13", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill1, compress, wbuf) < 0)
             goto out;
 
         /* insert the new field at the end of the field list */
         position = NFIELDS;
-        if ( H5TBinsert_field( fid, "table13", "New Field", field_type_new, position,
-            fill1_new, buf_new ) < 0 )
+        if (H5TBinsert_field(fid, "table13", "New Field", field_type_new, position, fill1_new, buf_new) < 0)
             goto out;
 
         /* read the table */
-        if ( H5TBread_table( fid, "table13", dst_size2, dst_offset2, dst_sizes2, rbuf2 ) < 0 )
+        if (H5TBread_table(fid, "table13", dst_size2, dst_offset2, dst_sizes2, rbuf2) < 0)
             goto out;
 
         /* compare the extracted table with the original array */
-        for( i = 0; i < NRECORDS; i++ )
-        {
-            if ( ( HDstrcmp( rbuf2[i].name,  wbuf[i].name ) != 0 ) ||
-                rbuf2[i].lati          != wbuf[i].lati ||
-                rbuf2[i].longi         != wbuf[i].longi ||
-        !H5_FLT_ABS_EQUAL(rbuf2[i].pressure,wbuf[i].pressure) ||
-        !H5_DBL_ABS_EQUAL(rbuf2[i].temperature,wbuf[i].temperature) ||
-                rbuf2[i].new_field     != buf_new[i] ) {
-                    goto out;
+        for (i = 0; i < NRECORDS; i++) {
+            if ((HDstrcmp(rbuf2[i].name, wbuf[i].name) != 0) || rbuf2[i].lati != wbuf[i].lati ||
+                rbuf2[i].longi != wbuf[i].longi || !H5_FLT_ABS_EQUAL(rbuf2[i].pressure, wbuf[i].pressure) ||
+                !H5_DBL_ABS_EQUAL(rbuf2[i].temperature, wbuf[i].temperature) ||
+                rbuf2[i].new_field != buf_new[i]) {
+                goto out;
             }
         }
         PASSED();
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBdelete_field
-    *
-    *-------------------------------------------------------------------------
-    */
-    if (do_write)
-    {
+     *
+     * Functions tested:
+     *
+     * H5TBdelete_field
+     *
+     *-------------------------------------------------------------------------
+     */
+    if (do_write) {
         HL_TESTING2("deleting fields");
 
         /* make a table */
-        if (H5TBmake_table(TITLE,fid,"table14",FIELDS,RECORDS,type_size_mem,
-            field_names,field_offset,field_type,
-            chunk_size,fill,compress,wbuf)<0)
+        if (H5TBmake_table(TITLE, fid, "table14", FIELDS, RECORDS, type_size_mem, field_names, field_offset,
+                           field_type, chunk_size, fill, compress, wbuf) < 0)
             goto out;
 
         /* delete the field */
-        if ( H5TBdelete_field(fid, "table14", "Pressure" ) < 0 )
+        if (H5TBdelete_field(fid, "table14", "Pressure") < 0)
             goto out;
 
         /* read the table */
-        if ( H5TBread_table(fid, "table14", dst_size3, dst_offset3, dst_sizes3, rbuf3 ) < 0 )
+        if (H5TBread_table(fid, "table14", dst_size3, dst_offset3, dst_sizes3, rbuf3) < 0)
             goto out;
 
         /* compare the extracted table with the original array */
-        for( i = 0; i < NRECORDS; i++ )
-        {
-            if ( ( HDstrcmp( rbuf3[i].name, wbuf[i].name ) != 0 ) ||
-                rbuf3[i].lati != wbuf[i].lati ||
+        for (i = 0; i < NRECORDS; i++) {
+            if ((HDstrcmp(rbuf3[i].name, wbuf[i].name) != 0) || rbuf3[i].lati != wbuf[i].lati ||
                 rbuf3[i].longi != wbuf[i].longi ||
-        !H5_DBL_ABS_EQUAL(rbuf3[i].temperature,wbuf[i].temperature) ) {
-                    goto out;
+                !H5_DBL_ABS_EQUAL(rbuf3[i].temperature, wbuf[i].temperature)) {
+                goto out;
             }
         }
 
@@ -1592,143 +1434,140 @@ static int test_table(hid_t fid, int do_write)
     }
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBget_table_info
-    * H5TBget_field_info
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBget_table_info
+     * H5TBget_field_info
+     *
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("getting table info");
 
     /* get table info  */
-    if ( H5TBget_table_info (fid, "table1", &rfields, &rrecords ) < 0 )
+    if (H5TBget_table_info(fid, "table1", &rfields, &rrecords) < 0)
         goto out;
 
-    if ( NFIELDS != rfields || rrecords != NRECORDS  ) {
+    if (NFIELDS != rfields || rrecords != NRECORDS) {
         goto out;
     }
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    *
-    * Functions tested:
-    *
-    * H5TBget_field_info
-    *
-    *-------------------------------------------------------------------------
-    */
+     *
+     * Functions tested:
+     *
+     * H5TBget_field_info
+     *
+     *-------------------------------------------------------------------------
+     */
 
     HL_TESTING2("getting field info");
 
     /* alocate */
-    names_out = (char**) HDmalloc( sizeof(char*) * (size_t)NFIELDS );
-    for ( i = 0; i < NFIELDS; i++)
-    {
-        names_out[i] = (char*) HDmalloc( sizeof(char) * 255 );
+    names_out = (char **)HDmalloc(sizeof(char *) * (size_t)NFIELDS);
+    for (i = 0; i < NFIELDS; i++) {
+        names_out[i] = (char *)HDmalloc(sizeof(char) * 255);
     }
 
     /* Get field info */
-    if ( H5TBget_field_info(fid, "table1", names_out, sizes_out, offset_out, &size_out ) < 0 )
+    if (H5TBget_field_info(fid, "table1", names_out, sizes_out, offset_out, &size_out) < 0)
         goto out;
 
-    for ( i = 0; i < NFIELDS; i++)
-    {
-        if ( (HDstrcmp( field_names[i], names_out[i] ) != 0)) {
+    for (i = 0; i < NFIELDS; i++) {
+        if ((HDstrcmp(field_names[i], names_out[i]) != 0)) {
             goto out;
         }
     }
 
     /* release */
-    for ( i = 0; i < NFIELDS; i++)
-    {
-        HDfree ( names_out[i] );
+    for (i = 0; i < NFIELDS; i++) {
+        HDfree(names_out[i]);
     }
-    HDfree ( names_out );
+    HDfree(names_out);
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * end
-    *-------------------------------------------------------------------------
-    */
+     * end
+     *-------------------------------------------------------------------------
+     */
     return 0;
 out:
     H5_FAILED();
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* the main program
-*-------------------------------------------------------------------------
-*/
+ * the main program
+ *-------------------------------------------------------------------------
+ */
 
-int main(void)
+int
+main(void)
 {
-    hid_t    fid;  /* identifier for the file */
-    unsigned flags=H5F_ACC_RDONLY;
+    hid_t    fid; /* identifier for the file */
+    unsigned flags = H5F_ACC_RDONLY;
 
     /*-------------------------------------------------------------------------
-    * test1: create a file for the write/read test
-    *-------------------------------------------------------------------------
-    */
+     * test1: create a file for the write/read test
+     *-------------------------------------------------------------------------
+     */
 
     /* create a file using default properties */
-    fid=H5Fcreate("test_table.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+    fid = H5Fcreate("test_table.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     HDputs("Testing table with file creation mode (read/write in native architecture):");
 
     /* test, do write */
-    if (test_table(fid,1)<0)
+    if (test_table(fid, 1) < 0)
         goto out;
 
     /* close */
     H5Fclose(fid);
 
     /*-------------------------------------------------------------------------
-    * test2: open a file written in test1 on a big-endian machine
-    *-------------------------------------------------------------------------
-    */
+     * test2: open a file written in test1 on a big-endian machine
+     *-------------------------------------------------------------------------
+     */
     HDputs("Testing table with file open mode (read big-endian data):");
 
-    fid=h5file_open(TEST_FILE_BE,flags);
+    fid = h5file_open(TEST_FILE_BE, flags);
 
     /* test, do not write */
-    if (test_table(fid,0)<0)
+    if (test_table(fid, 0) < 0)
         goto out;
 
     /* close */
     H5Fclose(fid);
 
     /*-------------------------------------------------------------------------
-    * test3: open a file written in test1 on a little-endian machine
-    *-------------------------------------------------------------------------
-    */
+     * test3: open a file written in test1 on a little-endian machine
+     *-------------------------------------------------------------------------
+     */
     HDputs("Testing table with file open mode (read little-endian data):");
 
-    fid=h5file_open(TEST_FILE_LE,flags);
+    fid = h5file_open(TEST_FILE_LE, flags);
 
     /* test, do not write */
-    if (test_table(fid,0)<0)
+    if (test_table(fid, 0) < 0)
         goto out;
 
     /* close */
     H5Fclose(fid);
 
     /*-------------------------------------------------------------------------
-    * test4: open a file written in test1 on the Cray T3 machine
-    *-------------------------------------------------------------------------
-    */
+     * test4: open a file written in test1 on the Cray T3 machine
+     *-------------------------------------------------------------------------
+     */
     HDputs("Testing table with file open mode (read Cray data):");
 
-    fid=h5file_open(TEST_FILE_CRAY,flags);
+    fid = h5file_open(TEST_FILE_CRAY, flags);
 
     /* test, do not write */
-    if (test_table(fid,0)<0)
+    if (test_table(fid, 0) < 0)
         goto out;
 
     /* close */
@@ -1739,5 +1578,3 @@ out:
     H5Fclose(fid);
     return 1;
 }
-
-
diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c
index 8cd8a8e..9df843a 100644
--- a/hl/tools/gif2h5/decompress.c
+++ b/hl/tools/gif2h5/decompress.c
@@ -15,45 +15,43 @@
 
 #include "gif.h"
 
-GIFWORD iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip;
-unsigned long  cols[256];
-char *cmd;
+GIFWORD       iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip;
+unsigned long cols[256];
+char *        cmd;
 
 FILE *fp;
 
-static GIFWORD
-    XC = 0, YC = 0,         /* Output X and Y coords of current pixel       */
-    InitCodeSize,           /* Starting code size, used during Clear        */
-    CodeSize,               /* Code size, read from GIF header              */
-    BytesPerScanline,       /* Bytes per scanline in output raster          */
-    IWidth, IHeight;        /* image dimensions                             */
-static int
-    BitOffset = 0,          /* Bit Offset of next code                      */
-    Pass = 0,               /* Used by output routine if GIFWORDerlaced pic    */
-    OutCount = 0,           /* Decompressor output 'stack count'            */
-    Code,                   /* Value returned by ReadCode                   */
-    MaxCode,                /* limiting value for current code size         */
-    ClearCode,              /* GIF clear code                               */
-    EOFCode,                /* GIF end-of-information code                  */
-    CurCode, OldCode, InCode,   /* Decompressor variables                   */
-    FirstFree,              /* First free code, generated per GIF spec      */
-    FreeCode,               /* Decompressor, next free slot in hash table   */
-    FinChar,                /* Decompressor variable                        */
-    DataMask,               /* AND mask for data size                       */
-    ReadMask;               /* Code AND mask for current code size          */
+static GIFWORD XC = 0, YC = 0, /* Output X and Y coords of current pixel       */
+    InitCodeSize,              /* Starting code size, used during Clear        */
+    CodeSize,                  /* Code size, read from GIF header              */
+    BytesPerScanline,          /* Bytes per scanline in output raster          */
+    IWidth, IHeight;           /* image dimensions                             */
+static int BitOffset = 0,      /* Bit Offset of next code                      */
+    Pass             = 0,      /* Used by output routine if GIFWORDerlaced pic    */
+    OutCount         = 0,      /* Decompressor output 'stack count'            */
+    Code,                      /* Value returned by ReadCode                   */
+    MaxCode,                   /* limiting value for current code size         */
+    ClearCode,                 /* GIF clear code                               */
+    EOFCode,                   /* GIF end-of-information code                  */
+    CurCode, OldCode, InCode,  /* Decompressor variables                   */
+    FirstFree,                 /* First free code, generated per GIF spec      */
+    FreeCode,                  /* Decompressor, next free slot in hash table   */
+    FinChar,                   /* Decompressor variable                        */
+    DataMask,                  /* AND mask for data size                       */
+    ReadMask;                  /* Code AND mask for current code size          */
 
 /*MODIFICATIONS*/
-GIFBYTE tempbyte[10];
-GIFBYTE * tempGIFBYTEptr[10];
-GIFWORD tempint[10];
-GIFWORD ImageCount = 0;
+GIFBYTE  tempbyte[10];
+GIFBYTE *tempGIFBYTEptr[10];
+GIFWORD  tempint[10];
+GIFWORD  ImageCount = 0;
 /*END MODIFICATION*/
 
 boolean Interlace, HasColormap;
 
-GIFBYTE *Image;                /* The result array                             */
-GIFBYTE *RawGIF;               /* The heap array to hold it, raw               */
-GIFBYTE *Raster;               /* The raster data stream, unblocked            */
+GIFBYTE *Image;  /* The result array                             */
+GIFBYTE *RawGIF; /* The heap array to hold it, raw               */
+GIFBYTE *Raster; /* The raster data stream, unblocked            */
 
 /* The hash table used by the decompressor */
 
@@ -66,7 +64,7 @@ int OutCode[1025];
 
 /* The color map, read from the GIF header */
 
-int  numused;
+int numused;
 
 /*
  * Fetch the next code from the raster data stream.  The codes can be any
@@ -82,7 +80,7 @@ ReadCode(void)
     int RawCode, ByteOffset;
 
     ByteOffset = BitOffset / 8;
-    RawCode = Raster[ByteOffset] + (0x100 * Raster[ByteOffset + 1]);
+    RawCode    = Raster[ByteOffset] + (0x100 * Raster[ByteOffset + 1]);
 
     if (CodeSize >= 8)
         RawCode += (0x10000 * Raster[ByteOffset + 2]);
@@ -95,10 +93,8 @@ ReadCode(void)
 static void
 AddToPixel(GIFBYTE Index)
 {
-    if (YC<IHeight)
-    *(Image + YC * BytesPerScanline + XC) = Index;
-
-
+    if (YC < IHeight)
+        *(Image + YC * BytesPerScanline + XC) = Index;
 
     /* Update the X-coordinate, and if it overflows, update the
      * Y-coordinate */
@@ -113,40 +109,41 @@ AddToPixel(GIFBYTE Index)
 
         if (!Interlace) {
             YC++;
-        } else {
+        }
+        else {
             switch (Pass) {
-            case 0:
-                YC += 8;
-
-                if (YC >= IHeight) {
-                    Pass++;
-                    YC = 4;
-                }
-
-                break;
-            case 1:
-                YC += 8;
-
-                if (YC >= IHeight) {
-                    Pass++;
-                    YC = 2;
-                }
-
-                break;
-            case 2:
-                YC += 4;
-
-                if (YC >= IHeight) {
-                    Pass++;
-                    YC = 1;
-                }
-
-                break;
-            case 3:
-                YC += 2;
-                break;
-            default:
-                break;
+                case 0:
+                    YC += 8;
+
+                    if (YC >= IHeight) {
+                        Pass++;
+                        YC = 4;
+                    }
+
+                    break;
+                case 1:
+                    YC += 8;
+
+                    if (YC >= IHeight) {
+                        Pass++;
+                        YC = 2;
+                    }
+
+                    break;
+                case 2:
+                    YC += 4;
+
+                    if (YC >= IHeight) {
+                        Pass++;
+                        YC = 1;
+                    }
+
+                    break;
+                case 3:
+                    YC += 2;
+                    break;
+                default:
+                    break;
             }
         }
     }
@@ -159,20 +156,20 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
 {
     int i;
 
-    XC = 0;
-    YC = 0;
-    Pass = 0;
-    OutCount = 0;
+    XC        = 0;
+    YC        = 0;
+    Pass      = 0;
+    OutCount  = 0;
     BitOffset = 0;
 
-    DataMask = (1 << ((GifHead->PackedField & 0x07) +1)) -1;
-    Raster = GifImageDesc->GIFImage;
+    DataMask = (1 << ((GifHead->PackedField & 0x07) + 1)) - 1;
+    Raster   = GifImageDesc->GIFImage;
 
     /* Check for image seperator */
 
     /* Now read in values from the image descriptor */
-    IWidth = GifImageDesc->ImageWidth;
-    IHeight = GifImageDesc->ImageHeight;
+    IWidth    = GifImageDesc->ImageWidth;
+    IHeight   = GifImageDesc->ImageHeight;
     Interlace = (uint8_t)(GifImageDesc->PackedField & 0x40);
 
     /*
@@ -187,9 +184,9 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
      * compute decompressor constant values, based on this code size.
      */
 
-    CodeSize = GifImageDesc->CodeSize;
+    CodeSize  = GifImageDesc->CodeSize;
     ClearCode = (1 << CodeSize);
-    EOFCode = ClearCode + 1;
+    EOFCode   = ClearCode + 1;
     FreeCode = FirstFree = ClearCode + 2;
 
     /*
@@ -201,8 +198,8 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
 
     CodeSize++;
     InitCodeSize = CodeSize;
-    MaxCode = (1 << CodeSize);
-    ReadMask = MaxCode - 1;
+    MaxCode      = (1 << CodeSize);
+    ReadMask     = MaxCode - 1;
 
     /*
      * Read the raster data.  Here we just transpose it from the GIF array to
@@ -212,7 +209,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
 
     /* Allocate the Image */
 
-    if (!(Image = (GIFBYTE *)malloc((size_t)IWidth*(size_t)IHeight))) {
+    if (!(Image = (GIFBYTE *)malloc((size_t)IWidth * (size_t)IHeight))) {
         printf("Out of memory");
         exit(EXIT_FAILURE);
     }
@@ -233,13 +230,14 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
          */
         if (Code == ClearCode) {
             CodeSize = InitCodeSize;
-            MaxCode = (1 << CodeSize);
+            MaxCode  = (1 << CodeSize);
             ReadMask = MaxCode - 1;
             FreeCode = FirstFree;
             CurCode = OldCode = Code = ReadCode();
-            FinChar = CurCode & DataMask;
+            FinChar                  = CurCode & DataMask;
             AddToPixel((GIFBYTE)FinChar);
-        } else {
+        }
+        else {
             /*
              * If not a clear code, then must be data: save same as CurCode
              * and InCode
@@ -251,7 +249,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
              * repeat the last character decoded
              */
             if (CurCode >= FreeCode) {
-                CurCode = OldCode;
+                CurCode             = OldCode;
                 OutCode[OutCount++] = FinChar;
             }
 
@@ -266,11 +264,11 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
                 }
 
                 OutCode[OutCount++] = Suffix[CurCode];
-                CurCode = Prefix[CurCode];
+                CurCode             = Prefix[CurCode];
             }
 
             /* The last code in the chain is treated as raw data. */
-            FinChar = CurCode & DataMask;
+            FinChar             = CurCode & DataMask;
             OutCode[OutCount++] = FinChar;
 
             /*
@@ -288,7 +286,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
              */
             Prefix[FreeCode] = OldCode;
             Suffix[FreeCode] = FinChar;
-            OldCode = InCode;
+            OldCode          = InCode;
 
             /*
              * Point to the next slot in the table.  If we exceed the current
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index 0c0f963..cb54b9b 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -16,7 +16,7 @@
  *  Purpose:     GIF Header file
  */
 #ifndef GIF_H_
-#define GIF_H_   1
+#define GIF_H_ 1
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,10 +39,10 @@ typedef unsigned char boolean;
 #endif
 
 #ifndef false
-#define false       0
+#define false 0
 #endif
 #ifndef true
-#define true        1
+#define true 1
 #endif
 
 /* Set the EndianOrder.
@@ -50,7 +50,7 @@ typedef unsigned char boolean;
 ** Set EndianOrder = 0 if machine is little endian
 **     EndianOrder = 1 if machine is big endian.
 */
-extern int  EndianOrder;
+extern int EndianOrder;
 
 /*
 **  The GIF header format.
@@ -59,31 +59,30 @@ extern int  EndianOrder;
 **  descriptor, and the global color table for the GIF image.
 */
 typedef struct _GifHeader { /* Offset   Description                         */
-    GIFBYTE PackedField;       /*  0Ah     Color Information                   */
+    GIFBYTE PackedField;    /*  0Ah     Color Information                   */
     GIFWORD TableSize;
-    GIFBYTE ImageCount;        /* Keep a count of the number of images         */
+    GIFBYTE ImageCount; /* Keep a count of the number of images         */
     GIFBYTE CommentCount;
     GIFBYTE ApplicationCount;
     GIFBYTE PlainTextCount;
     GIFBYTE HDFPalette[256][3];
-    GIFBYTE HeaderDump[6];     /* GIFBYTE array to dump header contents           */
-    GIFBYTE LSDDump[7];        /* Logical Screen Descriptor dump               */
+    GIFBYTE HeaderDump[6]; /* GIFBYTE array to dump header contents           */
+    GIFBYTE LSDDump[7];    /* Logical Screen Descriptor dump               */
 } GIFHEAD;
 
-
 /*
 **  The GIF Image Descriptor.
 */
 typedef struct _GifImageDescriptor {
-    GIFWORD ImageWidth;            /* Width of the image in pixels             */
-    GIFWORD ImageHeight;           /* Height of the image in pixels            */
-    GIFBYTE PackedField;           /* Image and Color Table Data Information   */
+    GIFWORD ImageWidth;  /* Width of the image in pixels             */
+    GIFWORD ImageHeight; /* Height of the image in pixels            */
+    GIFBYTE PackedField; /* Image and Color Table Data Information   */
     GIFWORD TableSize;
-    GIFWORD CodeSize;              /* Minimum LZW CodeSize for image data      */
+    GIFWORD CodeSize; /* Minimum LZW CodeSize for image data      */
     GIFBYTE HDFPalette[256][3];
-    GIFBYTE GIDDump[9];            /* GifImageDescriptor dump                  */
+    GIFBYTE GIDDump[9]; /* GifImageDescriptor dump                  */
 
-    GIFBYTE *Image;                /* Decompressed Raster Image                */
+    GIFBYTE *Image; /* Decompressed Raster Image                */
     GIFBYTE *GIFImage;
 } GIFIMAGEDESC;
 
@@ -91,36 +90,35 @@ typedef struct _GifImageDescriptor {
 **  GIF 89a Graphic Control Extension Block
 */
 typedef struct _GifGraphicControlExtension {
-    GIFBYTE GCEDump[5];            /* Graphic Control Extension Dump           */
+    GIFBYTE GCEDump[5]; /* Graphic Control Extension Dump           */
 } GIFGRAPHICCONTROL;
 
 /*
 **  GIF 89a Plain Text Extension Block
 */
 typedef struct _GifPlainTextExtension {
-    GIFBYTE PTEDump[15];           /* Plain Text Extension Dump                */
-    GIFBYTE *PlainTextData;        /* Plain Text data sub-blocks               */
-    GIFWORD DataSize;
+    GIFBYTE  PTEDump[15];   /* Plain Text Extension Dump                */
+    GIFBYTE *PlainTextData; /* Plain Text data sub-blocks               */
+    GIFWORD  DataSize;
 } GIFPLAINTEXT;
 
-
 /*
 **  GIF 89a Application Extension Block
 */
 typedef struct _GifApplicationExtension {
-    GIFBYTE AEDump[14];            /* Application Extension Dump               */
-    GIFBYTE *ApplicationData;      /* Application data sub-blocks              */
-    GIFWORD DataSize;
+    GIFBYTE  AEDump[14];      /* Application Extension Dump               */
+    GIFBYTE *ApplicationData; /* Application data sub-blocks              */
+    GIFWORD  DataSize;
 } GIFAPPLICATION;
 
 /*
 **  GIF 89a Comment Extension Block
 */
 typedef struct _GifCommentExtension {
-    GIFBYTE CEDump[2];             /* Comment Extension Dump                   */
-    GIFBYTE *CommentData;          /* Comment data sub-blocks                  */
-    GIFWORD DataSize;
-    GIFBYTE Terminator;            /* Block Terminator (always 0)              */
+    GIFBYTE  CEDump[2];   /* Comment Extension Dump                   */
+    GIFBYTE *CommentData; /* Comment data sub-blocks                  */
+    GIFWORD  DataSize;
+    GIFBYTE  Terminator; /* Block Terminator (always 0)              */
 } GIFCOMMENT;
 
 /*
@@ -135,12 +133,12 @@ typedef struct _GifCommentExtension {
 **           extension.
 */
 typedef struct _GifToMem {
-    GIFHEAD            *GifHeader;
-    GIFIMAGEDESC      **GifImageDesc;
+    GIFHEAD *           GifHeader;
+    GIFIMAGEDESC **     GifImageDesc;
     GIFGRAPHICCONTROL **GifGraphicControlExtension;
-    GIFPLAINTEXT      **GifPlainTextExtension;
-    GIFAPPLICATION    **GifApplicationExtension;
-    GIFCOMMENT        **GifCommentExtension;
+    GIFPLAINTEXT **     GifPlainTextExtension;
+    GIFAPPLICATION **   GifApplicationExtension;
+    GIFCOMMENT **       GifCommentExtension;
 } GIFTOMEM;
 
 /*
@@ -159,12 +157,11 @@ int ReadGifApplication(GIFAPPLICATION *, GIFBYTE **);
 int ReadGifComment(GIFCOMMENT *, GIFBYTE **);
 
 /* HDFGIFWR.C */
-int hdfWriteGIF(FILE *fp, GIFBYTE *pic, int ptype, int w, int h, GIFBYTE *rmap,
-                GIFBYTE *gmap, GIFBYTE *bmap, GIFBYTE *pc2ncmap, int numcols,
-                int colorstyle, int BitsPerPixel);
+int hdfWriteGIF(FILE *fp, GIFBYTE *pic, int ptype, int w, int h, GIFBYTE *rmap, GIFBYTE *gmap, GIFBYTE *bmap,
+                GIFBYTE *pc2ncmap, int numcols, int colorstyle, int BitsPerPixel);
 
 /* WRITEHDF.C */
-int WriteHDF(GIFTOMEM , GIFCHAR * );
+int WriteHDF(GIFTOMEM, GIFCHAR *);
 
 /* Function:    ReadHDF
 ** Return:      0 on completion without error, -1 on error
@@ -175,13 +172,13 @@ int WriteHDF(GIFTOMEM , GIFCHAR * );
 **              GIFBYTE  palette[256][3] - the corresponding palette
 **              hsize_t* image_size - the size of each dimension of the image
 */
-int ReadHDF(GIFBYTE** data, GIFBYTE palette[256][3], hsize_t *image_size,
-            GIFCHAR *h5_file, GIFCHAR *dset_name, GIFCHAR *pal_name);
+int ReadHDF(GIFBYTE **data, GIFBYTE palette[256][3], hsize_t *image_size, GIFCHAR *h5_file,
+            GIFCHAR *dset_name, GIFCHAR *pal_name);
 
 GIFBYTE *Decompress(GIFIMAGEDESC *, GIFHEAD *);
-GIFBYTE GetByte(GIFBYTE *);
-GIFWORD GetWord(GIFBYTE *);
+GIFBYTE  GetByte(GIFBYTE *);
+GIFWORD  GetWord(GIFBYTE *);
 
-void cleanup(GIFBYTE*);
+void cleanup(GIFBYTE *);
 
-#endif  /* GIF_H_ */
+#endif /* GIF_H_ */
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 051ff56..939844c 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -18,11 +18,10 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-
 int
-main(int argv , char *argc[])
+main(int argv, char *argc[])
 {
-    GIFTOMEM GifMemoryStruct;
+    GIFTOMEM     GifMemoryStruct;
     GIFIMAGEDESC gifImageDesc;
 
     FILE *fpGif;
@@ -51,11 +50,9 @@ main(int argv , char *argc[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    if ( argc[1] && (strcmp("-V",argc[1])==0) )
-    {
+    if (argc[1] && (strcmp("-V", argc[1]) == 0)) {
         print_version("gif2h5");
         exit(EXIT_SUCCESS);
-
     }
 
     if (argv < 3) {
@@ -68,15 +65,15 @@ main(int argv , char *argc[])
     GIFFileName = argc[1];
     HDFFileName = argc[2];
 
-    if (!(fpGif = fopen(GIFFileName,"rb"))) {
+    if (!(fpGif = fopen(GIFFileName, "rb"))) {
         printf("Unable to open GIF file for reading.\n");
         exit(EXIT_FAILURE);
     }
 
     /* Get the whole file into memory. Mem's much faster than I/O */
-    fseek(fpGif, 0L , 2);
+    fseek(fpGif, 0L, 2);
     filesize = ftell(fpGif);
-    fseek(fpGif, 0L , 0);
+    fseek(fpGif, 0L, 0);
 
     if (filesize == 0)
         printf("File Size Zero");
@@ -86,12 +83,12 @@ main(int argv , char *argc[])
         exit(EXIT_FAILURE);
     }
 
-    if (fread(MemGif,(size_t)filesize,1,fpGif) != 1) {
+    if (fread(MemGif, (size_t)filesize, 1, fpGif) != 1) {
         printf("Corrupted Input File");
         exit(EXIT_FAILURE);
     }
 
-    fseek(fpGif,0L,0);
+    fseek(fpGif, 0L, 0);
 
     /*
      * Call Gif2Mem and break the whole file into parts.  Gif2Mem also calls
@@ -100,8 +97,8 @@ main(int argv , char *argc[])
     Gif2Mem(MemGif, &GifMemoryStruct);
 
     if (ferror(fpGif)) {
-            printf("File Stream Error\n\n");
-            exit(EXIT_FAILURE);
+        printf("File Stream Error\n\n");
+        exit(EXIT_FAILURE);
     }
 
     fclose(fpGif);
@@ -110,54 +107,47 @@ main(int argv , char *argc[])
      * Call WriteHDF from here. Go ahead and change WriteHDF to write whatever
      * format you want
      */
-    if (WriteHDF(GifMemoryStruct , HDFFileName))
+    if (WriteHDF(GifMemoryStruct, HDFFileName))
         printf("HDF Write Error\n\n");
 
     /* Free all buffers */
     /* replacing int32 with long */
     ImageCount = (long)((GifMemoryStruct.GifHeader)->ImageCount);
 
-    for(i = 0; i < ImageCount ; i++) {
+    for (i = 0; i < ImageCount; i++) {
         gifImageDesc = *(GifMemoryStruct.GifImageDesc[i]);
 
         if (gifImageDesc.Image != NULL)
             free(gifImageDesc.Image);
 
-        if (GifMemoryStruct.GifImageDesc[i] != NULL)
-        {
+        if (GifMemoryStruct.GifImageDesc[i] != NULL) {
             free(GifMemoryStruct.GifImageDesc[i]);
             GifMemoryStruct.GifImageDesc[i] = NULL;
         }
 
-        if (GifMemoryStruct.GifGraphicControlExtension[i] != NULL)
-        {
+        if (GifMemoryStruct.GifGraphicControlExtension[i] != NULL) {
             free(GifMemoryStruct.GifGraphicControlExtension[i]);
             GifMemoryStruct.GifGraphicControlExtension[i] = NULL;
         }
     }
 
     free(StartPos);
-    if (GifMemoryStruct.GifHeader != NULL)
-    {
+    if (GifMemoryStruct.GifHeader != NULL) {
         free(GifMemoryStruct.GifHeader);
         GifMemoryStruct.GifHeader = NULL;
     }
-    if (GifMemoryStruct.GifApplicationExtension != NULL)
-    {
+    if (GifMemoryStruct.GifApplicationExtension != NULL) {
         free(GifMemoryStruct.GifApplicationExtension);
         GifMemoryStruct.GifApplicationExtension = NULL;
     }
-    if (GifMemoryStruct.GifImageDesc != NULL)
-    {
+    if (GifMemoryStruct.GifImageDesc != NULL) {
         free(GifMemoryStruct.GifImageDesc);
         GifMemoryStruct.GifImageDesc = NULL;
     }
-    if (GifMemoryStruct.GifGraphicControlExtension != NULL)
-    {
+    if (GifMemoryStruct.GifGraphicControlExtension != NULL) {
         free(GifMemoryStruct.GifGraphicControlExtension);
         GifMemoryStruct.GifGraphicControlExtension = NULL;
     }
 
-
     return EXIT_SUCCESS;
 }
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index ae0a113..b1ea718 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -42,29 +42,29 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
      * The gif structure outline for passing data to memory is given in gif.h.
      * These pointers are redunant, should take them out in ver. 2
      */
-    GIFHEAD            *gifHead;           /* GIF Header structure            */
-    GIFIMAGEDESC      **gifImageDesc;      /* Logical Image Descriptor struct */
-    GIFPLAINTEXT      **gifPlainText;      /* Plain Text Extension structure  */
-    GIFAPPLICATION    **gifApplication;    /* Application Extension structure */
-    GIFCOMMENT        **gifComment;        /* Comment Extension structure     */
+    GIFHEAD *           gifHead;           /* GIF Header structure            */
+    GIFIMAGEDESC **     gifImageDesc;      /* Logical Image Descriptor struct */
+    GIFPLAINTEXT **     gifPlainText;      /* Plain Text Extension structure  */
+    GIFAPPLICATION **   gifApplication;    /* Application Extension structure */
+    GIFCOMMENT **       gifComment;        /* Comment Extension structure     */
     GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
 
-    register GIFWORD i;        /* Loop counter                                 */
-    GIFBYTE Identifier;        /* Extension block identifier holder            */
-    GIFBYTE Label;             /* Extension block label holder                 */
-    GIFBYTE ImageCount;        /* Count of the number of images in the file    */
-    GIFBYTE ImageArray;        /* Keep the size of the array to store Images   */
-    GIFBYTE CommentCount;
-    GIFBYTE CommentArray;
-    GIFBYTE ApplicationCount;
-    GIFBYTE ApplicationArray;
-    GIFBYTE PlainTextCount;
-    GIFBYTE PlainTextArray;
-    GIFBYTE GCEflag;
-    GIFBYTE aTemp;
-    GIFBYTE j;
-    GIFBYTE w;                 /* Two more variables needed only while testing */
-    GIFBYTE *b;                /* Endian Ordering                              */
+    register GIFWORD i;          /* Loop counter                                 */
+    GIFBYTE          Identifier; /* Extension block identifier holder            */
+    GIFBYTE          Label;      /* Extension block label holder                 */
+    GIFBYTE          ImageCount; /* Count of the number of images in the file    */
+    GIFBYTE          ImageArray; /* Keep the size of the array to store Images   */
+    GIFBYTE          CommentCount;
+    GIFBYTE          CommentArray;
+    GIFBYTE          ApplicationCount;
+    GIFBYTE          ApplicationArray;
+    GIFBYTE          PlainTextCount;
+    GIFBYTE          PlainTextArray;
+    GIFBYTE          GCEflag;
+    GIFBYTE          aTemp;
+    GIFBYTE          j;
+    GIFBYTE          w; /* Two more variables needed only while testing */
+    GIFBYTE *        b; /* Endian Ordering                              */
 
     /* Allocate memory for the GIF structures           */
     /* Plug the structs into GifMemoryStruct at the end */
@@ -89,8 +89,8 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
     /******************************/
 
     /* Carry out Endian Testing and set Endian Order */
-    w = 0x0001;
-    b = (GIFBYTE *) &w;
+    w           = 0x0001;
+    b           = (GIFBYTE *)&w;
     EndianOrder = (b[0] ? 1 : 0);
 
     /* Read the GIF image file header information */
@@ -103,22 +103,22 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
         fputs("GIFHEAD: Error reading header information!\n", stderr);
         exit(EXIT_FAILURE);
     }
-#endif  /* 0 */
+#endif /* 0 */
 
     /*
      * Identify, read, and display block information.
      */
-    ImageCount       = ImageArray       = 0;
-    CommentCount     = CommentArray     = 0;
+    ImageCount = ImageArray = 0;
+    CommentCount = CommentArray = 0;
     ApplicationCount = ApplicationArray = 0;
-    PlainTextCount   = PlainTextArray   = 0;
-    GCEflag          = 0;
+    PlainTextCount = PlainTextArray = 0;
+    GCEflag                         = 0;
 
     for (;;) {
         Identifier = *MemGif++;
 
         switch (Identifier) {
-            case 0x3B:  /* Trailer */
+            case 0x3B: /* Trailer */
                 /*
                  * The counts are stored to make it easier while putting stuff
                  * into the HDF file and then deallocating space.
@@ -129,17 +129,17 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                 gifHead->PlainTextCount   = PlainTextCount;
 
                 /* putting stuff into the gif2mem structure */
-                GifMemoryStruct->GifHeader = gifHead;
-                GifMemoryStruct->GifImageDesc = gifImageDesc;
-                GifMemoryStruct->GifPlainTextExtension = gifPlainText;
-                GifMemoryStruct->GifApplicationExtension = gifApplication;
-                GifMemoryStruct->GifCommentExtension = gifComment;
+                GifMemoryStruct->GifHeader                  = gifHead;
+                GifMemoryStruct->GifImageDesc               = gifImageDesc;
+                GifMemoryStruct->GifPlainTextExtension      = gifPlainText;
+                GifMemoryStruct->GifApplicationExtension    = gifApplication;
+                GifMemoryStruct->GifCommentExtension        = gifComment;
                 GifMemoryStruct->GifGraphicControlExtension = gifGraphicControl;
 
                 /* return the struct */
                 return 0;
 
-            case 0x2C:  /* Image Descriptor */
+            case 0x2C: /* Image Descriptor */
                 /*
                  * If there was no image descriptor before this increase image
                  * count. If an imagedescriptor was present, reset GCEflag
@@ -150,40 +150,37 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                     GCEflag = 0;
 
                 if (ImageCount > ImageArray) {
-                    aTemp = ImageArray;
+                    aTemp      = ImageArray;
                     ImageArray = (GIFBYTE)((ImageArray << 1) + 1);
-                    if (!(gifImageDesc = (GIFIMAGEDESC **)realloc(gifImageDesc,
-                                            sizeof(GIFIMAGEDESC *) * ImageArray))) {
+                    if (!(gifImageDesc =
+                              (GIFIMAGEDESC **)realloc(gifImageDesc, sizeof(GIFIMAGEDESC *) * ImageArray))) {
                         printf("Out of memory!");
                         exit(EXIT_FAILURE);
                     }
 
                     if (!(gifGraphicControl = (GIFGRAPHICCONTROL **)realloc(
-                                        gifGraphicControl,
-                                        sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
+                              gifGraphicControl, sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
                         printf("Out of memory!");
                         exit(EXIT_FAILURE);
                     }
 
-                    for (j = aTemp ; j < ImageArray ; j++) {
+                    for (j = aTemp; j < ImageArray; j++) {
                         gifGraphicControl[j] = NULL;
-                        gifImageDesc[j] = NULL;
+                        gifImageDesc[j]      = NULL;
                     }
                 }
 
-                if(!(gifImageDesc[ImageCount-1] = (GIFIMAGEDESC*)malloc(sizeof(GIFIMAGEDESC)))) {
+                if (!(gifImageDesc[ImageCount - 1] = (GIFIMAGEDESC *)malloc(sizeof(GIFIMAGEDESC)))) {
                     printf("Out of memory!");
                     exit(EXIT_FAILURE);
                 }
 
-
-                if (ReadGifImageDesc(gifImageDesc[ImageCount-1], &MemGif) == -1)
+                if (ReadGifImageDesc(gifImageDesc[ImageCount - 1], &MemGif) == -1)
                     fputs("Error reading Image Descriptor information\n", stderr);
 
                 /* Decompress the Image */
-                gifImageDesc[ImageCount-1]->Image = Decompress(gifImageDesc[ImageCount-1],
-                                                               gifHead);
-                free(gifImageDesc[ImageCount-1]->GIFImage);
+                gifImageDesc[ImageCount - 1]->Image = Decompress(gifImageDesc[ImageCount - 1], gifHead);
+                free(gifImageDesc[ImageCount - 1]->GIFImage);
 
                 /*
                  * Convert the local palette into an HDF compatible palette In
@@ -191,150 +188,146 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                  * the HDFPalette If it is absent the global table is written
                  * as the HDFPalette.
                  */
-                if (!((gifImageDesc[ImageCount-1]->PackedField) & 0x80)) {
+                if (!((gifImageDesc[ImageCount - 1]->PackedField) & 0x80)) {
                     /* Check to see if the global color table exists.... */
                     if (gifHead->PackedField & 0x80) {
-                        for (i=0 ; i<gifHead->TableSize ; i++) {
-                            gifImageDesc[ImageCount-1]->HDFPalette[i][0] =
-                                                    gifHead->HDFPalette[i][0];
-                            gifImageDesc[ImageCount-1]->HDFPalette[i][1] =
-                                                    gifHead->HDFPalette[i][1];
-                            gifImageDesc[ImageCount-1]->HDFPalette[i][2] =
-                                                    gifHead->HDFPalette[i][2];
+                        for (i = 0; i < gifHead->TableSize; i++) {
+                            gifImageDesc[ImageCount - 1]->HDFPalette[i][0] = gifHead->HDFPalette[i][0];
+                            gifImageDesc[ImageCount - 1]->HDFPalette[i][1] = gifHead->HDFPalette[i][1];
+                            gifImageDesc[ImageCount - 1]->HDFPalette[i][2] = gifHead->HDFPalette[i][2];
                         }
                     }
 
-                    gifImageDesc[ImageCount-1]->TableSize = gifHead->TableSize;
+                    gifImageDesc[ImageCount - 1]->TableSize = gifHead->TableSize;
                 }
 
                 break;
 
-            case 0x21:  /* Extension Block */
-                    Label = *MemGif++;
+            case 0x21: /* Extension Block */
+                Label = *MemGif++;
 
-                    switch (Label) {
-                    case 0x01:  /* Plain Text Extension */
+                switch (Label) {
+                    case 0x01: /* Plain Text Extension */
                         puts("Plain Text Extension\n");
                         PlainTextCount++;
 
                         if (PlainTextCount > PlainTextArray)
                             PlainTextArray = (GIFBYTE)((PlainTextArray << 1) + 1);
 
-                        if (!(gifPlainText = (GIFPLAINTEXT **)realloc(gifPlainText , sizeof(GIFPLAINTEXT *) * PlainTextArray))) {
+                        if (!(gifPlainText = (GIFPLAINTEXT **)realloc(gifPlainText, sizeof(GIFPLAINTEXT *) *
+                                                                                        PlainTextArray))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-                        if(!(gifPlainText[PlainTextCount - 1] = (GIFPLAINTEXT*)malloc(sizeof(GIFPLAINTEXT)))) {
+                        if (!(gifPlainText[PlainTextCount - 1] =
+                                  (GIFPLAINTEXT *)malloc(sizeof(GIFPLAINTEXT)))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
                         if (ReadGifPlainText(gifPlainText[PlainTextCount - 1], &MemGif))
-                            fprintf(stderr,
-                                    "Error reading Plain Text Extension information.\n");
+                            fprintf(stderr, "Error reading Plain Text Extension information.\n");
 
                         break;
 
-                    case 0xFE:  /* Comment Extension */
+                    case 0xFE: /* Comment Extension */
                         CommentCount++;
 
                         if (CommentCount > CommentArray)
                             CommentArray = (GIFBYTE)((CommentArray << 1) + 1);
 
-                        if (!(gifComment = (GIFCOMMENT **)realloc(gifComment , sizeof(GIFCOMMENT *) * CommentArray))) {
+                        if (!(gifComment =
+                                  (GIFCOMMENT **)realloc(gifComment, sizeof(GIFCOMMENT *) * CommentArray))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-                        if(!(gifComment[CommentCount - 1] = (GIFCOMMENT *)malloc(sizeof(GIFCOMMENT)))) {
+                        if (!(gifComment[CommentCount - 1] = (GIFCOMMENT *)malloc(sizeof(GIFCOMMENT)))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-
                         if (ReadGifComment(gifComment[CommentCount - 1], &MemGif))
-                            fprintf(stderr,
-                                    "Error reading Comment Extension information\n");
+                            fprintf(stderr, "Error reading Comment Extension information\n");
 
                         break;
 
-                    case 0xF9:  /* Graphic Control Extension */
-                        if (GCEflag == 0 )
+                    case 0xF9: /* Graphic Control Extension */
+                        if (GCEflag == 0)
                             ImageCount++;
 
                         GCEflag = 1;
 
                         if (ImageCount > ImageArray) {
-                            aTemp = ImageArray;
+                            aTemp      = ImageArray;
                             ImageArray = (GIFBYTE)((ImageArray << 1) + 1);
 
-                            if (!(gifGraphicControl = (GIFGRAPHICCONTROL **)realloc(gifGraphicControl , sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
+                            if (!(gifGraphicControl = (GIFGRAPHICCONTROL **)realloc(
+                                      gifGraphicControl, sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
                                 printf("Out of memory!");
                                 exit(EXIT_FAILURE);
                             }
 
-                            if (!(gifImageDesc = (GIFIMAGEDESC **)realloc(gifImageDesc , sizeof(GIFIMAGEDESC *) * ImageArray))) {
+                            if (!(gifImageDesc = (GIFIMAGEDESC **)realloc(
+                                      gifImageDesc, sizeof(GIFIMAGEDESC *) * ImageArray))) {
                                 printf("Out of memory!");
                                 exit(EXIT_FAILURE);
                             }
 
-                            for (j = aTemp ; j < ImageArray ; j++) {
+                            for (j = aTemp; j < ImageArray; j++) {
                                 gifGraphicControl[j] = NULL;
                                 gifImageDesc[j]      = NULL;
                             }
                         }
 
-                        if(!(gifGraphicControl[ImageCount-1] = (GIFGRAPHICCONTROL*)malloc(sizeof(GIFGRAPHICCONTROL)))) {
+                        if (!(gifGraphicControl[ImageCount - 1] =
+                                  (GIFGRAPHICCONTROL *)malloc(sizeof(GIFGRAPHICCONTROL)))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-
-                        if (ReadGifGraphicControl(gifGraphicControl[ImageCount-1], &MemGif))
-                            fprintf(stderr,
-                                    "Error reading Graphic Control Extension information\n");
+                        if (ReadGifGraphicControl(gifGraphicControl[ImageCount - 1], &MemGif))
+                            fprintf(stderr, "Error reading Graphic Control Extension information\n");
 
                         (*MemGif)++;
                         if ((!*MemGif) == 0)
-                            fprintf(stderr,
-                                    "Error reading Graphic Control Extension\n");
+                            fprintf(stderr, "Error reading Graphic Control Extension\n");
 
                         break;
 
-                    case 0xFF:  /* Application Extension */
+                    case 0xFF: /* Application Extension */
                         ApplicationCount++;
 
                         if (ApplicationCount > ApplicationArray)
                             ApplicationArray = (GIFBYTE)((ApplicationArray << 1) + 1);
 
-                        if (!(gifApplication = (GIFAPPLICATION **)realloc(gifApplication , sizeof(GIFAPPLICATION *) * ApplicationArray))) {
+                        if (!(gifApplication = (GIFAPPLICATION **)realloc(
+                                  gifApplication, sizeof(GIFAPPLICATION *) * ApplicationArray))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-                        if(!(gifApplication[ApplicationCount - 1] = (GIFAPPLICATION *)malloc(sizeof(GIFAPPLICATION)))) {
+                        if (!(gifApplication[ApplicationCount - 1] =
+                                  (GIFAPPLICATION *)malloc(sizeof(GIFAPPLICATION)))) {
                             printf("Out of memory!");
                             exit(EXIT_FAILURE);
                         }
 
-
                         if (ReadGifApplication(gifApplication[ApplicationCount - 1], &MemGif))
-                            fprintf(stderr,
-                                    "Error reading Application Extension information\n");
+                            fprintf(stderr, "Error reading Application Extension information\n");
 
                         break;
 
                     default:
                         printf("Unknown Extension Label: %#02x\n", Label);
                         break;
-                    }
+                }
 
-                    break;
+                break;
 
             default:
-                fprintf(stderr,
-                        "Unknown Block Separator Character: %#02x\n", Identifier);
+                fprintf(stderr, "Unknown Block Separator Character: %#02x\n", Identifier);
         }
     }
 }
diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c
index 79671aa..2b267ef 100644
--- a/hl/tools/gif2h5/gifread.c
+++ b/hl/tools/gif2h5/gifread.c
@@ -26,11 +26,12 @@ GetWord(GIFBYTE *MemGif)
 
     if (EndianOrder == 1) {
         /* LittleEndian */
-        w  = (GIFWORD) (*MemGif++ & 0xFF);
-        w |= (GIFWORD) ((*MemGif++ & 0xFF) << 0x08);
-    } else {
-        w = (GIFWORD) (*MemGif++ & 0xFF);
-        w = ((GIFWORD) (*MemGif++ & 0xFF)) | (w << 0x08);
+        w = (GIFWORD)(*MemGif++ & 0xFF);
+        w |= (GIFWORD)((*MemGif++ & 0xFF) << 0x08);
+    }
+    else {
+        w = (GIFWORD)(*MemGif++ & 0xFF);
+        w = ((GIFWORD)(*MemGif++ & 0xFF)) | (w << 0x08);
     }
 
     return w;
@@ -53,23 +54,23 @@ GetByte(GIFBYTE *MemGif)
  *           otherwise 0 if no error occured.
  */
 int
-ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure  */
-              GIFBYTE **MemGif2)   /* GIF image file input FILE stream */
+ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure  */
+              GIFBYTE **MemGif2) /* GIF image file input FILE stream */
 {
-    GIFWORD i;             /* Loop counter                                */
-    GIFWORD tableSize;     /* Number of entires in the Global Color Table */
+    GIFWORD i;         /* Loop counter                                */
+    GIFWORD tableSize; /* Number of entires in the Global Color Table */
 
     GifHead->TableSize = 0;
-    for (i = 0 ; i < 6 ; i++) {
+    for (i = 0; i < 6; i++) {
         GifHead->HeaderDump[i] = *(*MemGif2)++;
     }
 
-    if (strncmp((const char *)GifHead->HeaderDump , "GIF" , (size_t)3)) {
+    if (strncmp((const char *)GifHead->HeaderDump, "GIF", (size_t)3)) {
         printf("The file does not appear to be a valid GIF file.\n");
         exit(EXIT_FAILURE);
     }
 
-    for (i = 0 ; i < 7 ; i++) {
+    for (i = 0; i < 7; i++) {
         GifHead->LSDDump[i] = *(*MemGif2)++;
     }
 
@@ -78,7 +79,7 @@ ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure  */
     /* Check if a Global Color Table is present */
     if (GifHead->PackedField & 0x80) {
         /* Read number of color table entries */
-        tableSize = (GIFWORD) (1L << ((GifHead->PackedField & 0x07) + 1));
+        tableSize          = (GIFWORD)(1L << ((GifHead->PackedField & 0x07) + 1));
         GifHead->TableSize = tableSize;
 
         /* Read the Global Color Table */
@@ -100,12 +101,11 @@ ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure  */
 #if 0
     if (ferror(FpGif))
         return -1;
-#endif  /* 0 */
+#endif /* 0 */
 
-    return 0;   /* No FILE stream error occured */
+    return 0; /* No FILE stream error occured */
 }
 
-
 /*
 **  Read a GIF Local Image Descriptor.
 **
@@ -120,93 +120,85 @@ ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure  */
 **           otherwise 0 if no error occured.
 */
 int
-ReadGifImageDesc(
-    GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure  */
-    GIFBYTE **MemGif2              /* GIF image file input FILE stream           */
-    )
+ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure  */
+                 GIFBYTE **    MemGif2       /* GIF image file input FILE stream           */
+)
 {
-    GIFWORD i;        /* Loop counter                               */
-    GIFWORD tableSize;         /* Number of entries in the Local Color Table */
- /* GIFBYTE Interlace; */         /* PackedField & 0x20 gives information on interlacing */
- GIFBYTE *TempPtr;
- int  ch , ch1;
-
- GifImageDesc->TableSize = 0;
- for (i = 0 ; i < 9 ; i++) {
-  GifImageDesc->GIDDump[i] = *(*MemGif2)++;
- }
-
- /*
- ** Get the relevant fields. I need ImageWidth and Height actively hence I have
- ** taken information from those fields. I intend to keep the GifImageDesc data
- ** structure as it is so that anyone needing the rest of the fields can do so
- ** quickly.
- */
-
- if (EndianOrder == 1) /* LittleEndian */
- {
-  GifImageDesc->ImageWidth  = (GIFWORD) (GifImageDesc->GIDDump[4] & 0xFF);
-  GifImageDesc->ImageWidth |= (GIFWORD) ((GifImageDesc->GIDDump[5] & 0xFF) << 0x08);
-
-  GifImageDesc->ImageHeight  = (GIFWORD) (GifImageDesc->GIDDump[6] & 0xFF);
-  GifImageDesc->ImageHeight |= (GIFWORD) ((GifImageDesc->GIDDump[7] & 0xFF) << 0x08);
-
- }
- else
- {
-  GifImageDesc->ImageWidth = (GIFWORD) (GifImageDesc->GIDDump[4] & 0xFF);
-  GifImageDesc->ImageWidth = ((GIFWORD) (GifImageDesc->GIDDump[5] & 0xFF)) | (GifImageDesc->ImageWidth << 0x08);
+    GIFWORD i;               /* Loop counter                               */
+    GIFWORD tableSize;       /* Number of entries in the Local Color Table */
+    /* GIFBYTE Interlace; */ /* PackedField & 0x20 gives information on interlacing */
+    GIFBYTE *TempPtr;
+    int      ch, ch1;
+
+    GifImageDesc->TableSize = 0;
+    for (i = 0; i < 9; i++) {
+        GifImageDesc->GIDDump[i] = *(*MemGif2)++;
+    }
 
-  GifImageDesc->ImageHeight = (GIFWORD) (GifImageDesc->GIDDump[6] & 0xFF);
-  GifImageDesc->ImageHeight = ((GIFWORD) (GifImageDesc->GIDDump[7] & 0xFF)) | (GifImageDesc->ImageWidth << 0x08);
+    /*
+    ** Get the relevant fields. I need ImageWidth and Height actively hence I have
+    ** taken information from those fields. I intend to keep the GifImageDesc data
+    ** structure as it is so that anyone needing the rest of the fields can do so
+    ** quickly.
+    */
 
+    if (EndianOrder == 1) /* LittleEndian */
+    {
+        GifImageDesc->ImageWidth = (GIFWORD)(GifImageDesc->GIDDump[4] & 0xFF);
+        GifImageDesc->ImageWidth |= (GIFWORD)((GifImageDesc->GIDDump[5] & 0xFF) << 0x08);
 
- }
+        GifImageDesc->ImageHeight = (GIFWORD)(GifImageDesc->GIDDump[6] & 0xFF);
+        GifImageDesc->ImageHeight |= (GIFWORD)((GifImageDesc->GIDDump[7] & 0xFF) << 0x08);
+    }
+    else {
+        GifImageDesc->ImageWidth = (GIFWORD)(GifImageDesc->GIDDump[4] & 0xFF);
+        GifImageDesc->ImageWidth =
+            ((GIFWORD)(GifImageDesc->GIDDump[5] & 0xFF)) | (GifImageDesc->ImageWidth << 0x08);
+
+        GifImageDesc->ImageHeight = (GIFWORD)(GifImageDesc->GIDDump[6] & 0xFF);
+        GifImageDesc->ImageHeight =
+            ((GIFWORD)(GifImageDesc->GIDDump[7] & 0xFF)) | (GifImageDesc->ImageWidth << 0x08);
+    }
 
- GifImageDesc->PackedField = GifImageDesc->GIDDump[8];
+    GifImageDesc->PackedField = GifImageDesc->GIDDump[8];
 
- /* Interlace = GifImageDesc->PackedField & 0x20; */
+    /* Interlace = GifImageDesc->PackedField & 0x20; */
 
     /* Check if a Local Color Table is present */
-    if (GifImageDesc->PackedField & 0x80)
-    {
+    if (GifImageDesc->PackedField & 0x80) {
         /* Read number of color table entries */
-        tableSize = (GIFWORD) (1L << ((GifImageDesc->PackedField & 0x07) + 1));
-  GifImageDesc->TableSize = tableSize;
+        tableSize               = (GIFWORD)(1L << ((GifImageDesc->PackedField & 0x07) + 1));
+        GifImageDesc->TableSize = tableSize;
         /* Read the Local Color Table */
-        for (i = 0; i < tableSize; i++)
-        {
+        for (i = 0; i < tableSize; i++) {
             GifImageDesc->HDFPalette[i][0] = *(*MemGif2)++;
             GifImageDesc->HDFPalette[i][1] = *(*MemGif2)++;
             GifImageDesc->HDFPalette[i][2] = *(*MemGif2)++;
         }
     }
 
- /*
- ** Get LZW minimum Code Size
- */
- GifImageDesc->CodeSize = (GIFWORD)*(*MemGif2)++;
-
- /*GifImageDesc->GIFImage = ReadDataSubBlocks(FpGif);*/
- if (!(GifImageDesc->GIFImage = (GIFBYTE *)malloc((GifImageDesc->ImageWidth) * (GifImageDesc->ImageHeight)))) {
-  printf("Out of memory");
-  exit(EXIT_FAILURE);
- }
-
-
- TempPtr = GifImageDesc->GIFImage;
- do
- {
-  ch = ch1 = (int)*(*MemGif2)++;
-  while (ch--) *TempPtr++ = *(*MemGif2)++;
- }
- while (ch1);
+    /*
+    ** Get LZW minimum Code Size
+    */
+    GifImageDesc->CodeSize = (GIFWORD) * (*MemGif2)++;
+
+    /*GifImageDesc->GIFImage = ReadDataSubBlocks(FpGif);*/
+    if (!(GifImageDesc->GIFImage =
+              (GIFBYTE *)malloc((GifImageDesc->ImageWidth) * (GifImageDesc->ImageHeight)))) {
+        printf("Out of memory");
+        exit(EXIT_FAILURE);
+    }
 
+    TempPtr = GifImageDesc->GIFImage;
+    do {
+        ch = ch1 = (int)*(*MemGif2)++;
+        while (ch--)
+            *TempPtr++ = *(*MemGif2)++;
+    } while (ch1);
 
-    return(0);          /* No FILE stream error occured */
+    return (0); /* No FILE stream error occured */
 }
 
-
 /*
 **  Read a GIF Graphic Control Extension block.
 **
@@ -217,21 +209,19 @@ ReadGifImageDesc(
 **           otherwise 0 if no error occured.
 */
 int
-ReadGifGraphicControl(
-    GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */
-    GIFBYTE              **MemGif2           /* GIF image file input FILE stream  */
-    )
+ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */
+                      GIFBYTE **         MemGif2            /* GIF image file input FILE stream  */
+)
 {
     int i;
 
-    for (i = 0 ; i < 5 ; i++) {
-            GifGraphicControl->GCEDump[i] = *(*MemGif2)++;
+    for (i = 0; i < 5; i++) {
+        GifGraphicControl->GCEDump[i] = *(*MemGif2)++;
     }
 
-    return(0);          /* No FILE stream error occured */
+    return (0); /* No FILE stream error occured */
 }
 
-
 /*
 **  Read a GIF Plain Text Extension block.
 **
@@ -242,35 +232,33 @@ ReadGifGraphicControl(
 **           otherwise 0 if no error occured.
 */
 int
-ReadGifPlainText(
-    GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */
-    GIFBYTE         **MemGif2        /* GIF image file input FILE stream          */
-    )
+ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */
+                 GIFBYTE **    MemGif2       /* GIF image file input FILE stream          */
+)
 {
     int i;
 
- for (i = 0 ; i < 13 ; i++) {
-  GifPlainText->PTEDump[i] = *(*MemGif2)++;
- }
+    for (i = 0; i < 13; i++) {
+        GifPlainText->PTEDump[i] = *(*MemGif2)++;
+    }
 
     /* Read in the Plain Text data sub-blocks */
-    if (!(GifPlainText->PlainTextData = ReadDataSubBlocks(MemGif2 , &(GifPlainText->DataSize))))
-        return(1);
+    if (!(GifPlainText->PlainTextData = ReadDataSubBlocks(MemGif2, &(GifPlainText->DataSize))))
+        return (1);
 
     /*
  GifPlainText->Terminator       = 0;
  */
 
     /* Check for a FILE stream error */
- /*
-    if (ferror(FpGif))
-        return(-1);
- */
+    /*
+       if (ferror(FpGif))
+           return(-1);
+    */
 
-    return(0);          /* No FILE stream error occured */
+    return (0); /* No FILE stream error occured */
 }
 
-
 /*
 **  Read a GIF Application Extension block.
 **
@@ -281,34 +269,32 @@ ReadGifPlainText(
 **           otherwise 0 if no error occured.
 */
 int
-ReadGifApplication(
-    GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */
-    GIFBYTE           **MemGif2           /* GIF image file input FILE stream           */
-    )
+ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */
+                   GIFBYTE **      MemGif2         /* GIF image file input FILE stream           */
+)
 {
     int i;
 
- for (i = 0 ; i < 12 ; i++) {
-  GifApplication->AEDump[i] = *(*MemGif2)++;
- }
+    for (i = 0; i < 12; i++) {
+        GifApplication->AEDump[i] = *(*MemGif2)++;
+    }
 
     /* Read in the Plain Text data sub-blocks */
-    if (!(GifApplication->ApplicationData = ReadDataSubBlocks(MemGif2 , &(GifApplication->DataSize))))
-        return(1);
- /*
-    GifApplication->Terminator     = 0;
- */
+    if (!(GifApplication->ApplicationData = ReadDataSubBlocks(MemGif2, &(GifApplication->DataSize))))
+        return (1);
+    /*
+       GifApplication->Terminator     = 0;
+    */
 
- /* Check for a FILE stream error */
- /*
-    if (ferror(FpGif))
-        return(-1);
- */
+    /* Check for a FILE stream error */
+    /*
+       if (ferror(FpGif))
+           return(-1);
+    */
 
-    return(0);          /* No FILE stream error occured */
+    return (0); /* No FILE stream error occured */
 }
 
-
 /*
 **  Read a GIF Comment Extension block.
 **
@@ -319,22 +305,20 @@ ReadGifApplication(
 **           otherwise 0 if no error occured.
 */
 int
-ReadGifComment(
-    GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */
-    GIFBYTE       **MemGif2       /* GIF image file input FILE stream           */
-    )
+ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */
+               GIFBYTE **  MemGif2     /* GIF image file input FILE stream           */
+)
 {
 
     /* Read in the Plain Text data sub-blocks */
-    if (!(GifComment->CommentData = ReadDataSubBlocks(MemGif2 , &(GifComment->DataSize))))
-        return(1);
+    if (!(GifComment->CommentData = ReadDataSubBlocks(MemGif2, &(GifComment->DataSize))))
+        return (1);
 
     GifComment->Terminator = 0;
 
-    return(0);          /* No FILE stream error occured */
+    return (0); /* No FILE stream error occured */
 }
 
-
 /*
 **  Read one or more GIF data sub-blocks and write the information
 **  to a buffer.
@@ -347,55 +331,47 @@ ReadGifComment(
 */
 static GIFBYTE *
 ReadDataSubBlocks(GIFBYTE **MemGif2, /* GIF image file input FILE stream              */
-    GIFWORD *DSize)
+                  GIFWORD * DSize)
 {
     GIFBYTE *ptr1;     /* Pointer used to "walk the heap"               */
     GIFBYTE *ptr2;     /* Pointer used to mark the top of the heap      */
-    GIFBYTE dataSize;  /* Size of the current data sub-block being read */
-    GIFWORD bufSize;   /* Total size of the Plain Text data buffer      */
- int tempcount = 0;
+    GIFBYTE  dataSize; /* Size of the current data sub-block being read */
+    GIFWORD  bufSize;  /* Total size of the Plain Text data buffer      */
+    int      tempcount = 0;
 
- bufSize = 0;    /* The output buffer is empty          */
+    bufSize = 0; /* The output buffer is empty          */
 
-    dataSize = *(*MemGif2)++;  /* Get the size of the first sub-block */
+    dataSize = *(*MemGif2)++; /* Get the size of the first sub-block */
 
     /* Allocate initial data buffer */
-    if (!(ptr1 = ptr2 = (GIFBYTE *) malloc((size_t)dataSize + 1))) {
-  printf("Out of memory. Allocation of memory for data sub-blocks for\neither Comment, Plain Text or Application Extensions failed");
-        return((GIFBYTE *) NULL);
- }
-    for (;;)
-    {
-  tempcount++;
-        bufSize += (dataSize);  /* Running total of the buffer size */
-  *DSize = bufSize;
+    if (!(ptr1 = ptr2 = (GIFBYTE *)malloc((size_t)dataSize + 1))) {
+        printf("Out of memory. Allocation of memory for data sub-blocks for\neither Comment, Plain Text or "
+               "Application Extensions failed");
+        return ((GIFBYTE *)NULL);
+    }
+    for (;;) {
+        tempcount++;
+        bufSize += (dataSize); /* Running total of the buffer size */
+        *DSize = bufSize;
 
 #ifdef COMMENTED_OUT
-        *ptr1++ = dataSize;   /* Write the data count */
-#endif /* COMMENTED_OUT */
-        while (dataSize--)   /* Read/write the Plain Text data */
-             *ptr1++ = *(*MemGif2)++;
+        *ptr1++ = dataSize; /* Write the data count */
+#endif                      /* COMMENTED_OUT */
+        while (dataSize--)  /* Read/write the Plain Text data */
+            *ptr1++ = *(*MemGif2)++;
 
         /* Check if there is another data sub-block */
         if ((dataSize = *(*MemGif2)++) == 0)
-            break;  /* Block Terminator encountered */
+            break; /* Block Terminator encountered */
 
         /* Increase the buffer size to accomodate the next sub-block */
-        if (!(ptr1 = ptr2 = (GIFBYTE *) realloc(ptr2, bufSize + dataSize + 1)))
-            return((GIFBYTE *) NULL);
-
-
-  ptr1 += bufSize;   /* Move pointer to the end of the data */
-
+        if (!(ptr1 = ptr2 = (GIFBYTE *)realloc(ptr2, bufSize + dataSize + 1)))
+            return ((GIFBYTE *)NULL);
 
+        ptr1 += bufSize; /* Move pointer to the end of the data */
     }
 
     *ptr1++ = '\0';
 
-    return(ptr2);     /* Return a pointer to the sub-block data */
+    return (ptr2); /* Return a pointer to the sub-block data */
 }
-
-
-
-
-
diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c
index 655563c..9bd7874 100644
--- a/hl/tools/gif2h5/h52gifgentst.c
+++ b/hl/tools/gif2h5/h52gifgentst.c
@@ -30,11 +30,11 @@
  */
 
 #define FILENAME    "h52giftst.h5"
-#define WIDTH        400
-#define HEIGHT       200
-#define PAL_ENTRIES  256
-#define IMAGE1_NAME  "image"
-#define PAL_NAME     "palette"
+#define WIDTH       400
+#define HEIGHT      200
+#define PAL_ENTRIES 256
+#define IMAGE1_NAME "image"
+#define PAL_NAME    "palette"
 
 /*-------------------------------------------------------------------------
  * Function: main
@@ -44,65 +44,61 @@
  *-------------------------------------------------------------------------
  */
 
-int main(void)
+int
+main(void)
 {
-    hid_t         fid;
-    int           i, j, n, space;
+    hid_t          fid;
+    int            i, j, n, space;
     unsigned char *buf;
-    unsigned char pal[ PAL_ENTRIES * 3 ];        /* palette array */
-    hsize_t       pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
-    hsize_t       width  = WIDTH;
-    hsize_t       height = HEIGHT;
+    unsigned char  pal[PAL_ENTRIES * 3];           /* palette array */
+    hsize_t        pal_dims[2] = {PAL_ENTRIES, 3}; /* palette dimensions */
+    hsize_t        width       = WIDTH;
+    hsize_t        height      = HEIGHT;
 
     /* Allocate buffer */
-    if(NULL == (buf = (unsigned char *)malloc(WIDTH * HEIGHT)))
+    if (NULL == (buf = (unsigned char *)malloc(WIDTH * HEIGHT)))
         return EXIT_FAILURE;
 
     /* create a file  */
-    if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0)
+    if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return EXIT_FAILURE;
 
     /* create an image */
-    space = WIDTH*HEIGHT / PAL_ENTRIES;
-    for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
-    {
+    space = WIDTH * HEIGHT / PAL_ENTRIES;
+    for (i = 0, j = 0, n = 0; i < WIDTH * HEIGHT; i++, j++) {
         buf[i] = (unsigned char)n;
-        if ( j > space )
-        {
+        if (j > space) {
             n++;
-            j=0;
+            j = 0;
         }
-
     }
 
     /* make the image */
-    if (H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, buf )<0)
+    if (H5IMmake_image_8bit(fid, IMAGE1_NAME, width, height, buf) < 0)
         return EXIT_FAILURE;
 
-   /*-------------------------------------------------------------------------
-    * define a palette, blue to red tones
-    *-------------------------------------------------------------------------
-    */
-    for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
-    {
-      pal[i]   = (unsigned char)n;       /* red */
-      pal[i+1] = (unsigned char)0;       /* green */
-      pal[i+2] = (unsigned char)(255-n); /* blue */
+    /*-------------------------------------------------------------------------
+     * define a palette, blue to red tones
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0, n = 0; i < PAL_ENTRIES * 3; i += 3, n++) {
+        pal[i]     = (unsigned char)n;         /* red */
+        pal[i + 1] = (unsigned char)0;         /* green */
+        pal[i + 2] = (unsigned char)(255 - n); /* blue */
     }
 
     /* make a palette */
-    if (H5IMmake_palette( fid, PAL_NAME, pal_dims, pal )<0)
+    if (H5IMmake_palette(fid, PAL_NAME, pal_dims, pal) < 0)
         return EXIT_FAILURE;
 
     /* attach the palette to the image */
-    if (H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME )<0)
+    if (H5IMlink_palette(fid, IMAGE1_NAME, PAL_NAME) < 0)
         return EXIT_FAILURE;
 
-    if(H5Fclose(fid)<0)
+    if (H5Fclose(fid) < 0)
         return EXIT_FAILURE;
 
     free(buf);
 
     return EXIT_SUCCESS;
 }
-
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index e32facb..402314a 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -18,9 +18,8 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-#define IMAGE_WIDTH_MAX		65535	/* unsigned 16bits integer */
-#define IMAGE_HEIGHT_MAX	65535	/* unsigned 16bits integer */
-
+#define IMAGE_WIDTH_MAX  65535 /* unsigned 16bits integer */
+#define IMAGE_HEIGHT_MAX 65535 /* unsigned 16bits integer */
 
 int EndianOrder;
 
@@ -28,8 +27,8 @@ static void
 putword(int w, FILE *fp)
 {
     /* writes a 16-bit integer in GIF order (LSB first) */
-    fputc(w &0xff, fp);
-    fputc((w>>8)&0xff,fp);
+    fputc(w & 0xff, fp);
+    fputc((w >> 8) & 0xff, fp);
 }
 
 static void
@@ -39,39 +38,39 @@ usage(void)
     fprintf(stdout, "       h52gif -V \n");
     fprintf(stdout, "        Print HDF5 library version and exit\n");
     printf("h52gif expects *at least* one h5_image.\n");
-
 }
 
 FILE *fpGif = NULL;
-int main(int argc , char **argv)
+int
+main(int argc, char **argv)
 {
-    GIFBYTE *Image;
-    void *edata;
+    GIFBYTE *   Image;
+    void *      edata;
     H5E_auto2_t func;
 
     /* compression structs */
     GIFCHAR *HDFName = NULL;
     GIFCHAR *GIFName = NULL;
 
-    GIFBYTE* b;
+    GIFBYTE *b;
 
-    GIFBYTE  GlobalPalette[256][3];
-    GIFBYTE  Red[256];
-    GIFBYTE  Green[256];
-    GIFBYTE  Blue[256];
+    GIFBYTE GlobalPalette[256][3];
+    GIFBYTE Red[256];
+    GIFBYTE Green[256];
+    GIFBYTE Blue[256];
 
-    int   RWidth, RHeight;
-    int   ColorMapSize, InitCodeSize, Background, BitsPerPixel;
-    int   j,nc;
-    int   i;
-    int   numcols = 0;
+    int RWidth, RHeight;
+    int ColorMapSize, InitCodeSize, Background, BitsPerPixel;
+    int j, nc;
+    int i;
+    int numcols = 0;
 
-    GIFBYTE pc2nc[256] , r1[256] , g1[256] , b1[256];
+    GIFBYTE pc2nc[256], r1[256], g1[256], b1[256];
 
-    int arg_index = 2;
-    int bool_is_image = 0; /* 0 = false , 1 = true */
-    char *image_name = NULL;
-    int idx;
+    int   arg_index     = 2;
+    int   bool_is_image = 0; /* 0 = false , 1 = true */
+    char *image_name    = NULL;
+    int   idx;
 
     /* Disable error reporting */
     H5Eget_auto2(H5E_DEFAULT, &func, &edata);
@@ -80,16 +79,12 @@ int main(int argc , char **argv)
     /* Initialize h5tools lib */
     h5tools_init();
 
-    if ( argv[1] && (strcmp("-V",argv[1])==0) )
-    {
+    if (argv[1] && (strcmp("-V", argv[1]) == 0)) {
         print_version("gif2h5");
         exit(EXIT_SUCCESS);
-
     }
 
-
-    if (argc < 4)
-    {
+    if (argc < 4) {
         /* they didn't supply at least one image -- bail */
         usage();
         return EXIT_FAILURE;
@@ -99,19 +94,17 @@ int main(int argc , char **argv)
     GIFName = argv[2];
 
     /* get the options */
-    while (arg_index++ < argc - 1)
-    {
-        if (!strcmp(argv[arg_index] , "-i")) {
+    while (arg_index++ < argc - 1) {
+        if (!strcmp(argv[arg_index], "-i")) {
             bool_is_image = 1;
             continue;
         }
 
-        if (bool_is_image)
-        {
+        if (bool_is_image) {
             /* allocate space to store the image name */
             size_t len = strlen(argv[arg_index]);
-            image_name = (GIFCHAR*) malloc( len + 1);
-            strcpy(image_name , argv[arg_index]);
+            image_name = (GIFCHAR *)malloc(len + 1);
+            strcpy(image_name, argv[arg_index]);
 
             bool_is_image = 0;
             continue;
@@ -123,69 +116,66 @@ int main(int argc , char **argv)
         goto out;
     }
 
-   /* Do Endian Order testing and set Endian Order */
-    idx = 0x0001;
-    b = (GIFBYTE *) &idx;
-    EndianOrder = (b[0] ? 1:0);
+    /* Do Endian Order testing and set Endian Order */
+    idx         = 0x0001;
+    b           = (GIFBYTE *)&idx;
+    EndianOrder = (b[0] ? 1 : 0);
 
-    if (!(fpGif = fopen(GIFName , "wb")))
-    {
+    if (!(fpGif = fopen(GIFName, "wb"))) {
         printf("Error opening gif file for output. Aborting.\n");
         goto out;
     }
 
     Background = 0;
     {
-        hsize_t       width, height, planes;
-        hid_t         fid;
-        char          interlace[20];
-        hssize_t      npals;
-        hsize_t       pal_dims[2];
+        hsize_t        width, height, planes;
+        hid_t          fid;
+        char           interlace[20];
+        hssize_t       npals;
+        hsize_t        pal_dims[2];
         unsigned char *pal;
 
-        if ((fid = H5Fopen(HDFName , H5F_ACC_RDONLY , H5P_DEFAULT)) < 0)
-        {
-            fprintf(stderr , "Unable to open HDF file for input. Aborting.\n");
+        if ((fid = H5Fopen(HDFName, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
+            fprintf(stderr, "Unable to open HDF file for input. Aborting.\n");
             goto out;
         }
 
         /* read image */
-        if ( H5IMget_image_info( fid, image_name, &width, &height, &planes, interlace, &npals ) < 0 )
+        if (H5IMget_image_info(fid, image_name, &width, &height, &planes, interlace, &npals) < 0)
             goto out;
 
-	if (width > IMAGE_WIDTH_MAX || height > IMAGE_HEIGHT_MAX){
-	    fprintf(stderr, "HDF5 image is too large. Limit is %d by %d.\n", IMAGE_WIDTH_MAX, IMAGE_HEIGHT_MAX);
-	    goto out;
-	}
+        if (width > IMAGE_WIDTH_MAX || height > IMAGE_HEIGHT_MAX) {
+            fprintf(stderr, "HDF5 image is too large. Limit is %d by %d.\n", IMAGE_WIDTH_MAX,
+                    IMAGE_HEIGHT_MAX);
+            goto out;
+        }
 
-	/* tool can handle single plane images only. */
-	if (planes > 1){
-	    fprintf(stderr, "Cannot handle multiple planes image\n");
-	    goto out;
-	}
+        /* tool can handle single plane images only. */
+        if (planes > 1) {
+            fprintf(stderr, "Cannot handle multiple planes image\n");
+            goto out;
+        }
 
-        Image = (GIFBYTE*) malloc( (size_t) width * (size_t) height );
+        Image = (GIFBYTE *)malloc((size_t)width * (size_t)height);
 
-        if ( H5IMread_image( fid, image_name, Image ) < 0 )
+        if (H5IMread_image(fid, image_name, Image) < 0)
             goto out;
 
-        if (npals)
-        {
-            if ( H5IMget_palette_info( fid, image_name, 0, pal_dims ) < 0 )
+        if (npals) {
+            if (H5IMget_palette_info(fid, image_name, 0, pal_dims) < 0)
                 goto out;
 
-            pal = (GIFBYTE*) malloc( (size_t) pal_dims[0] * (size_t) pal_dims[1] );
+            pal = (GIFBYTE *)malloc((size_t)pal_dims[0] * (size_t)pal_dims[1]);
 
-            if ( H5IMget_palette( fid, image_name, 0, pal ) < 0 )
+            if (H5IMget_palette(fid, image_name, 0, pal) < 0)
                 goto out;
 
-            numcols = (int) pal_dims[0];
+            numcols = (int)pal_dims[0];
 
-            for (i = 0, j = 0 ; i < numcols ; j+=3, i++)
-            {
+            for (i = 0, j = 0; i < numcols; j += 3, i++) {
                 GlobalPalette[i][0] = pal[j];
-                GlobalPalette[i][1] = pal[j+1];
-                GlobalPalette[i][2] = pal[j+2];
+                GlobalPalette[i][1] = pal[j + 1];
+                GlobalPalette[i][2] = pal[j + 2];
             }
 
             free(pal);
@@ -196,7 +186,6 @@ int main(int argc , char **argv)
         RWidth  = (int)width;
         RHeight = (int)height;
 
-
         /*
          * If the first image does not have a palette, I make my own global
          * color table Obviously this is not the best thing to do, better
@@ -206,62 +195,52 @@ int main(int argc , char **argv)
          *      palette
          *   2. Check for palettes in any of the other images.
          */
-        if (!npals)
-        {
+        if (!npals) {
             numcols = 256;
-            for (i = 0 ; i < numcols ; i++)
-            {
-	      Red[i] = (GIFBYTE)(255 - i);
-	      Green[i] = (GIFBYTE)(255 - i);
-	      Blue[i] = (GIFBYTE)(255 - i);
+            for (i = 0; i < numcols; i++) {
+                Red[i]   = (GIFBYTE)(255 - i);
+                Green[i] = (GIFBYTE)(255 - i);
+                Blue[i]  = (GIFBYTE)(255 - i);
             }
         }
-        else
-        {
-            for (i = 0 ; i < numcols ; i++)
-            {
-                Red[i] = GlobalPalette[i][0];
+        else {
+            for (i = 0; i < numcols; i++) {
+                Red[i]   = GlobalPalette[i][0];
                 Green[i] = GlobalPalette[i][1];
-                Blue[i] = GlobalPalette[i][2];
+                Blue[i]  = GlobalPalette[i][2];
             }
         }
 
-        for (i = 0; i < numcols; i++)
-        {
+        for (i = 0; i < numcols; i++) {
             pc2nc[i] = r1[i] = g1[i] = b1[i] = 0;
         }
 
         /* compute number of unique colors */
         nc = 0;
 
-        for (i = 0; i < numcols; i++)
-        {
+        for (i = 0; i < numcols; i++) {
             /* see if color #i is already used */
-            for (j = 0; j < i; j++)
-            {
+            for (j = 0; j < i; j++) {
                 if (Red[i] == Red[j] && Green[i] == Green[j] && Blue[i] == Blue[j])
                     break;
             }
 
-            if (j==i)
-            {
+            if (j == i) {
                 /* wasn't found */
-	      pc2nc[i] = (GIFBYTE)nc;
-                r1[nc] = Red[i];
-                g1[nc] = Green[i];
-                b1[nc] = Blue[i];
+                pc2nc[i] = (GIFBYTE)nc;
+                r1[nc]   = Red[i];
+                g1[nc]   = Green[i];
+                b1[nc]   = Blue[i];
                 nc++;
             }
-            else
-            {
+            else {
                 pc2nc[i] = pc2nc[j];
             }
         }
 
         /* figure out 'BitsPerPixel' */
-        for (i = 1; i < 8; i++)
-        {
-            if ((1<<i) >= nc)
+        for (i = 1; i < 8; i++) {
+            if ((1 << i) >= nc)
                 break;
         }
 
@@ -273,59 +252,54 @@ int main(int argc , char **argv)
         else
             InitCodeSize = BitsPerPixel;
 
-        if (!fpGif)
-        {
-            fprintf(stderr,  "WriteGIF: file not open for writing\n" );
+        if (!fpGif) {
+            fprintf(stderr, "WriteGIF: file not open for writing\n");
             goto out;
         }
 
+        fwrite("GIF87a", sizeof(char), 6, fpGif); /* the GIF magic number */
 
-        fwrite("GIF87a", sizeof( char ), 6, fpGif);  /* the GIF magic number */
-
-        putword(RWidth, fpGif);             /* screen descriptor */
+        putword(RWidth, fpGif); /* screen descriptor */
         putword(RHeight, fpGif);
 
-        i = 0x00;                   /* No, there is no color map */
-        i |= (8-1)<<4;              /* OR in the color resolution (hardwired 8) */
-        i |= (BitsPerPixel - 1);    /* OR in the # of bits per pixel */
-        fputc(i,fpGif);
-
-        fputc(Background,fpGif);    /* background color */
-        fputc(0, fpGif);            /* future expansion byte */
+        i = 0x00;                /* No, there is no color map */
+        i |= (8 - 1) << 4;       /* OR in the color resolution (hardwired 8) */
+        i |= (BitsPerPixel - 1); /* OR in the # of bits per pixel */
+        fputc(i, fpGif);
 
+        fputc(Background, fpGif); /* background color */
+        fputc(0, fpGif);          /* future expansion byte */
 
         /*
          * Put Image Descriptor
          * Hardwiring Left Offset and Top Offset to 0x00
          */
-        fputc(0x2c , fpGif);
-        putword(0x00 , fpGif);
-        putword(0x00  , fpGif);
-        putword(RWidth   , fpGif);
-        putword(RHeight  , fpGif);
+        fputc(0x2c, fpGif);
+        putword(0x00, fpGif);
+        putword(0x00, fpGif);
+        putword(RWidth, fpGif);
+        putword(RHeight, fpGif);
 
         /* since we always have a local color palette ... */
-        fputc((0x80 | (BitsPerPixel - 1)) , fpGif);
+        fputc((0x80 | (BitsPerPixel - 1)), fpGif);
 
-        for (i = 0; i < ColorMapSize; i++)
-        {
+        for (i = 0; i < ColorMapSize; i++) {
             /* write out Global colormap */
             fputc(r1[i], fpGif);
             fputc(g1[i], fpGif);
             fputc(b1[i], fpGif);
         }
 
-        fputc(InitCodeSize , fpGif);
+        fputc(InitCodeSize, fpGif);
 
-        i = hdfWriteGIF(fpGif , Image , 0 , RHeight , RWidth , r1, g1 , b1 , pc2nc , 256 , 8 , BitsPerPixel);
+        i = hdfWriteGIF(fpGif, Image, 0, RHeight, RWidth, r1, g1, b1, pc2nc, 256, 8, BitsPerPixel);
         fputc(0x00, fpGif);
         free(Image);
     }
 
-    if (fputc(';',fpGif) == EOF)
-    {
+    if (fputc(';', fpGif) == EOF) {
         /* Write GIF file terminator */
-        fprintf(stderr , "Error!");
+        fprintf(stderr, "Error!");
         goto out;
     }
 
@@ -338,7 +312,6 @@ int main(int argc , char **argv)
 
     return EXIT_SUCCESS;
 
-
 out:
 
     if (fpGif != NULL)
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c
index ed3e9e9..4619b99 100644
--- a/hl/tools/gif2h5/hdfgifwr.c
+++ b/hl/tools/gif2h5/hdfgifwr.c
@@ -44,7 +44,6 @@
  * Joe Orost               (decvax!vax135!petsd!joe)
  *****************************************************************/
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -65,29 +64,29 @@ static void flush_char(void);
 #else
 static void compress(), output(), cl_block(), cl_hash();
 static void char_init(), char_out(), flush_char();
-#endif  /* __STDC__ */
+#endif /* __STDC__ */
 
 static byte pc2nc[256];
 
 /*************************************************************/
-int hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, byte *rmap,
-                byte *gmap, byte *bmap, byte *pc2ncmap, int numcols,
-                int colorstyle, int BitsPerPixel)
+int
+hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, byte *rmap, byte *gmap, byte *bmap, byte *pc2ncmap,
+            int numcols, int colorstyle, int BitsPerPixel)
 {
-    int InitCodeSize;
-    int i;
+    int   InitCodeSize;
+    int   i;
     byte *pic8 = pic;
 
     /* Shut compiler up... */
-    ptype=ptype;
-    rmap=rmap;
-    gmap=gmap;
-    bmap=bmap;
-    numcols=numcols;
-    colorstyle=colorstyle;
+    ptype      = ptype;
+    rmap       = rmap;
+    gmap       = gmap;
+    bmap       = bmap;
+    numcols    = numcols;
+    colorstyle = colorstyle;
 
     for (i = 0; i < 256; i++) {
-      pc2nc[i] = pc2ncmap[i];
+        pc2nc[i] = pc2ncmap[i];
     }
 
     if (BitsPerPixel <= 1)
@@ -96,40 +95,40 @@ int hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, byte *rmap,
         InitCodeSize = BitsPerPixel;
 
     if (!fp) {
-        fprintf(stderr,  "WriteGIF: file not open for writing\n" );
+        fprintf(stderr, "WriteGIF: file not open for writing\n");
         return (1);
     }
 
-    compress(InitCodeSize+1, fp, pic8, w*h);
+    compress(InitCodeSize + 1, fp, pic8, w * h);
 
     if (ferror(fp))
         return -1;
 
-    return  0 ;
+    return 0;
 }
 
 /***********************************************************************/
 static unsigned long cur_accum = 0;
-static int           cur_bits = 0;
+static int           cur_bits  = 0;
 
-#define MAXCODE(n_bits)     ( (1 << (n_bits)) - 1)
-#define XV_BITS 12    /* BITS was already defined on some systems */
-#define HSIZE  5003            /* 80% occupancy */
+#define MAXCODE(n_bits) ((1 << (n_bits)) - 1)
+#define XV_BITS         12   /* BITS was already defined on some systems */
+#define HSIZE           5003 /* 80% occupancy */
 
-typedef unsigned char   char_type;
+typedef unsigned char char_type;
 
 static int n_bits;                    /* number of bits/code */
 static int maxbits = XV_BITS;         /* user settable max # bits/code */
 static int maxcode;                   /* maximum code, given n_bits */
 static int maxmaxcode = 1 << XV_BITS; /* NEVER generate this */
 
-static  count_int      htab [HSIZE];
-static  unsigned short codetab [HSIZE];
+static count_int      htab[HSIZE];
+static unsigned short codetab[HSIZE];
 
-#define HashTabOf(i)   htab[i]
-#define CodeTabOf(i)   codetab[i]
+#define HashTabOf(i) htab[i]
+#define CodeTabOf(i) codetab[i]
 
-static int hsize = HSIZE;            /* for dynamic table sizing */
+static int hsize = HSIZE; /* for dynamic table sizing */
 
 /*
  * To save much memory, we overlay the table used by compress() with those
@@ -140,7 +139,7 @@ static int hsize = HSIZE;            /* for dynamic table sizing */
  * used to be 8000 characters).
  */
 
-static int free_ent = 0;                  /* first unused entry */
+static int free_ent = 0; /* first unused entry */
 
 /*
  * block compression parameters -- after all codes are used up,
@@ -148,8 +147,8 @@ static int free_ent = 0;                  /* first unused entry */
  */
 static int clear_flg = 0;
 
-static long int in_count = 1;            /* length of input */
-static long int out_count = 0;           /* # of codes output (for debugging) */
+static long int in_count  = 1; /* length of input */
+static long int out_count = 0; /* # of codes output (for debugging) */
 
 /*
  * compress stdin to stdout
@@ -167,22 +166,23 @@ static long int out_count = 0;           /* # of codes output (for debugging) */
  * about this implementation to ames!jaw.
  */
 
-static int g_init_bits;
+static int   g_init_bits;
 static FILE *g_outfile;
 
 static int ClearCode;
 static int EOFCode;
 
 /********************************************************/
-static void compress(int init_bits, FILE *outfile, byte *data, int len)
+static void
+compress(int init_bits, FILE *outfile, byte *data, int len)
 {
     register long fcode;
-    register int i = 0;
-    register int c;
-    register int ent;
-    register int disp;
-    register int hsize_reg;
-    register int hshift;
+    register int  i = 0;
+    register int  c;
+    register int  ent;
+    register int  disp;
+    register int  hsize_reg;
+    register int  hshift;
 
     /*
      * Set up the globals:  g_init_bits - initial number of bits g_outfile -
@@ -192,40 +192,40 @@ static void compress(int init_bits, FILE *outfile, byte *data, int len)
     g_outfile   = outfile;
 
     /* initialize 'compress' globals */
-    maxbits = XV_BITS;
-    maxmaxcode = 1<<XV_BITS;
+    maxbits    = XV_BITS;
+    maxmaxcode = 1 << XV_BITS;
     memset(htab, 0, sizeof(htab));
     memset(codetab, 0, sizeof(codetab));
-    hsize = HSIZE;
-    free_ent = 0;
+    hsize     = HSIZE;
+    free_ent  = 0;
     clear_flg = 0;
-    in_count = 1;
+    in_count  = 1;
     out_count = 0;
     cur_accum = 0;
-    cur_bits = 0;
+    cur_bits  = 0;
 
     /* Set up the necessary values */
     out_count = 0;
     clear_flg = 0;
-    in_count = 1;
-    maxcode = MAXCODE(n_bits = g_init_bits);
+    in_count  = 1;
+    maxcode   = MAXCODE(n_bits = g_init_bits);
 
     ClearCode = (1 << (init_bits - 1));
-    EOFCode = ClearCode + 1;
-    free_ent = ClearCode + 2;
+    EOFCode   = ClearCode + 1;
+    free_ent  = ClearCode + 2;
 
     char_init();
     ent = pc2nc[*data++];
     len--;
 
     hshift = 0;
-    for (fcode = (long)hsize; fcode < 65536L; fcode *= 2L )
+    for (fcode = (long)hsize; fcode < 65536L; fcode *= 2L)
         hshift++;
 
     hshift = 8 - hshift; /* set hash code range bound */
 
     hsize_reg = hsize;
-    cl_hash( (count_int) hsize_reg); /* clear hash table */
+    cl_hash((count_int)hsize_reg); /* clear hash table */
 
     output(ClearCode);
 
@@ -234,32 +234,33 @@ static void compress(int init_bits, FILE *outfile, byte *data, int len)
         len--;
         in_count++;
 
-        fcode = (long)(((long) c << maxbits) + ent);
-        i = (((int) c << hshift) ^ ent);    /* xor hashing */
+        fcode = (long)(((long)c << maxbits) + ent);
+        i     = (((int)c << hshift) ^ ent); /* xor hashing */
 
-        if ( HashTabOf (i) == fcode ) {
-            ent = CodeTabOf (i);
+        if (HashTabOf(i) == fcode) {
+            ent = CodeTabOf(i);
             continue;
-        } else if ( (long)HashTabOf (i) < 0) {
+        }
+        else if ((long)HashTabOf(i) < 0) {
             /* empty slot */
             goto nomatch;
         }
 
-        disp = hsize_reg - i;   /* secondary hash (after G. Knott) */
+        disp = hsize_reg - i; /* secondary hash (after G. Knott) */
 
-        if ( i == 0 )
+        if (i == 0)
             disp = 1;
 
 probe:
         if ((i -= disp) < 0)
             i += hsize_reg;
 
-        if (HashTabOf (i) == fcode) {
-            ent = CodeTabOf (i);
+        if (HashTabOf(i) == fcode) {
+            ent = CodeTabOf(i);
             continue;
         }
 
-        if ((long)HashTabOf (i) >= 0)
+        if ((long)HashTabOf(i) >= 0)
             goto probe;
 
 nomatch:
@@ -268,9 +269,10 @@ nomatch:
         ent = c;
 
         if (free_ent < maxmaxcode) {
-	    CodeTabOf (i) = (unsigned short)free_ent++; /* code -> hashtable */
-            HashTabOf (i) = fcode;
-        } else {
+            CodeTabOf(i) = (unsigned short)free_ent++; /* code -> hashtable */
+            HashTabOf(i) = fcode;
+        }
+        else {
             cl_block();
         }
     }
@@ -281,7 +283,6 @@ nomatch:
     output(EOFCode);
 }
 
-
 /*****************************************************************
  * TAG( output )
  *
@@ -299,11 +300,8 @@ nomatch:
  * code in turn.  When the buffer fills up empty it and start over.
  */
 
-static
-unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
-                                  0x001F, 0x003F, 0x007F, 0x00FF,
-                                  0x01FF, 0x03FF, 0x07FF, 0x0FFF,
-                                  0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
+static unsigned long masks[] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF,
+                                0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF};
 
 static void
 output(int code)
@@ -317,8 +315,8 @@ output(int code)
 
     cur_bits += n_bits;
 
-    while( cur_bits >= 8 ) {
-        char_out( (int)((unsigned int) cur_accum & 0xff) );
+    while (cur_bits >= 8) {
+        char_out((int)((unsigned int)cur_accum & 0xff));
         cur_accum >>= 8;
         cur_bits -= 8;
     }
@@ -329,12 +327,13 @@ output(int code)
      */
     if (free_ent > maxcode || clear_flg) {
         if (clear_flg) {
-            maxcode = MAXCODE (n_bits = g_init_bits);
+            maxcode   = MAXCODE(n_bits = g_init_bits);
             clear_flg = 0;
-        } else {
+        }
+        else {
             n_bits++;
 
-            if ( n_bits == maxbits )
+            if (n_bits == maxbits)
                 maxcode = maxmaxcode;
             else
                 maxcode = MAXCODE(n_bits);
@@ -343,17 +342,17 @@ output(int code)
 
     if (code == EOFCode) {
         /* At EOF, write the rest of the buffer */
-        while( cur_bits > 0 ) {
-            char_out( (int)((unsigned int)cur_accum & 0xff) );
+        while (cur_bits > 0) {
+            char_out((int)((unsigned int)cur_accum & 0xff));
             cur_accum >>= 8;
             cur_bits -= 8;
         }
 
         flush_char();
-        fflush( g_outfile );
+        fflush(g_outfile);
 
 #ifdef FOO
-        if(ferror( g_outfile))
+        if (ferror(g_outfile))
             FatalError("unable to write GIF file");
 #endif
     }
@@ -361,45 +360,45 @@ output(int code)
 
 /********************************/
 static void
-cl_block(void)                  /* table clear for block compress */
+cl_block(void) /* table clear for block compress */
 {
     /* Clear out the hash table */
-    cl_hash((count_int) hsize);
-    free_ent = ClearCode + 2;
+    cl_hash((count_int)hsize);
+    free_ent  = ClearCode + 2;
     clear_flg = 1;
     output(ClearCode);
 }
 
 /********************************/
 static void
-cl_hash(count_int hashsize)     /* reset code table */
+cl_hash(count_int hashsize) /* reset code table */
 {
-    count_int *htab_p = htab+hashsize;
-    long i, m1 = -1;
+    count_int *htab_p = htab + hashsize;
+    long       i, m1 = -1;
 
     i = hashsize - 16;
 
-    do {    /* might use Sys V memset(3) here */
-        *(htab_p-16) = m1;
-        *(htab_p-15) = m1;
-        *(htab_p-14) = m1;
-        *(htab_p-13) = m1;
-        *(htab_p-12) = m1;
-        *(htab_p-11) = m1;
-        *(htab_p-10) = m1;
-        *(htab_p-9) = m1;
-        *(htab_p-8) = m1;
-        *(htab_p-7) = m1;
-        *(htab_p-6) = m1;
-        *(htab_p-5) = m1;
-        *(htab_p-4) = m1;
-        *(htab_p-3) = m1;
-        *(htab_p-2) = m1;
-        *(htab_p-1) = m1;
+    do { /* might use Sys V memset(3) here */
+        *(htab_p - 16) = m1;
+        *(htab_p - 15) = m1;
+        *(htab_p - 14) = m1;
+        *(htab_p - 13) = m1;
+        *(htab_p - 12) = m1;
+        *(htab_p - 11) = m1;
+        *(htab_p - 10) = m1;
+        *(htab_p - 9)  = m1;
+        *(htab_p - 8)  = m1;
+        *(htab_p - 7)  = m1;
+        *(htab_p - 6)  = m1;
+        *(htab_p - 5)  = m1;
+        *(htab_p - 4)  = m1;
+        *(htab_p - 3)  = m1;
+        *(htab_p - 2)  = m1;
+        *(htab_p - 1)  = m1;
         htab_p -= 16;
     } while ((i -= 16) >= 0);
 
-    for ( i += 16; i > 0; i-- )
+    for (i += 16; i > 0; i--)
         *--htab_p = m1;
 }
 
@@ -426,7 +425,7 @@ char_init(void)
 /*
  * Define the storage for the packet accumulator
  */
-static char accum[ 256 ];
+static char accum[256];
 
 /*
  * Add a character to the end of the current packet, and if it is 254
@@ -435,7 +434,7 @@ static char accum[ 256 ];
 static void
 char_out(int c)
 {
-    accum[ a_count++ ] = (char)c;
+    accum[a_count++] = (char)c;
 
     if (a_count >= 254)
         flush_char();
@@ -448,8 +447,8 @@ static void
 flush_char(void)
 {
     if (a_count > 0) {
-        fputc( a_count, g_outfile );
-        fwrite( accum, (size_t)1, (size_t)a_count, g_outfile);
+        fputc(a_count, g_outfile);
+        fwrite(accum, (size_t)1, (size_t)a_count, g_outfile);
         a_count = 0;
     }
 }
diff --git a/hl/tools/gif2h5/writehdf.c b/hl/tools/gif2h5/writehdf.c
index c2933c5..0cf3926 100644
--- a/hl/tools/gif2h5/writehdf.c
+++ b/hl/tools/gif2h5/writehdf.c
@@ -37,21 +37,21 @@
 int
 WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName)
 {
-    GIFHEAD          gifHead;           /* GIF Header structure            */
-    GIFIMAGEDESC    *gifImageDesc;      /* Logical Image Descriptor struct */
-    int              has_pal=0;
+    GIFHEAD       gifHead;      /* GIF Header structure            */
+    GIFIMAGEDESC *gifImageDesc; /* Logical Image Descriptor struct */
+    int           has_pal = 0;
 
-    long ImageCount;                    /* number of images */
+    long ImageCount; /* number of images */
 #ifdef UNUSED
-    long CommentCount,                  /* number of comments */
-         ApplicationCount,              /* number of application extensions */
-         PlainTextCount;                /* number of plain text extensions */
-#endif /* UNUSED */
+    long CommentCount,    /* number of comments */
+        ApplicationCount, /* number of application extensions */
+        PlainTextCount;   /* number of plain text extensions */
+#endif                    /* UNUSED */
 
-    char ImageName[256];                /* Image name for the Image */
+    char ImageName[256]; /* Image name for the Image */
 
     /* H5 variables */
-    hid_t file_id;      /* H5 file id */
+    hid_t file_id; /* H5 file id */
 
     /* temp counter */
     int i;
@@ -62,35 +62,36 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName)
     /* get some data from gifHead */
     ImageCount = gifHead.ImageCount;
 #ifdef UNUSED
-    CommentCount = (GIFWORD)gifHead.CommentCount;
+    CommentCount     = (GIFWORD)gifHead.CommentCount;
     ApplicationCount = (GIFWORD)gifHead.ApplicationCount;
-    PlainTextCount = (GIFWORD)gifHead.PlainTextCount;
+    PlainTextCount   = (GIFWORD)gifHead.PlainTextCount;
 #endif /* UNUSED */
 
-    if ((file_id = H5Fcreate(HDFName , H5F_ACC_TRUNC , H5P_DEFAULT , H5P_DEFAULT)) < 0) {
+    if ((file_id = H5Fcreate(HDFName, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         /* error occured opening the HDF File for write */
-        fprintf(stderr , "HDF file could not be opened for writing\n");
-        fprintf(stderr , "NOTE: GIF file must be present in the same directory as the binary on UNIX systems.\n");
+        fprintf(stderr, "HDF file could not be opened for writing\n");
+        fprintf(stderr,
+                "NOTE: GIF file must be present in the same directory as the binary on UNIX systems.\n");
         exit(1);
     }
 
     /* first create the global palette if there is one */
     if (gifHead.PackedField & 0x80) { /* global palette exists */
-        hsize_t dims[2]; /* specify the dimensions of the palette */
+        hsize_t dims[2];              /* specify the dimensions of the palette */
 
         /* size of the palette is tablesize (rows) X 3 (columns) */
         dims[0] = gifHead.TableSize;
         dims[1] = 3;
 
         /* make a palette */
-        if (H5IMmake_palette(file_id,PAL_NAME,dims,(unsigned char *)gifHead.HDFPalette)<0)
-         return -1;
+        if (H5IMmake_palette(file_id, PAL_NAME, dims, (unsigned char *)gifHead.HDFPalette) < 0)
+            return -1;
 
-        has_pal=1;
+        has_pal = 1;
     }
 
-    for(i = 0; i < ImageCount; i++) {
-        hsize_t dims[2];        /* dimensions for the dataset */
+    for (i = 0; i < ImageCount; i++) {
+        hsize_t dims[2]; /* dimensions for the dataset */
         /* get the gifImageDesc */
         gifImageDesc = GifMemoryStruct.GifImageDesc[i];
 
@@ -99,26 +100,24 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName)
         dims[1] = gifImageDesc->ImageWidth;
 
         /* create the image name */
-        sprintf(ImageName , "Image%d" , i);
+        sprintf(ImageName, "Image%d", i);
 
         /* write image */
-        if (H5IMmake_image_8bit(file_id,ImageName,dims[1],dims[0],(gifImageDesc->Image))<0)
-         return -1;
+        if (H5IMmake_image_8bit(file_id, ImageName, dims[1], dims[0], (gifImageDesc->Image)) < 0)
+            return -1;
 
         /* attach the palette to the image dataset */
-        if (has_pal)
-        {
-            if (H5IMlink_palette(file_id,ImageName,PAL_NAME)<0)
+        if (has_pal) {
+            if (H5IMlink_palette(file_id, ImageName, PAL_NAME) < 0)
                 return -1;
         }
     }
 
     /* close the H5 file */
     if (H5Fclose(file_id) < 0) {
-        fprintf(stderr , "Could not close HDF5 file. Aborting...\n");
+        fprintf(stderr, "Could not close HDF5 file. Aborting...\n");
         return -1;
     }
 
     return 0;
 }
-
diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c
index 4dcf25e..8677601 100644
--- a/hl/tools/h5watch/extend_dset.c
+++ b/hl/tools/h5watch/extend_dset.c
@@ -16,18 +16,18 @@
 /*
  * Extending datasets in WATCH.h5 generated by h5watchgentest.c
  */
-#define DSET_ONE "DSET_ONE"
-#define DSET_TWO "DSET_TWO"
-#define DSET_CMPD "DSET_CMPD"
-#define DSET_CMPD_ESC "DSET_CMPD_ESC"
-#define DSET_CMPD_TWO "DSET_CMPD_TWO"
-#define DSET_ALLOC_LATE "DSET_ALLOC_LATE"
+#define DSET_ONE         "DSET_ONE"
+#define DSET_TWO         "DSET_TWO"
+#define DSET_CMPD        "DSET_CMPD"
+#define DSET_CMPD_ESC    "DSET_CMPD_ESC"
+#define DSET_CMPD_TWO    "DSET_CMPD_TWO"
+#define DSET_ALLOC_LATE  "DSET_ALLOC_LATE"
 #define DSET_ALLOC_EARLY "DSET_ALLOC_EARLY"
 
 /* The message sent by this process (extend_dset) to the test script to start "h5watch" */
-#define WRITER_MESSAGE  "writer_message"
+#define WRITER_MESSAGE "writer_message"
 /* The message received from the test script to start extending dataset */
-#define READER_MESSAGE  "reader_message"
+#define READER_MESSAGE "reader_message"
 
 /* Size of data buffer */
 #define TEST_BUF_SIZE 100
@@ -35,7 +35,6 @@
 static herr_t extend_dset_two(const char *file, char *dname, int action1, int action2);
 static herr_t extend_dset_one(const char *file, char *dname, int action);
 
-
 /* Data structures for datasets with compound data type */
 typedef struct sub22_t {
     int a;
@@ -44,9 +43,9 @@ typedef struct sub22_t {
 } sub22_t;
 
 typedef struct sub2_t {
-    int a;
+    int     a;
     sub22_t b;
-    int c;
+    int     c;
 } sub2_t;
 
 typedef struct sub4_t {
@@ -55,7 +54,7 @@ typedef struct sub4_t {
 } sub4_t;
 
 typedef struct set_t {
-    int field1;
+    int    field1;
     sub2_t field2;
     double field3;
     sub4_t field4;
@@ -66,73 +65,73 @@ typedef struct set_t {
  *
  * Extending a two-dimensional dataset by action1 and action2.
  *        --action1 and action2 can be a positive # or negative # or 0.
- *  
+ *
  ***********************************************************************
  */
 static herr_t
 extend_dset_two(const char *file, char *dname, int action1, int action2)
 {
-    hid_t fid = -1;         /* file id                                          */
-    hid_t fapl = -1;        /* file access property list id                     */
-    hid_t did = -1;         /* dataset id                                       */
-    hid_t sid = -1;         /* dataspace id                                     */
-    hid_t dtid = -1;        /* dataset's datatype id                            */
-    int ndims;              /* # of dimension sizes                             */
-    unsigned i;             /* local index variable                             */
-    hsize_t ext_dims[2];    /* new dimension sizes after extension              */
-    hsize_t cur_dims[2];    /* current dimension sizes                          */
-    size_t dtype_size;      /* size of the dataset's datatype                   */
-    unsigned num_elmts;     /* number of elements in the dataset                */
-    int *ibuf = NULL;       /* buffer for storing retrieved elements (integer)  */
-    set_t *cbuf = NULL;     /* buffer for storing retrieved elemnets (compound) */
+    hid_t    fid  = -1;   /* file id                                          */
+    hid_t    fapl = -1;   /* file access property list id                     */
+    hid_t    did  = -1;   /* dataset id                                       */
+    hid_t    sid  = -1;   /* dataspace id                                     */
+    hid_t    dtid = -1;   /* dataset's datatype id                            */
+    int      ndims;       /* # of dimension sizes                             */
+    unsigned i;           /* local index variable                             */
+    hsize_t  ext_dims[2]; /* new dimension sizes after extension              */
+    hsize_t  cur_dims[2]; /* current dimension sizes                          */
+    size_t   dtype_size;  /* size of the dataset's datatype                   */
+    unsigned num_elmts;   /* number of elements in the dataset                */
+    int *    ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
+    set_t *  cbuf = NULL; /* buffer for storing retrieved elemnets (compound) */
 
     /* Allocate memory */
-    if(NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
+    if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
         goto error;
-    if(NULL == (cbuf = (set_t *)HDcalloc(TEST_BUF_SIZE, sizeof(set_t))))
+    if (NULL == (cbuf = (set_t *)HDcalloc(TEST_BUF_SIZE, sizeof(set_t))))
         goto error;
 
     /* Create a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
 
     /* Set to use the latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         goto error;
 
     /* Open the file and dataset with SWMR write */
-    if((fid = H5Fopen(file, H5F_ACC_RDWR|H5F_ACC_SWMR_WRITE, fapl)) < 0)
+    if ((fid = H5Fopen(file, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0)
         goto error;
 
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Send message to the test script to start "h5watch" */
     h5_send_message(WRITER_MESSAGE, NULL, NULL);
 
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         goto error;
 
-    if((ndims = H5Sget_simple_extent_ndims(sid)) < 0)
+    if ((ndims = H5Sget_simple_extent_ndims(sid)) < 0)
         goto error;
 
     /* Get the size of the dataset's datatype */
-    if((dtype_size = H5LDget_dset_type_size(did, NULL)) == 0)
+    if ((dtype_size = H5LDget_dset_type_size(did, NULL)) == 0)
         goto error;
 
     /* Get the dataset's data type */
-    if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+    if ((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
         goto error;
 
     /* Wait for message from the test script to start extending dataset */
-    if(h5_wait_message(READER_MESSAGE) < 0)
+    if (h5_wait_message(READER_MESSAGE) < 0)
         goto error;
 
     /* sleep to emulate about 2 seconds of application operation */
     HDsleep(2);
 
     /* Get current dimension sizes */
-    if(H5LDget_dset_dims(did, cur_dims) < 0)
+    if (H5LDget_dset_dims(did, cur_dims) < 0)
         goto error;
 
     /* Set up the new extended dimension sizes  */
@@ -140,68 +139,74 @@ extend_dset_two(const char *file, char *dname, int action1, int action2)
     ext_dims[1] = cur_dims[1] + (hsize_t)action2;
 
     /* Extend the dataset */
-    if(H5Dset_extent(did, ext_dims) < 0)
+    if (H5Dset_extent(did, ext_dims) < 0)
         goto error;
 
     num_elmts = 1;
-    for(i = 0; i < (unsigned)ndims; i++)
+    for (i = 0; i < (unsigned)ndims; i++)
         num_elmts *= (unsigned)ext_dims[i];
 
     /* Compound type */
-    if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
+    if (!HDstrcmp(dname, DSET_CMPD_TWO)) {
 
         HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-        for(i = 0; i < num_elmts; i++) {
-            cbuf[i].field1 = action1;
-            cbuf[i].field2.a = action1;
-            cbuf[i].field2.c = action1;
+        for (i = 0; i < num_elmts; i++) {
+            cbuf[i].field1     = action1;
+            cbuf[i].field2.a   = action1;
+            cbuf[i].field2.c   = action1;
             cbuf[i].field2.b.a = action1;
             cbuf[i].field2.b.b = action1;
             cbuf[i].field2.b.c = action1;
-            cbuf[i].field3 = action1;
-            cbuf[i].field4.a = action1;
-            cbuf[i].field4.b = action1;
+            cbuf[i].field3     = action1;
+            cbuf[i].field4.a   = action1;
+            cbuf[i].field4.b   = action1;
         } /* end for */
 
-       /* Write to the dataset */
-        if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
+        /* Write to the dataset */
+        if (H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
             goto error;
-
-    } else { /* Integer type */
+    }
+    else { /* Integer type */
         HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
-        for(i = 0; i < num_elmts; i++)
+        for (i = 0; i < num_elmts; i++)
             ibuf[i] = action1;
 
         /* Write to the dataset */
-        if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
+        if (H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
             goto error;
     } /* end if-else */
 
-    if(H5Dflush(did) < 0)
+    if (H5Dflush(did) < 0)
         goto error;
 
     /* Closing */
-    if(H5Tclose(dtid) < 0) goto error;
-    if(H5Dclose(did) < 0) goto error;
-    if(H5Pclose(fapl) < 0) goto error;
-    if(H5Fclose(fid) < 0) goto error;
+    if (H5Tclose(dtid) < 0)
+        goto error;
+    if (H5Dclose(did) < 0)
+        goto error;
+    if (H5Pclose(fapl) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
 
-    if(ibuf) HDfree(ibuf);
-    if(cbuf) HDfree(cbuf);
+    if (ibuf)
+        HDfree(ibuf);
+    if (cbuf)
+        HDfree(cbuf);
 
     return SUCCEED;
 
 error:
     H5E_BEGIN_TRY
-        H5Tclose(dtid);
-        H5Dclose(did);
-        H5Pclose(fapl);
-        H5Fclose(fid);
+    H5Tclose(dtid);
+    H5Dclose(did);
+    H5Pclose(fapl);
+    H5Fclose(fid);
     H5E_END_TRY
 
-    if(ibuf)
+    if (ibuf)
         HDfree(ibuf);
-    if(cbuf)
+    if (cbuf)
         HDfree(cbuf);
 
     return FAIL;
@@ -219,98 +224,98 @@ error:
 static herr_t
 extend_dset_one(const char *file, char *dname, int action)
 {
-    hid_t fid = -1;         /* file id                                          */
-    hid_t fapl = -1;        /* file access property list id                     */
-    hid_t did = -1;         /* dataset id                                       */
-    hid_t dtid = -1;        /* dataset's datatype id                            */
-    hid_t sid = -1;         /* dataspace id                                     */
-    hid_t mid = -1;         /* memory space id                                  */
-    int i;                  /* local index variable                             */
-    hsize_t cur_dims[1];    /* current dimension sizes                          */
-    hsize_t ext_dims[1];    /* new dimension sizes after extension              */
-    hsize_t offset[1];      /* starting offsets of appended data                */
-    hsize_t count[1];       /* dimension sizes of appended data                 */
-    size_t dtype_size;      /* size of the dataset's datatype                   */
-    int *ibuf = NULL;       /* buffer for storing retrieved elements (integer)  */
-    set_t *cbuf = NULL;     /* buffer for storing retrieved elemnets (compound) */
+    hid_t   fid  = -1;   /* file id                                          */
+    hid_t   fapl = -1;   /* file access property list id                     */
+    hid_t   did  = -1;   /* dataset id                                       */
+    hid_t   dtid = -1;   /* dataset's datatype id                            */
+    hid_t   sid  = -1;   /* dataspace id                                     */
+    hid_t   mid  = -1;   /* memory space id                                  */
+    int     i;           /* local index variable                             */
+    hsize_t cur_dims[1]; /* current dimension sizes                          */
+    hsize_t ext_dims[1]; /* new dimension sizes after extension              */
+    hsize_t offset[1];   /* starting offsets of appended data                */
+    hsize_t count[1];    /* dimension sizes of appended data                 */
+    size_t  dtype_size;  /* size of the dataset's datatype                   */
+    int *   ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
+    set_t * cbuf = NULL; /* buffer for storing retrieved elemnets (compound) */
 
     /* Allocate memory */
-    if(NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
+    if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
         goto error;
-    if(NULL == (cbuf = (set_t *)HDcalloc(TEST_BUF_SIZE, sizeof(set_t))))
+    if (NULL == (cbuf = (set_t *)HDcalloc(TEST_BUF_SIZE, sizeof(set_t))))
         goto error;
 
     /* Create a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
 
     /* Set to use the latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         goto error;
 
     /* Open the file and dataset with SWMR write */
-    if((fid = H5Fopen(file, H5F_ACC_RDWR|H5F_ACC_SWMR_WRITE, fapl)) < 0)
+    if ((fid = H5Fopen(file, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0)
         goto error;
 
     /* Send message to the test script to start "h5watch" */
     h5_send_message(WRITER_MESSAGE, NULL, NULL);
 
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Get size of the dataset's datatype */
-    if((dtype_size = H5LDget_dset_type_size(did, NULL)) == 0)
+    if ((dtype_size = H5LDget_dset_type_size(did, NULL)) == 0)
         goto error;
 
     /* Get dataset's datatype */
-    if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
+    if ((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
         goto error;
 
     /* Wait for message from the test script to start extending dataset */
-    if(h5_wait_message(READER_MESSAGE) < 0)
+    if (h5_wait_message(READER_MESSAGE) < 0)
         goto error;
 
     /* sleep to emulate about 2 seconds of application operation */
     HDsleep(2);
 
     /* Get current dimension sizes */
-    if(H5LDget_dset_dims(did, cur_dims) < 0)
+    if (H5LDget_dset_dims(did, cur_dims) < 0)
         goto error;
 
     /* Set up the new extended dimension sizes  */
     ext_dims[0] = cur_dims[0] + (hsize_t)action;
 
     /* Extend the dataset */
-    if(H5Dset_extent(did, ext_dims) < 0)
+    if (H5Dset_extent(did, ext_dims) < 0)
         goto error;
 
     /* Write to the new appended region of the dataset */
-    if(action > 0) {
+    if (action > 0) {
 
         /* Select the extended region */
         offset[0] = cur_dims[0];
-        count[0] = (hsize_t)action;
-        if((sid = H5Dget_space(did)) < 0)
+        count[0]  = (hsize_t)action;
+        if ((sid = H5Dget_space(did)) < 0)
             goto error;
-        if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+        if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
             goto error;
 
         /* Set up memory space and get dataset's datatype */
-        if((mid = H5Screate_simple(1, count, NULL)) < 0)
+        if ((mid = H5Screate_simple(1, count, NULL)) < 0)
             goto error;
 
         /* Initialize data for the extended region of the dataset */
         /* Compound type */
-        if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+        if (!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
 
             HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-            for(i = 0; i < action; i++) {
-                cbuf[i].field1 = i + 1;
-                cbuf[i].field2.a = i + 2;
+            for (i = 0; i < action; i++) {
+                cbuf[i].field1     = i + 1;
+                cbuf[i].field2.a   = i + 2;
                 cbuf[i].field2.b.a = i + 2;
                 cbuf[i].field2.b.b = i + 2;
                 cbuf[i].field2.b.c = i + 2;
-                cbuf[i].field2.c = i + 2;
+                cbuf[i].field2.c   = i + 2;
 
                 cbuf[i].field3 = i + 3;
 
@@ -319,57 +324,65 @@ extend_dset_one(const char *file, char *dname, int action)
             } /* end for */
 
             /* Write to the extended region of the dataset */
-            if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, cbuf) < 0)
+            if (H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, cbuf) < 0)
                 goto error;
-        } else { /* Integer type */
+        }
+        else { /* Integer type */
 
             HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
-            for(i = 0; i < action; i++)
+            for (i = 0; i < action; i++)
                 ibuf[i] = (int)i;
 
             /* Write to the extended region of the dataset */
-            if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, ibuf) < 0)
+            if (H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, ibuf) < 0)
                 goto error;
         } /* end if-else */
 
         /* Closing */
-        if(H5Sclose(sid) < 0) goto error;
-        if(H5Sclose(mid) < 0) goto error;
+        if (H5Sclose(sid) < 0)
+            goto error;
+        if (H5Sclose(mid) < 0)
+            goto error;
     } /* end if */
 
-    if(H5Dflush(did) < 0)
+    if (H5Dflush(did) < 0)
         goto error;
 
     /* Closing */
-    if(H5Tclose(dtid) < 0) goto error;
-    if(H5Dclose(did) < 0) goto error;
-    if(H5Pclose(fapl) < 0) goto error;
-    if(H5Fclose(fid) < 0) goto error;
+    if (H5Tclose(dtid) < 0)
+        goto error;
+    if (H5Dclose(did) < 0)
+        goto error;
+    if (H5Pclose(fapl) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
 
-    if(ibuf) HDfree(ibuf);
-    if(cbuf) HDfree(cbuf);
+    if (ibuf)
+        HDfree(ibuf);
+    if (cbuf)
+        HDfree(cbuf);
 
     return SUCCEED;
 
 error:
     H5E_BEGIN_TRY
-        H5Sclose(sid);
-        H5Sclose(mid);
-        H5Tclose(dtid);
-        H5Dclose(did);
-        H5Pclose(fapl);
-        H5Fclose(fid);
+    H5Sclose(sid);
+    H5Sclose(mid);
+    H5Tclose(dtid);
+    H5Dclose(did);
+    H5Pclose(fapl);
+    H5Fclose(fid);
     H5E_END_TRY
 
-    if(ibuf)
+    if (ibuf)
         HDfree(ibuf);
-    if(cbuf)
+    if (cbuf)
         HDfree(cbuf);
 
     return FAIL;
 } /* end extend_dset_one() */
 
-
 /*
  ***********************************************************************
  *
@@ -383,32 +396,33 @@ main(int argc, const char *argv[])
 {
     char *dname = NULL;
     char *fname = NULL;
-    int action1, action2;
+    int   action1, action2;
 
-    if(argc != 5) {
+    if (argc != 5) {
         HDfprintf(stderr, "Should have file name, dataset name, and the extended amount...\n");
         goto error;
     } /* end if */
 
     /* Get the dataset name to be extended */
-    fname = HDstrdup(argv[1]);
-    dname = HDstrdup(argv[2]);
+    fname   = HDstrdup(argv[1]);
+    dname   = HDstrdup(argv[2]);
     action1 = HDatoi(argv[3]);
     action2 = HDatoi(argv[4]);
 
-    if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-        if(extend_dset_one(fname, dname, action1) < 0)
+    if (!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+        if (extend_dset_one(fname, dname, action1) < 0)
             goto error;
-    } else if(!HDstrcmp(dname, DSET_ONE) || 
-              !HDstrcmp(dname, DSET_ALLOC_LATE) || 
-              !HDstrcmp(dname, DSET_ALLOC_EARLY)) {
-        if(extend_dset_one(fname, dname, action1) < 0)
+    }
+    else if (!HDstrcmp(dname, DSET_ONE) || !HDstrcmp(dname, DSET_ALLOC_LATE) ||
+             !HDstrcmp(dname, DSET_ALLOC_EARLY)) {
+        if (extend_dset_one(fname, dname, action1) < 0)
             goto error;
-    } else if(!HDstrcmp(dname, DSET_TWO) || 
-              !HDstrcmp(dname, DSET_CMPD_TWO)) {
-        if(extend_dset_two(fname, dname, action1, action2) < 0)
+    }
+    else if (!HDstrcmp(dname, DSET_TWO) || !HDstrcmp(dname, DSET_CMPD_TWO)) {
+        if (extend_dset_two(fname, dname, action1, action2) < 0)
             goto error;
-    } else {
+    }
+    else {
         HDfprintf(stdout, "Dataset cannot be extended...\n");
         goto error;
     } /* end if-else */
@@ -416,9 +430,9 @@ main(int argc, const char *argv[])
     HDexit(EXIT_SUCCESS);
 
 error:
-    if(dname)
+    if (dname)
         HDfree(dname);
-    if(fname)
+    if (fname)
         HDfree(fname);
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index b7f583c..22ed314 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -18,10 +18,9 @@
 /*
  * Note: This tool used private routine
  */
-#define PROGRAMNAME     "h5watch"       /* Name of tool */
-#define FIELD_SEP       ","             /* nested field separator */
-#define DEFAULT_RETRY   50                /* number of times to try opening the file */
-
+#define PROGRAMNAME   "h5watch" /* Name of tool */
+#define FIELD_SEP     ","       /* nested field separator */
+#define DEFAULT_RETRY 50        /* number of times to try opening the file */
 
 /*
  * Note:(see comments in hl/src/H5LDprivate.h)
@@ -29,80 +28,57 @@
  *    This tool uses H5LD_memb_t data structure declared in H5LDprivate.h
  */
 
-const char  *progname = "h5watch";          /* tool name */
-static char *g_list_of_fields = NULL;       /* command line input for "list_of_fields" */
-static char *g_dup_fields = NULL;           /* copy of "list_of_fields" */
-static H5LD_memb_t **g_listv = NULL;        /* vector info for "list_of_fields" */
+const char *         progname         = "h5watch"; /* tool name */
+static char *        g_list_of_fields = NULL;      /* command line input for "list_of_fields" */
+static char *        g_dup_fields     = NULL;      /* copy of "list_of_fields" */
+static H5LD_memb_t **g_listv          = NULL;      /* vector info for "list_of_fields" */
 
-static hbool_t g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */
-static unsigned g_polling_interval = 1;        /* polling interval to check appended data */
+static hbool_t  g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */
+static unsigned g_polling_interval  = 1;     /* polling interval to check appended data */
 
-static hbool_t g_label = FALSE;             /* label compound values */
-static int g_display_width = 80;            /* output width in characters */
-static hbool_t g_simple_output = FALSE;     /* make output more machine-readable */
-static unsigned g_retry = DEFAULT_RETRY;    /* # of times to try opening the file if somehow file is unstable */
-static hbool_t g_display_hex = FALSE;       /* display data in hexadecimal format : LATER */
-static hbool_t g_user_interrupt = FALSE;    /* Flag to indicate that user interrupted execution */
+static hbool_t  g_label         = FALSE;  /* label compound values */
+static int      g_display_width = 80;     /* output width in characters */
+static hbool_t  g_simple_output = FALSE;  /* make output more machine-readable */
+static unsigned g_retry = DEFAULT_RETRY;  /* # of times to try opening the file if somehow file is unstable */
+static hbool_t  g_display_hex    = FALSE; /* display data in hexadecimal format : LATER */
+static hbool_t  g_user_interrupt = FALSE; /* Flag to indicate that user interrupted execution */
 
 static herr_t doprint(hid_t did, hsize_t *start, hsize_t *block, int rank);
-static herr_t slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims,
-  hsize_t *start, hsize_t *block, int rank, int subrank);
+static herr_t slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims, hsize_t *start, hsize_t *block,
+                         int rank, int subrank);
 static herr_t monitor_dataset(hid_t fid, char *dsetname);
 static herr_t process_cmpd_fields(hid_t fid, char *dsetname);
 static herr_t check_dataset(hid_t fid, char *dsetname);
-static void leave(int ret);
-static void usage(const char *prog);
-static void parse_command_line(int argc, const char *argv[]);
-
+static void   leave(int ret);
+static void   usage(const char *prog);
+static void   parse_command_line(int argc, const char *argv[]);
 
 /*
  * Command-line options: The user can only specify long-named parameters.
  * The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *s_opts ="?";
-static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "hel", no_arg, 'h' },
-    { "dim", no_arg, 'd' },
-    { "di", no_arg, 'd' },
-    { "label", no_arg, 'l' },
-    { "labe", no_arg, 'l' },
-    { "lab", no_arg, 'l' },
-    { "la", no_arg, 'l' },
-    { "simple", no_arg, 'S' },
-    { "simpl", no_arg, 'S' },
-    { "simp", no_arg, 'S' },
-    { "sim", no_arg, 'S' },
-    { "si", no_arg, 'S' },
-    { "hexdump", no_arg, 'x' },
-    { "hexdum", no_arg, 'x' },
-    { "hexdu", no_arg, 'x' },
-    { "hexd", no_arg, 'x' },
-    { "hex", no_arg, 'x' },
-    { "width", require_arg, 'w' },
-    { "widt", require_arg, 'w' },
-    { "wid", require_arg, 'w' },
-    { "wi", require_arg, 'w' },
-    { "polling", require_arg, 'p' },
-    { "pollin", require_arg, 'p' },
-    { "polli", require_arg, 'p' },
-    { "poll", require_arg, 'p' },
-    { "pol", require_arg, 'p' },
-    { "po", require_arg, 'p' },
-    { "fields", require_arg, 'f' },
-    { "field", require_arg, 'f' },
-    { "fiel", require_arg, 'f' },
-    { "fie", require_arg, 'f' },
-    { "fi", require_arg, 'f' },
-    { "version", no_arg, 'V' },
-    { "versio", no_arg, 'V' },
-    { "versi", no_arg, 'V' },
-    { "vers", no_arg, 'V' },
-    { "ver", no_arg, 'V' },
-    { "ve", no_arg, 'V' },
-    { NULL, 0, '\0' }
-};
+static const char *        s_opts   = "?";
+static struct long_options l_opts[] = {{"help", no_arg, 'h'},         {"hel", no_arg, 'h'},
+                                       {"dim", no_arg, 'd'},          {"di", no_arg, 'd'},
+                                       {"label", no_arg, 'l'},        {"labe", no_arg, 'l'},
+                                       {"lab", no_arg, 'l'},          {"la", no_arg, 'l'},
+                                       {"simple", no_arg, 'S'},       {"simpl", no_arg, 'S'},
+                                       {"simp", no_arg, 'S'},         {"sim", no_arg, 'S'},
+                                       {"si", no_arg, 'S'},           {"hexdump", no_arg, 'x'},
+                                       {"hexdum", no_arg, 'x'},       {"hexdu", no_arg, 'x'},
+                                       {"hexd", no_arg, 'x'},         {"hex", no_arg, 'x'},
+                                       {"width", require_arg, 'w'},   {"widt", require_arg, 'w'},
+                                       {"wid", require_arg, 'w'},     {"wi", require_arg, 'w'},
+                                       {"polling", require_arg, 'p'}, {"pollin", require_arg, 'p'},
+                                       {"polli", require_arg, 'p'},   {"poll", require_arg, 'p'},
+                                       {"pol", require_arg, 'p'},     {"po", require_arg, 'p'},
+                                       {"fields", require_arg, 'f'},  {"field", require_arg, 'f'},
+                                       {"fiel", require_arg, 'f'},    {"fie", require_arg, 'f'},
+                                       {"fi", require_arg, 'f'},      {"version", no_arg, 'V'},
+                                       {"versio", no_arg, 'V'},       {"versi", no_arg, 'V'},
+                                       {"vers", no_arg, 'V'},         {"ver", no_arg, 'V'},
+                                       {"ve", no_arg, 'V'},           {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function: doprint()
@@ -121,29 +97,29 @@ static struct long_options l_opts[] = {
 static herr_t
 doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
 {
-    h5tools_context_t   ctx;      /* print context  */
-    h5tool_format_t  info;    /* Format info for the tools library */
-    static char fmt_double[16], fmt_float[16];    /* Format info */
-    struct subset_t subset;    /* Subsetting info */
-    hsize_t ss_start[H5S_MAX_RANK];    /* Info for hyperslab */
-    hsize_t ss_stride[H5S_MAX_RANK];    /* Info for hyperslab */
-    hsize_t ss_block[H5S_MAX_RANK];    /* Info for hyperslab */
-    hsize_t ss_count[H5S_MAX_RANK];    /* Info for hyperslab */
-    int i;            /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    h5tools_context_t ctx;                           /* print context  */
+    h5tool_format_t   info;                          /* Format info for the tools library */
+    static char       fmt_double[16], fmt_float[16]; /* Format info */
+    struct subset_t   subset;                        /* Subsetting info */
+    hsize_t           ss_start[H5S_MAX_RANK];        /* Info for hyperslab */
+    hsize_t           ss_stride[H5S_MAX_RANK];       /* Info for hyperslab */
+    hsize_t           ss_block[H5S_MAX_RANK];        /* Info for hyperslab */
+    hsize_t           ss_count[H5S_MAX_RANK];        /* Info for hyperslab */
+    int               i;                             /* Local index variable */
+    herr_t            ret_value = SUCCEED;           /* Return value */
 
     /* Subsetting information for the tools library printing routines */
-    subset.start.data = ss_start;
+    subset.start.data  = ss_start;
     subset.stride.data = ss_stride;
-    subset.block.data = ss_block;
-    subset.count.data = ss_count;
+    subset.block.data  = ss_block;
+    subset.count.data  = ss_count;
 
     /* Initialize subsetting information */
-    for(i = 0; i < rank; i++) {
+    for (i = 0; i < rank; i++) {
         subset.stride.data[i] = 1;
-        subset.count.data[i] = 1;
-        subset.start.data[i] = start[i];
-        subset.block.data[i] = block[i];
+        subset.count.data[i]  = 1;
+        subset.start.data[i]  = start[i];
+        subset.block.data[i]  = block[i];
     } /* end for */
 
     HDmemset(&ctx, 0, sizeof(ctx));
@@ -152,13 +128,13 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
     /* Set to all default values and then override */
     HDmemset(&info, 0, sizeof info);
 
-    if(g_simple_output) {
-        info.idx_fmt = "";
-        info.line_ncols = 65535; /*something big*/
-        info.line_per_line = 1;
+    if (g_simple_output) {
+        info.idx_fmt        = "";
+        info.line_ncols     = 65535; /*something big*/
+        info.line_per_line  = 1;
         info.line_multi_new = 0;
-        info.line_pre  = "        ";
-        info.line_cont = "         ";
+        info.line_pre       = "        ";
+        info.line_cont      = "         ";
 
         info.arr_pre = "";
         info.arr_suf = "";
@@ -169,18 +145,18 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
         info.cmpd_sep = " ";
 
         /* The "fields" selected by the user */
-        info.cmpd_listv = (const struct H5LD_memb_t * const *)g_listv;
+        info.cmpd_listv = (const struct H5LD_memb_t *const *)g_listv;
 
-        if(g_label)
+        if (g_label)
             info.cmpd_name = "%s=";
 
-        info.elmt_suf1 = " ";
+        info.elmt_suf1  = " ";
         info.str_locale = ESCAPE_HTML;
-
-    } else {
+    }
+    else {
         info.idx_fmt = "(%s)";
-        if(!g_display_width) {
-            info.line_ncols = 65535;
+        if (!g_display_width) {
+            info.line_ncols    = 65535;
             info.line_per_line = 1;
         } /* end if */
         else
@@ -189,11 +165,11 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
         info.line_multi_new = 1;
 
         /* The "fields" selected by the user */
-        info.cmpd_listv = (const struct H5LD_memb_t * const *)g_listv;
-        if(g_label)
+        info.cmpd_listv = (const struct H5LD_memb_t *const *)g_listv;
+        if (g_label)
             info.cmpd_name = "%s=";
-        info.line_pre  = "        %s ";
-        info.line_cont = "        %s  ";
+        info.line_pre   = "        %s ";
+        info.line_cont  = "        %s  ";
         info.str_repeat = 8;
     } /* end else */
 
@@ -203,25 +179,25 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
     sprintf(fmt_double, "%%1.%dg", DBL_DIG);
     info.fmt_double = fmt_double;
 
-    info.dset_format =  "DSET-%s ";
+    info.dset_format     = "DSET-%s ";
     info.dset_hidefileno = 0;
 
-    info.obj_format = "-%lu:"H5_PRINTF_HADDR_FMT;
+    info.obj_format     = "-%lu:" H5_PRINTF_HADDR_FMT;
     info.obj_hidefileno = 0;
 
     info.dset_blockformat_pre = "%sBlk%lu: ";
-    info.dset_ptformat_pre = "%sPt%lu: ";
+    info.dset_ptformat_pre    = "%sPt%lu: ";
 
     info.line_indent = "";
 
-    if(g_display_hex) {
+    if (g_display_hex) {
         /* Print all data in hexadecimal format if the `-x' or `--hexdump'
          * command line switch was given. */
         info.raw = TRUE;
     } /* end if */
 
     /* Print the values. */
-    if((ret_value = h5tools_dump_dset(stdout, &info, &ctx, did)) < 0)
+    if ((ret_value = h5tools_dump_dset(stdout, &info, &ctx, did)) < 0)
         error_msg("unable to print data\n");
 
     HDfprintf(stdout, "\n");
@@ -251,25 +227,26 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
  *-------------------------------------------------------------------------
  */
 static herr_t
-slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims, hsize_t *start, hsize_t *block, int rank, int subrank)
+slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims, hsize_t *start, hsize_t *block, int rank,
+           int subrank)
 {
-    int i;                      /* Local index variable */
-    int ind;                    /* Index for the current rank */
+    int    i;                   /* Local index variable */
+    int    ind;                 /* Index for the current rank */
     herr_t ret_value = SUCCEED; /* Return value */
 
     ind = rank - subrank;
 
-    if((subrank - 1) > 0) {
+    if ((subrank - 1) > 0) {
         /* continue onto the next dimension */
-        for (i = 0; i < (hssize_t)MIN(prev_dims[ind], cur_dims[ind]); i++){
+        for (i = 0; i < (hssize_t)MIN(prev_dims[ind], cur_dims[ind]); i++) {
             start[ind] = (hsize_t)i;
-            if((ret_value = slicendump(did, prev_dims, cur_dims, start, block, rank, subrank-1)) < 0)
+            if ((ret_value = slicendump(did, prev_dims, cur_dims, start, block, rank, subrank - 1)) < 0)
                 goto done;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* this dimension remains the same or shrinking */
-    if(cur_dims[ind] <= prev_dims[ind])
+    if (cur_dims[ind] <= prev_dims[ind])
         goto done;
 
     /* select first the slice for the faster changing dimension */
@@ -277,7 +254,7 @@ slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims, hsize_t *start, hsi
     start[ind] = prev_dims[ind];
     block[ind] = cur_dims[ind] - prev_dims[ind];
 
-    for(i = ind + 1; i < rank; i++){
+    for (i = ind + 1; i < rank; i++) {
         start[i] = 0;
         block[i] = cur_dims[i];
     } /* end for */
@@ -289,7 +266,6 @@ done:
     return ret_value;
 } /* end slicendump() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    monitor_dataset
  *
@@ -309,30 +285,30 @@ done:
 static herr_t
 monitor_dataset(hid_t fid, char *dsetname)
 {
-    hid_t did;        /* dataset id */
-    hid_t sid;        /* dataspace id */
-    int    ndims;        /* # of dimensions in the dataspace */
-    int i, u;        /* local index variable */
-    hsize_t prev_dims[H5S_MAX_RANK];    /* current dataspace dimensions */
-    hsize_t cur_dims[H5S_MAX_RANK];    /* previous dataspace dimensions */
-    herr_t ret_value = SUCCEED;    /* return value */
+    hid_t   did;                     /* dataset id */
+    hid_t   sid;                     /* dataspace id */
+    int     ndims;                   /* # of dimensions in the dataspace */
+    int     i, u;                    /* local index variable */
+    hsize_t prev_dims[H5S_MAX_RANK]; /* current dataspace dimensions */
+    hsize_t cur_dims[H5S_MAX_RANK];  /* previous dataspace dimensions */
+    herr_t  ret_value = SUCCEED;     /* return value */
 
     HDfprintf(stdout, "Monitoring dataset %s...\n", dsetname);
 
     /* Open the dataset for minitoring */
-    if((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
+    if ((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
         error_msg("error in opening dataset \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
-    if((sid = H5Dget_space(did)) < 0) {
+    if ((sid = H5Dget_space(did)) < 0) {
         error_msg("error in getting dataspace id for dataset \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Get the dataset's dimension sizes */
-    if((ndims = H5Sget_simple_extent_dims(sid, prev_dims, NULL)) < 0) {
+    if ((ndims = H5Sget_simple_extent_dims(sid, prev_dims, NULL)) < 0) {
         error_msg("unable to get dimensions sizes for \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
@@ -340,58 +316,59 @@ monitor_dataset(hid_t fid, char *dsetname)
     HDfflush(stdout);
 
     /* Loop until an error occurs or the user interrupts execution */
-    while(!g_user_interrupt) {
+    while (!g_user_interrupt) {
 
         /* Refreshes the dataset */
-        if(H5Drefresh(did) < 0) {
+        if (H5Drefresh(did) < 0) {
             ret_value = FAIL;
             goto done;
         }
 
         /* Get the dataset's current dimension sizes */
-        if(H5LDget_dset_dims(did, cur_dims) < 0) {
+        if (H5LDget_dset_dims(did, cur_dims) < 0) {
             error_msg("unable to get dimension sizes for \"%s\"\n", dsetname);
             ret_value = FAIL;
             goto done;
         }
 
         /* Check the dimension sizes */
-        for(i = 0; i < ndims; i++)
-            if(cur_dims[i] != prev_dims[i])
+        for (i = 0; i < ndims; i++)
+            if (cur_dims[i] != prev_dims[i])
                 break;
 
         /* at least one dimension has changed */
-        if(i != ndims) {
+        if (i != ndims) {
             /* Printing changes in dimension sizes */
-            for(u = 0; u < ndims; u++) {
+            for (u = 0; u < ndims; u++) {
                 HDfprintf(stdout, "dimension %u: %Hu->%Hu", (unsigned)u, prev_dims[u], cur_dims[u]);
-                if(cur_dims[u] > prev_dims[u])
+                if (cur_dims[u] > prev_dims[u])
                     HDfprintf(stdout, " (increases)\n");
-                else if(cur_dims[u] < prev_dims[u])
+                else if (cur_dims[u] < prev_dims[u])
                     HDfprintf(stdout, " (decreases)\n");
                 else
                     HDfprintf(stdout, " (unchanged)\n");
             }
 
             /* Printing elements appended to the dataset if there is */
-            if(!g_monitor_size_only) {
+            if (!g_monitor_size_only) {
 
                 /* See if at least one dimension size has increased */
-                for(u = 0; u < ndims; u++) {
-                    int j;
+                for (u = 0; u < ndims; u++) {
+                    int     j;
                     hsize_t start[H5S_MAX_RANK];
                     hsize_t block[H5S_MAX_RANK];
 
                     /* Print the new appended data to the dataset */
-                    if(cur_dims[u] > prev_dims[u]) {
+                    if (cur_dims[u] > prev_dims[u]) {
                         HDfprintf(stdout, "    Data:\n");
 
-                        for(j = 0; j < ndims; j++) {
+                        for (j = 0; j < ndims; j++) {
                             start[j] = 0;
                             block[j] = 1;
                         }
 
-                        if((ret_value = slicendump(did, prev_dims, cur_dims, start, block, ndims, ndims)) < 0)
+                        if ((ret_value = slicendump(did, prev_dims, cur_dims, start, block, ndims, ndims)) <
+                            0)
                             goto done;
                         break;
                     }
@@ -412,10 +389,10 @@ monitor_dataset(hid_t fid, char *dsetname)
 done:
     /* Closing */
     H5E_BEGIN_TRY
-        H5Dclose(did);
+    H5Dclose(did);
     H5E_END_TRY
 
-    return(ret_value);
+    return (ret_value);
 } /* monitor_dataset() */
 
 /*-------------------------------------------------------------------------
@@ -433,53 +410,53 @@ done:
 static herr_t
 process_cmpd_fields(hid_t fid, char *dsetname)
 {
-    hid_t did=-1;               /* dataset id */
-    hid_t dtid=-1, tid=-1;      /* dataset's data type id */
+    hid_t  did  = -1;           /* dataset id */
+    hid_t  dtid = -1, tid = -1; /* dataset's data type id */
     size_t len;                 /* number of comma-separated fields in "g_list_of_fields" */
     herr_t ret_value = SUCCEED; /* Return value */
 
     HDassert(g_list_of_fields && *g_list_of_fields);
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
+    if ((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
         error_msg("error in opening dataset \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Get the dataset's datatype  */
-    if(((dtid = H5Dget_type(did)) < 0) || (tid = H5Tget_native_type(dtid, H5T_DIR_DEFAULT)) < 0) {
+    if (((dtid = H5Dget_type(did)) < 0) || (tid = H5Tget_native_type(dtid, H5T_DIR_DEFAULT)) < 0) {
         error_msg("error in getting dataset's datatype\n");
         ret_value = FAIL;
         goto done;
     }
 
     /* Check to make sure that the dataset's datatype is compound type */
-    if(H5Tget_class(dtid) != H5T_COMPOUND) {
+    if (H5Tget_class(dtid) != H5T_COMPOUND) {
         error_msg("dataset should be compound type for <list_of_fields>\n");
         ret_value = FAIL;
         goto done;
     }
 
     /* Make a copy of "g_list_of_fields" */
-    if((g_dup_fields = HDstrdup(g_list_of_fields)) == NULL) {
+    if ((g_dup_fields = HDstrdup(g_list_of_fields)) == NULL) {
         error_msg("error in duplicating g_list_of_fields\n");
         ret_value = FAIL;
         goto done;
     }
 
     /* Estimate the number of comma-separated fields in "g_list of_fields" */
-    len = HDstrlen(g_list_of_fields)/2 + 2;
+    len = HDstrlen(g_list_of_fields) / 2 + 2;
 
     /* Allocate memory for a list vector of H5LD_memb_t structures to store "g_list_of_fields" info */
-    if((g_listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))) == NULL) {
+    if ((g_listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *))) == NULL) {
         error_msg("error in allocating memory for H5LD_memb_t\n");
         ret_value = FAIL;
         goto done;
     }
 
     /* Process and store info for "g_listv" */
-    if(H5LD_construct_vector(g_dup_fields, g_listv, tid) < 0) {
+    if (H5LD_construct_vector(g_dup_fields, g_listv, tid) < 0) {
         error_msg("error in processing <list_of_fields>\n");
         ret_value = FAIL;
         goto done;
@@ -489,14 +466,13 @@ process_cmpd_fields(hid_t fid, char *dsetname)
 done:
     /* Closing */
     H5E_BEGIN_TRY
-        H5Tclose(dtid);
-        H5Tclose(tid);
-        H5Dclose(did);
+    H5Tclose(dtid);
+    H5Tclose(tid);
+    H5Dclose(did);
     H5E_END_TRY
-    return(ret_value);
+    return (ret_value);
 } /* process_cmpd_fields() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    check_dataset
  *
@@ -513,44 +489,44 @@ done:
 static herr_t
 check_dataset(hid_t fid, char *dsetname)
 {
-    hid_t did=-1;    /* Dataset id */
-    hid_t dcp=-1;    /* Dataset creation property */
-    hid_t sid=-1;    /* Dataset's dataspace id */
-    int      ndims;    /* # of dimensions in the dataspace */
-    unsigned u;        /* Local index variable */
-    hsize_t cur_dims[H5S_MAX_RANK];    /* size of dataspace dimensions */
-    hsize_t max_dims[H5S_MAX_RANK];    /* maximum size of dataspace dimensions */
-    hbool_t unlim_max_dims = FALSE;    /* whether dataset has unlimited or max. dimension setting */
-    void               *edata;
-    H5E_auto2_t         func;
-    H5D_layout_t        layout;
-    herr_t ret_value = SUCCEED;    /* Return value */
+    hid_t        did = -1;               /* Dataset id */
+    hid_t        dcp = -1;               /* Dataset creation property */
+    hid_t        sid = -1;               /* Dataset's dataspace id */
+    int          ndims;                  /* # of dimensions in the dataspace */
+    unsigned     u;                      /* Local index variable */
+    hsize_t      cur_dims[H5S_MAX_RANK]; /* size of dataspace dimensions */
+    hsize_t      max_dims[H5S_MAX_RANK]; /* maximum size of dataspace dimensions */
+    hbool_t      unlim_max_dims = FALSE; /* whether dataset has unlimited or max. dimension setting */
+    void *       edata;
+    H5E_auto2_t  func;
+    H5D_layout_t layout;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     /* Disable error reporting */
     H5Eget_auto2(H5E_DEFAULT, &func, &edata);
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
+    if ((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) {
         error_msg("unable to open dataset \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Get dataset's creation property list */
-    if((dcp = H5Dget_create_plist(did)) < 0) {
+    if ((dcp = H5Dget_create_plist(did)) < 0) {
         error_msg("unable to get dataset's creation property list \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Query dataset's layout; the layout should be chunked or virtual */
-    if((layout = H5Pget_layout(dcp)) < 0) {
+    if ((layout = H5Pget_layout(dcp)) < 0) {
         error_msg("unable to get dataset layout \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
-    if(layout != H5D_CHUNKED && layout != H5D_VIRTUAL) {
+    if (layout != H5D_CHUNKED && layout != H5D_VIRTUAL) {
         error_msg("\"%s\" should be a chunked or virtual dataset\n", dsetname);
         ret_value = FAIL;
         goto done;
@@ -560,27 +536,27 @@ check_dataset(hid_t fid, char *dsetname)
     HDmemset(max_dims, 0, sizeof max_dims);
 
     /* Get dataset's dataspace */
-    if((sid = H5Dget_space(did)) < 0) {
+    if ((sid = H5Dget_space(did)) < 0) {
         error_msg("can't get dataset's dataspace\"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Get dimension size of dataset's dataspace */
-    if((ndims = H5Sget_simple_extent_dims(sid, cur_dims, max_dims)) < 0) {
+    if ((ndims = H5Sget_simple_extent_dims(sid, cur_dims, max_dims)) < 0) {
         error_msg("can't get dataspace dimensions for dataset \"%s\"\n", dsetname);
         ret_value = FAIL;
         goto done;
     }
 
     /* Check whether dataset has unlimited dimension or max. dimension setting */
-    for(u = 0; u < (unsigned)ndims; u++)
-    if(max_dims[u] == H5S_UNLIMITED || cur_dims[u] != max_dims[u]) {
-        unlim_max_dims = TRUE;
-        break;
-    }
+    for (u = 0; u < (unsigned)ndims; u++)
+        if (max_dims[u] == H5S_UNLIMITED || cur_dims[u] != max_dims[u]) {
+            unlim_max_dims = TRUE;
+            break;
+        }
 
-    if(!unlim_max_dims) {
+    if (!unlim_max_dims) {
         error_msg("\"%s\" should have unlimited or max. dimension setting\n", dsetname);
         ret_value = FAIL;
     }
@@ -590,15 +566,14 @@ done:
 
     /* Closing */
     H5E_BEGIN_TRY
-        H5Sclose(sid);
-        H5Pclose(dcp);
-        H5Dclose(did);
+    H5Sclose(sid);
+    H5Pclose(dcp);
+    H5Dclose(did);
     H5E_END_TRY
 
-    return(ret_value);
+    return (ret_value);
 } /* check_dataset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -619,7 +594,6 @@ leave(int ret)
     exit(ret);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    usage
  *
@@ -647,10 +621,12 @@ usage(const char *prog)
     HDfprintf(stdout, "                              A value of 0 sets the number of columns to the\n");
     HDfprintf(stdout, "                              maximum (65535). The default width is 80 columns.\n");
     HDfprintf(stdout, "        --polling=N       Set the polling interval to N (in seconds) when the\n");
-    HDfprintf(stdout, "                              dataset will be checked for appended data.  The default\n");
+    HDfprintf(stdout,
+              "                              dataset will be checked for appended data.  The default\n");
     HDfprintf(stdout, "                              polling interval is 1.\n");
     HDfprintf(stdout, "        --fields=<list_of_fields>\n");
-    HDfprintf(stdout, "                              Display data for the fields specified in <list_of_fields>\n");
+    HDfprintf(stdout,
+              "                              Display data for the fields specified in <list_of_fields>\n");
     HDfprintf(stdout, "                              for a compound data type.  <list_of_fields> can be\n");
     HDfprintf(stdout, "                              specified as follows:\n");
     HDfprintf(stdout, "                                   1) A comma-separated list of field names in a\n");
@@ -660,7 +636,8 @@ usage(const char *prog)
     HDfprintf(stdout, "                                   2) A single field name in a compound data type.\n");
     HDfprintf(stdout, "                                   Can use this option multiple times.\n");
     HDfprintf(stdout, "                              Note that backslash is the escape character to avoid\n");
-    HDfprintf(stdout, "                              characters in field names that conflict with the tool's\n");
+    HDfprintf(stdout,
+              "                              characters in field names that conflict with the tool's\n");
     HDfprintf(stdout, "                              separators.\n");
     HDfprintf(stdout, "\n");
     HDfprintf(stdout, "     OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>]\n");
@@ -669,11 +646,11 @@ usage(const char *prog)
     HDfprintf(stdout, "        <path_to_dataset>     Path separated by slashes to the specified dataset\n");
     HDfprintf(stdout, "        <dsetname>            Name of the dataset\n");
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).\n");
+    HDfprintf(stdout,
+              "     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).\n");
 
 } /* usage() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
@@ -689,10 +666,10 @@ usage(const char *prog)
 static void
 parse_command_line(int argc, const char *argv[])
 {
-    int    opt;    /* Command line option */
+    int opt; /* Command line option */
     int tmp;
 
-     /* no arguments */
+    /* no arguments */
     if (argc == 1) {
         usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
@@ -701,80 +678,77 @@ parse_command_line(int argc, const char *argv[])
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
-        case '?':
-        case 'h': /* --help */
-            usage(h5tools_getprogname());
-            leave(EXIT_SUCCESS);
-            break;
-
-        case 'V': /* --version */
-            print_version(progname);
-            leave(EXIT_SUCCESS);
-            break;
-
-        case 'w': /* --width=N */
-            g_display_width = (int)HDstrtol(opt_arg, NULL, 0);
-            if(g_display_width < 0) {
+            case '?':
+            case 'h': /* --help */
                 usage(h5tools_getprogname());
-                leave(EXIT_FAILURE);
-            }
-            break;
+                leave(EXIT_SUCCESS);
+                break;
 
-        case 'd': /* --dim */
-            g_monitor_size_only = TRUE;
-            break;
+            case 'V': /* --version */
+                print_version(progname);
+                leave(EXIT_SUCCESS);
+                break;
 
-        case 'S': /* --simple */
-            g_simple_output = TRUE;
-            break;
+            case 'w': /* --width=N */
+                g_display_width = (int)HDstrtol(opt_arg, NULL, 0);
+                if (g_display_width < 0) {
+                    usage(h5tools_getprogname());
+                    leave(EXIT_FAILURE);
+                }
+                break;
 
-        case 'l': /* --label */
-            g_label = TRUE;
-            break;
+            case 'd': /* --dim */
+                g_monitor_size_only = TRUE;
+                break;
 
-        case 'p': /* --polling=N */
-            /* g_polling_interval = HDstrtod(opt_arg, NULL); */
-            if((tmp = (int)HDstrtol(opt_arg, NULL, 10)) <= 0) {
-                usage(h5tools_getprogname());
-                leave(EXIT_FAILURE);
-            }
-            g_polling_interval = (unsigned)tmp;
-            break;
+            case 'S': /* --simple */
+                g_simple_output = TRUE;
+                break;
 
-        case 'f': /* --fields=<list_of_fields> */
-            if(g_list_of_fields == NULL) {
-                if((g_list_of_fields = HDstrdup(opt_arg)) == NULL) {
-                    error_msg("memory allocation failed (file %s:line %d)\n",
-                               __FILE__, __LINE__);
+            case 'l': /* --label */
+                g_label = TRUE;
+                break;
+
+            case 'p': /* --polling=N */
+                /* g_polling_interval = HDstrtod(opt_arg, NULL); */
+                if ((tmp = (int)HDstrtol(opt_arg, NULL, 10)) <= 0) {
+                    usage(h5tools_getprogname());
                     leave(EXIT_FAILURE);
                 }
-            } else {
-                char *str;
+                g_polling_interval = (unsigned)tmp;
+                break;
 
-                if((str = HDstrdup(opt_arg)) == NULL) {
-                    error_msg("memory allocation failed (file %s:line %d)\n",
-                               __FILE__, __LINE__);
-                    leave(EXIT_FAILURE);
+            case 'f': /* --fields=<list_of_fields> */
+                if (g_list_of_fields == NULL) {
+                    if ((g_list_of_fields = HDstrdup(opt_arg)) == NULL) {
+                        error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
+                        leave(EXIT_FAILURE);
+                    }
                 }
-                if((g_list_of_fields = (char *)HDrealloc(g_list_of_fields, HDstrlen(g_list_of_fields) + HDstrlen(str) + 2)) == NULL) {
-                    error_msg("memory allocation failed (file %s:line %d)\n",
-                               __FILE__, __LINE__);
-                    leave(EXIT_FAILURE);
+                else {
+                    char *str;
 
+                    if ((str = HDstrdup(opt_arg)) == NULL) {
+                        error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
+                        leave(EXIT_FAILURE);
+                    }
+                    if ((g_list_of_fields = (char *)HDrealloc(
+                             g_list_of_fields, HDstrlen(g_list_of_fields) + HDstrlen(str) + 2)) == NULL) {
+                        error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
+                        leave(EXIT_FAILURE);
+                    }
+                    HDstrcat(g_list_of_fields, FIELD_SEP);
+                    HDstrcat(g_list_of_fields, str);
                 }
-                HDstrcat(g_list_of_fields, FIELD_SEP);
-                HDstrcat(g_list_of_fields, str);
-            }
 
-            break;
+                break;
 
-        default:
-            usage(h5tools_getprogname());
-            leave(EXIT_FAILURE);
+            default:
+                usage(h5tools_getprogname());
+                leave(EXIT_FAILURE);
         }
     }
 
-
     /* check for object to be processed */
     if (argc <= opt_ind) {
         error_msg("missing dataset name\n");
@@ -783,7 +757,6 @@ parse_command_line(int argc, const char *argv[])
     }
 } /* parse_command_line() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    catch_signal
  *
@@ -796,13 +769,13 @@ parse_command_line(int argc, const char *argv[])
  *
  *-------------------------------------------------------------------------
  */
-static void catch_signal(int H5_ATTR_UNUSED signo)
+static void
+catch_signal(int H5_ATTR_UNUSED signo)
 {
     /* Set the flag to get out of the main loop */
     g_user_interrupt = TRUE;
 } /* catch_signal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -818,14 +791,14 @@ static void catch_signal(int H5_ATTR_UNUSED signo)
 int
 main(int argc, const char *argv[])
 {
-    char        drivername[50];     /* VFD name */
-    char        *fname = NULL;      /* File name */
-    char        *dname = NULL;      /* Dataset name */
-    void        *edata;             /* Error reporting */
-    H5E_auto2_t func;               /* Error reporting */
-    char        *x;                 /* Temporary string pointer */
-    hid_t       fid = -1;           /* File ID */
-    hid_t       fapl = -1;          /* File access property list */
+    char        drivername[50]; /* VFD name */
+    char *      fname = NULL;   /* File name */
+    char *      dname = NULL;   /* Dataset name */
+    void *      edata;          /* Error reporting */
+    H5E_auto2_t func;           /* Error reporting */
+    char *      x;              /* Temporary string pointer */
+    hid_t       fid  = -1;      /* File ID */
+    hid_t       fapl = -1;      /* File access property list */
 
     /* Set up tool name and exit status */
     h5tools_setprogname(PROGRAMNAME);
@@ -839,13 +812,13 @@ main(int argc, const char *argv[])
     h5tools_init();
 
     /* To exit from h5watch for SIGTERM signal */
-    if(HDsignal(SIGTERM, catch_signal) == SIG_ERR) {
+    if (HDsignal(SIGTERM, catch_signal) == SIG_ERR) {
         error_msg("An error occurred while setting a signal handler.\n");
         leave(EXIT_FAILURE);
     }
 
     /* To exit from h5watch for SIGINT signal */
-    if(HDsignal(SIGINT, catch_signal) == SIG_ERR) {
+    if (HDsignal(SIGINT, catch_signal) == SIG_ERR) {
         error_msg("An error occurred while setting a signal handler.\n");
         leave(EXIT_FAILURE);
     }
@@ -853,7 +826,7 @@ main(int argc, const char *argv[])
     /* parse command line options */
     parse_command_line(argc, argv);
 
-    if(argc <= opt_ind) {
+    if (argc <= opt_ind) {
         error_msg("missing dataset name\n");
         usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
@@ -874,93 +847,100 @@ main(int argc, const char *argv[])
      * then there must have been something wrong with the file (perhaps it
      * doesn't exist).
      */
-    if((fname = HDstrdup(argv[opt_ind])) == NULL) {
-        error_msg("memory allocation failed (file %s:line %d)\n",
-                   __FILE__, __LINE__);
+    if ((fname = HDstrdup(argv[opt_ind])) == NULL) {
+        error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
         h5tools_setstatus(EXIT_FAILURE);
     }
 
     /* Create a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         return -1;
 
     /* Set to use the latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         return -1;
 
     do {
-        while(fname && *fname) {
-            fid = h5tools_fopen(fname, H5F_ACC_RDONLY|H5F_ACC_SWMR_READ, fapl, NULL, drivername, sizeof drivername);
+        while (fname && *fname) {
+            fid = h5tools_fopen(fname, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl, NULL, drivername,
+                                sizeof drivername);
 
-            if(fid >= 0) {
+            if (fid >= 0) {
                 HDfprintf(stdout, "Opened \"%s\" with %s driver.\n", fname, drivername);
                 break; /*success*/
-            } /* end if */
+            }          /* end if */
 
             /* Shorten the file name; lengthen the object name */
-            x = dname;
+            x     = dname;
             dname = HDstrrchr(fname, '/');
-            if(x)
+            if (x)
                 *x = '/';
-            if(!dname)
+            if (!dname)
                 break;
             *dname = '\0';
         } /* end while */
-    /* Try opening the file again if somehow unstable */
-    } while(g_retry-- > 0 && fid == FAIL);
+        /* Try opening the file again if somehow unstable */
+    } while (g_retry-- > 0 && fid == FAIL);
 
-    if(fid < 0) {
+    if (fid < 0) {
         error_msg("unable to open file \"%s\"\n", fname);
-        if(fname) HDfree(fname);
-        if(fapl >= 0) H5Pclose(fapl);
+        if (fname)
+            HDfree(fname);
+        if (fapl >= 0)
+            H5Pclose(fapl);
         leave(EXIT_FAILURE);
     }
 
-    if(!dname) {
+    if (!dname) {
         error_msg("no dataset specified\n");
         h5tools_setstatus(EXIT_FAILURE);
-    } else {
+    }
+    else {
         *dname = '/';
-        x = dname;
-        if((dname = HDstrdup(dname)) == NULL) {
-            error_msg("memory allocation failed (file %s:line %d)\n",
-                       __FILE__, __LINE__);
+        x      = dname;
+        if ((dname = HDstrdup(dname)) == NULL) {
+            error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
             h5tools_setstatus(EXIT_FAILURE);
-        } else {
+        }
+        else {
             *x = '\0';
             /* Validate dataset */
-            if(check_dataset(fid, dname) < 0)
+            if (check_dataset(fid, dname) < 0)
                 h5tools_setstatus(EXIT_FAILURE);
             /* Validate input "fields" */
-            else if(g_list_of_fields && *g_list_of_fields)
-                if(process_cmpd_fields(fid, dname) < 0)
+            else if (g_list_of_fields && *g_list_of_fields)
+                if (process_cmpd_fields(fid, dname) < 0)
                     h5tools_setstatus(EXIT_FAILURE);
         }
     }
 
     /* If everything is fine, start monitoring the datset */
-    if(h5tools_getstatus() != EXIT_FAILURE)
-        if(monitor_dataset(fid, dname) < 0)
+    if (h5tools_getstatus() != EXIT_FAILURE)
+        if (monitor_dataset(fid, dname) < 0)
             h5tools_setstatus(EXIT_FAILURE);
 
     /* Free spaces */
-    if(fname) HDfree(fname);
-    if(dname) HDfree(dname);
-    if(g_list_of_fields) HDfree(g_list_of_fields);
-    if(g_listv) {
+    if (fname)
+        HDfree(fname);
+    if (dname)
+        HDfree(dname);
+    if (g_list_of_fields)
+        HDfree(g_list_of_fields);
+    if (g_listv) {
         H5LD_clean_vector(g_listv);
         HDfree(g_listv);
     }
-    if(g_dup_fields) HDfree(g_dup_fields);
+    if (g_dup_fields)
+        HDfree(g_dup_fields);
 
     /* Close the file access property list */
-    if(fapl >= 0 && H5Pclose(fapl) < 0) {
+    if (fapl >= 0 && H5Pclose(fapl) < 0) {
         error_msg("unable to close file access property list\n");
         h5tools_setstatus(EXIT_FAILURE);
     }
 
     /* Close the file */
-    if(H5Fclose(fid) < 0) {
+    if (H5Fclose(fid) < 0) {
         error_msg("unable to close file\n");
         h5tools_setstatus(EXIT_FAILURE);
     }
@@ -969,4 +949,3 @@ main(int argc, const char *argv[])
     /* exit */
     leave(h5tools_getstatus());
 } /* main() */
-
diff --git a/hl/tools/h5watch/h5watchgentest.c b/hl/tools/h5watch/h5watchgentest.c
index 18e15fc..255ad41 100644
--- a/hl/tools/h5watch/h5watchgentest.c
+++ b/hl/tools/h5watch/h5watchgentest.c
@@ -15,44 +15,44 @@
 #include "H5HLprivate2.h"
 
 /*
- *  WATCH.h5: file with various types of datasets for testing--                                   
+ *  WATCH.h5: file with various types of datasets for testing--
  *
- *  The following datasets are chunked, H5D_ALLOC_TIME_INCR, max. dimensional setting:       
- *      DSET_ONE: one-dimensional dataset                                                   
- *      DSET_TWO: two-dimensional dataset                                                  
- *      DSET_CMPD: one-dimensional dataset with compound type                             
+ *  The following datasets are chunked, H5D_ALLOC_TIME_INCR, max. dimensional setting:
+ *      DSET_ONE: one-dimensional dataset
+ *      DSET_TWO: two-dimensional dataset
+ *      DSET_CMPD: one-dimensional dataset with compound type
  *      DSET_CMPD_ESC: one-dimensional dataset with compound type and member names with
- *		       escape/separator characters 
- *      DSET_CMPD_TWO: two-dimensional dataset with compound type                             
- *                                                                                           
- *  The following datasets are one-dimensional, chunked, max. dimension setting:              
- *      DSET_ALLOC_EARLY: dataset with H5D_ALLOC_TIME_EARLY                                  
- *      DSET_ALLOC_LATE: dataset H5D_ALLOC_TIME_LATE                                        
- *                                                                                       
- *  The following datasets are one-dimensional:                                           
- *      DSET_NONE: fixed dimension setting, contiguous, H5D_ALLOC_TIME_LATE              
- *      DSET_NOMAX: fixed dimension setting, chunked, H5D_ALLOC_TIME_INCR      
+ *		       escape/separator characters
+ *      DSET_CMPD_TWO: two-dimensional dataset with compound type
+ *
+ *  The following datasets are one-dimensional, chunked, max. dimension setting:
+ *      DSET_ALLOC_EARLY: dataset with H5D_ALLOC_TIME_EARLY
+ *      DSET_ALLOC_LATE: dataset H5D_ALLOC_TIME_LATE
+ *
+ *  The following datasets are one-dimensional:
+ *      DSET_NONE: fixed dimension setting, contiguous, H5D_ALLOC_TIME_LATE
+ *      DSET_NOMAX: fixed dimension setting, chunked, H5D_ALLOC_TIME_INCR
  */
-#define ONE_DIMS0	10
-#define MAX_ONE_DIMS0	100
+#define ONE_DIMS0     10
+#define MAX_ONE_DIMS0 100
 
-#define DSET_ONE 	"DSET_ONE"
-#define DSET_NONE	"DSET_NONE"
-#define DSET_NOMAX	"DSET_NOMAX"
-#define DSET_ALLOC_LATE "DSET_ALLOC_LATE"
+#define DSET_ONE         "DSET_ONE"
+#define DSET_NONE        "DSET_NONE"
+#define DSET_NOMAX       "DSET_NOMAX"
+#define DSET_ALLOC_LATE  "DSET_ALLOC_LATE"
 #define DSET_ALLOC_EARLY "DSET_ALLOC_EARLY"
-#define DSET_CMPD 	"DSET_CMPD"
-#define DSET_CMPD_ESC 	"DSET_CMPD_ESC"
+#define DSET_CMPD        "DSET_CMPD"
+#define DSET_CMPD_ESC    "DSET_CMPD_ESC"
 
-#define TWO_DIMS0	4
-#define TWO_DIMS1	10
-#define MAX_TWO_DIMS0	60
-#define MAX_TWO_DIMS1	100
+#define TWO_DIMS0     4
+#define TWO_DIMS1     10
+#define MAX_TWO_DIMS0 60
+#define MAX_TWO_DIMS1 100
 
-#define DSET_TWO 	"DSET_TWO"
-#define DSET_CMPD_TWO 	"DSET_CMPD_TWO"
+#define DSET_TWO      "DSET_TWO"
+#define DSET_CMPD_TWO "DSET_CMPD_TWO"
 
-#define CHUNK_SIZE	2
+#define CHUNK_SIZE 2
 
 #define FILE "WATCH.h5"
 
@@ -64,9 +64,9 @@ typedef struct sub22_t {
 } sub22_t;
 
 typedef struct sub2_t {
-    int a;
+    int     a;
     sub22_t b;
-    int c;
+    int     c;
 } sub2_t;
 
 typedef struct sub4_t {
@@ -75,7 +75,7 @@ typedef struct sub4_t {
 } sub4_t;
 
 typedef struct set_t {
-    int field1;
+    int    field1;
     sub2_t field2;
     double field3;
     sub4_t field4;
@@ -90,58 +90,63 @@ typedef struct set_t {
  **************************************************************************************
  */
 static herr_t
-generate_dset(hid_t fid, const char *dname, int ndims, hsize_t *dims, hsize_t *maxdims, hid_t dtid, void *data)
+generate_dset(hid_t fid, const char *dname, int ndims, hsize_t *dims, hsize_t *maxdims, hid_t dtid,
+              void *data)
 {
-    hid_t dcpl=-1;		/* Dataset creation property */
-    hid_t did=-1;		/* Dataset id */
-    hid_t sid=-1;		/* Dataspace id */
-    int i;		/* Local index variable */
-    hsize_t chunk_dims[H5S_MAX_RANK];	/* Dimension sizes for chunks */
+    hid_t   dcpl = -1;                /* Dataset creation property */
+    hid_t   did  = -1;                /* Dataset id */
+    hid_t   sid  = -1;                /* Dataspace id */
+    int     i;                        /* Local index variable */
+    hsize_t chunk_dims[H5S_MAX_RANK]; /* Dimension sizes for chunks */
 
     /* Create the dataspace */
-    if((sid = H5Screate_simple(ndims, dims, maxdims)) < 0)
+    if ((sid = H5Screate_simple(ndims, dims, maxdims)) < 0)
         goto done;
 
     /* Set up dataset's creation properties */
-    if(!HDstrcmp(dname, DSET_NONE))
+    if (!HDstrcmp(dname, DSET_NONE))
         dcpl = H5P_DEFAULT;
     else {
-        if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
             goto done;
-        for(i = 0; i < ndims; i++)
+        for (i = 0; i < ndims; i++)
             chunk_dims[i] = CHUNK_SIZE;
-        if(H5Pset_chunk(dcpl, ndims, chunk_dims) < 0)
+        if (H5Pset_chunk(dcpl, ndims, chunk_dims) < 0)
             goto done;
     } /* end else */
 
-    if(!HDstrcmp(dname, DSET_ALLOC_LATE)) {
-        if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0)
+    if (!HDstrcmp(dname, DSET_ALLOC_LATE)) {
+        if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0)
             goto done;
-    } else if(!HDstrcmp(dname, DSET_ALLOC_EARLY)) {
-        if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+    }
+    else if (!HDstrcmp(dname, DSET_ALLOC_EARLY)) {
+        if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
             goto done;
     } /* end if-else */
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, dname, dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, dname, dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto done;
 
     /* Write to the dataset */
-    if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+    if (H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
         goto done;
 
     /* Closing */
-    if(H5Pclose(dcpl) < 0) goto done;
-    if(H5Sclose(sid) < 0) goto done;
-    if(H5Dclose(did) < 0) goto done;
+    if (H5Pclose(dcpl) < 0)
+        goto done;
+    if (H5Sclose(sid) < 0)
+        goto done;
+    if (H5Dclose(did) < 0)
+        goto done;
 
     return SUCCEED;
 
 done:
     H5E_BEGIN_TRY
-	H5Sclose(sid);
-	H5Pclose(dcpl);
-	H5Dclose(did);
+    H5Sclose(sid);
+    H5Pclose(dcpl);
+    H5Dclose(did);
     H5E_END_TRY
 
     return FAIL;
@@ -150,49 +155,49 @@ done:
 int
 main(void)
 {
-    hid_t fid=-1;			/* File id */
-    hid_t fapl=-1;			/* File access property list id */
-    hsize_t cur_dims[1];		/* Dimension sizes */
-    hsize_t max_dims[1];		/* Maximum dimension sizes */
-    hsize_t cur2_dims[2];		/* Current dimension sizes */
-    hsize_t max2_dims[2];		/* Maximum dimension sizes */
-    hid_t set_tid=-1, esc_set_tid=-1;	/* Compound type id */
-    hid_t sub22_tid=-1;			/* Compound type id */
-    hid_t sub2_tid=-1, esc_sub2_tid=-1;	/* Compound type id */
-    hid_t sub4_tid=-1, esc_sub4_tid=-1;	/* Compound type id */
-    int one_data[ONE_DIMS0];		/* Buffer for data */
-    int two_data[TWO_DIMS0*TWO_DIMS1];	/* Buffer for data */
-    set_t one_cbuf[ONE_DIMS0];		/* Buffer for data with compound type */
-    set_t two_cbuf[TWO_DIMS0*TWO_DIMS1];	/* Buffer for data with compound type */
-    int i;				/* Local index variable */
+    hid_t   fid  = -1;                        /* File id */
+    hid_t   fapl = -1;                        /* File access property list id */
+    hsize_t cur_dims[1];                      /* Dimension sizes */
+    hsize_t max_dims[1];                      /* Maximum dimension sizes */
+    hsize_t cur2_dims[2];                     /* Current dimension sizes */
+    hsize_t max2_dims[2];                     /* Maximum dimension sizes */
+    hid_t   set_tid = -1, esc_set_tid = -1;   /* Compound type id */
+    hid_t   sub22_tid = -1;                   /* Compound type id */
+    hid_t   sub2_tid = -1, esc_sub2_tid = -1; /* Compound type id */
+    hid_t   sub4_tid = -1, esc_sub4_tid = -1; /* Compound type id */
+    int     one_data[ONE_DIMS0];              /* Buffer for data */
+    int     two_data[TWO_DIMS0 * TWO_DIMS1];  /* Buffer for data */
+    set_t   one_cbuf[ONE_DIMS0];              /* Buffer for data with compound type */
+    set_t   two_cbuf[TWO_DIMS0 * TWO_DIMS1];  /* Buffer for data with compound type */
+    int     i;                                /* Local index variable */
 
     /* Create a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         HDexit(EXIT_FAILURE);
     /* Set to use the latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         HDexit(EXIT_FAILURE);
 
     /* Create a file with the latest format */
-    if((fid = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((fid = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         HDexit(EXIT_FAILURE);
 
     /* Initialization for one-dimensional dataset */
     cur_dims[0] = ONE_DIMS0;
     max_dims[0] = MAX_ONE_DIMS0;
-    for(i = 0; i < ONE_DIMS0; i++)
+    for (i = 0; i < ONE_DIMS0; i++)
         one_data[i] = i;
 
     /* Generate DSET_ONE, DSET_NONE, DSET_NOMAX, DSET_ALLOC_LATE, DSET_EARLY */
-    if(generate_dset(fid, DSET_ONE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+    if (generate_dset(fid, DSET_ONE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
         goto done;
-    if(generate_dset(fid, DSET_NONE, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
+    if (generate_dset(fid, DSET_NONE, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
         goto done;
-    if(generate_dset(fid, DSET_NOMAX, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
+    if (generate_dset(fid, DSET_NOMAX, 1, cur_dims, NULL, H5T_NATIVE_INT, one_data) < 0)
         goto done;
-    if(generate_dset(fid, DSET_ALLOC_LATE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+    if (generate_dset(fid, DSET_ALLOC_LATE, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
         goto done;
-    if(generate_dset(fid, DSET_ALLOC_EARLY, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
+    if (generate_dset(fid, DSET_ALLOC_EARLY, 1, cur_dims, max_dims, H5T_NATIVE_INT, one_data) < 0)
         goto done;
 
     /* Initialization for two-dimensional dataset */
@@ -201,98 +206,98 @@ main(void)
     max2_dims[0] = MAX_TWO_DIMS0;
     max2_dims[1] = MAX_TWO_DIMS1;
 
-    for(i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++)
+    for (i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++)
         two_data[i] = i;
 
     /* Generate DSET_TWO */
-    if(generate_dset(fid, DSET_TWO, 2, cur2_dims, max2_dims, H5T_NATIVE_INT, two_data) < 0)
+    if (generate_dset(fid, DSET_TWO, 2, cur2_dims, max2_dims, H5T_NATIVE_INT, two_data) < 0)
         goto done;
 
     /* Initialization for one-dimensional compound typed dataset */
     cur_dims[0] = ONE_DIMS0;
     max_dims[0] = MAX_ONE_DIMS0;
 
-    for(i = 0; i < ONE_DIMS0; i++) {
-        one_cbuf[i].field1 = 1;
-        one_cbuf[i].field2.a = 2;
-        one_cbuf[i].field2.c = 4;
+    for (i = 0; i < ONE_DIMS0; i++) {
+        one_cbuf[i].field1     = 1;
+        one_cbuf[i].field2.a   = 2;
+        one_cbuf[i].field2.c   = 4;
         one_cbuf[i].field2.b.a = 20;
         one_cbuf[i].field2.b.b = 40;
         one_cbuf[i].field2.b.c = 80;
-        one_cbuf[i].field3 = 3.0F;
-        one_cbuf[i].field4.a = 4;
-        one_cbuf[i].field4.b = 8;
+        one_cbuf[i].field3     = 3.0F;
+        one_cbuf[i].field4.a   = 4;
+        one_cbuf[i].field4.b   = 8;
     } /* end for */
 
     /* Create the compound type */
-    if((sub22_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub22_t))) < 0)
+    if ((sub22_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub22_t))) < 0)
         goto done;
-    if(H5Tinsert(sub22_tid, "a", HOFFSET(sub22_t, a), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub22_tid, "a", HOFFSET(sub22_t, a), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(sub22_tid, "b", HOFFSET(sub22_t, b), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub22_tid, "b", HOFFSET(sub22_t, b), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(sub22_tid, "c", HOFFSET(sub22_t, c), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub22_tid, "c", HOFFSET(sub22_t, c), H5T_NATIVE_INT) < 0)
         goto done;
 
-    if((sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
+    if ((sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
         goto done;
-    if(H5Tinsert(sub2_tid, "a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub2_tid, "a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(sub2_tid, "b", HOFFSET(sub2_t, b), sub22_tid) < 0)
+    if (H5Tinsert(sub2_tid, "b", HOFFSET(sub2_t, b), sub22_tid) < 0)
         goto done;
-    if(H5Tinsert(sub2_tid, "c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub2_tid, "c", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
         goto done;
 
-    if((sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
+    if ((sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
         goto done;
-    if(H5Tinsert(sub4_tid, "a", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub4_tid, "a", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(sub4_tid, "b", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(sub4_tid, "b", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
         goto done;
 
-    if((set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
+    if ((set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
         goto done;
-    if(H5Tinsert(set_tid, "field1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(set_tid, "field1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(set_tid, "field2", HOFFSET(set_t, field2), sub2_tid) < 0)
+    if (H5Tinsert(set_tid, "field2", HOFFSET(set_t, field2), sub2_tid) < 0)
         goto done;
-    if(H5Tinsert(set_tid, "field3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
+    if (H5Tinsert(set_tid, "field3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
         goto done;
-    if(H5Tinsert(set_tid, "field4", HOFFSET(set_t, field4), sub4_tid) < 0)
+    if (H5Tinsert(set_tid, "field4", HOFFSET(set_t, field4), sub4_tid) < 0)
         goto done;
 
     /* Create the compound type with escape/separator characters */
-    if((esc_sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
+    if ((esc_sub2_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub2_t))) < 0)
         goto done;
-    if(H5Tinsert(esc_sub2_tid, ".a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(esc_sub2_tid, ".a", HOFFSET(sub2_t, a), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(esc_sub2_tid, ",b", HOFFSET(sub2_t, b), sub22_tid) < 0)
+    if (H5Tinsert(esc_sub2_tid, ",b", HOFFSET(sub2_t, b), sub22_tid) < 0)
         goto done;
-    if(H5Tinsert(esc_sub2_tid, "\\K", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(esc_sub2_tid, "\\K", HOFFSET(sub2_t, c), H5T_NATIVE_INT) < 0)
         goto done;
 
-    if((esc_sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
+    if ((esc_sub4_tid = H5Tcreate(H5T_COMPOUND, sizeof(sub4_t))) < 0)
         goto done;
-    if(H5Tinsert(esc_sub4_tid, "a.", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(esc_sub4_tid, "a.", HOFFSET(sub4_t, a), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(esc_sub4_tid, "b,", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(esc_sub4_tid, "b,", HOFFSET(sub4_t, b), H5T_NATIVE_INT) < 0)
         goto done;
 
-    if((esc_set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
+    if ((esc_set_tid = H5Tcreate(H5T_COMPOUND, sizeof(set_t))) < 0)
         goto done;
-    if(H5Tinsert(esc_set_tid, "field,1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
+    if (H5Tinsert(esc_set_tid, "field,1", HOFFSET(set_t, field1), H5T_NATIVE_INT) < 0)
         goto done;
-    if(H5Tinsert(esc_set_tid, "field2.", HOFFSET(set_t, field2), esc_sub2_tid) < 0)
+    if (H5Tinsert(esc_set_tid, "field2.", HOFFSET(set_t, field2), esc_sub2_tid) < 0)
         goto done;
-    if(H5Tinsert(esc_set_tid, "field\\3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
+    if (H5Tinsert(esc_set_tid, "field\\3", HOFFSET(set_t, field3), H5T_NATIVE_DOUBLE) < 0)
         goto done;
-    if(H5Tinsert(esc_set_tid, "field4,", HOFFSET(set_t, field4), esc_sub4_tid) < 0)
+    if (H5Tinsert(esc_set_tid, "field4,", HOFFSET(set_t, field4), esc_sub4_tid) < 0)
         goto done;
 
     /* Generate DSET_CMPD, DSET_CMPD_ESC */
-    if(generate_dset(fid, DSET_CMPD, 1, cur_dims, max_dims, set_tid, one_cbuf) < 0)
+    if (generate_dset(fid, DSET_CMPD, 1, cur_dims, max_dims, set_tid, one_cbuf) < 0)
         goto done;
-    if(generate_dset(fid, DSET_CMPD_ESC, 1, cur_dims, max_dims, esc_set_tid, one_cbuf) < 0)
+    if (generate_dset(fid, DSET_CMPD_ESC, 1, cur_dims, max_dims, esc_set_tid, one_cbuf) < 0)
         goto done;
 
     /* Initialization for two-dimensional compound typed dataset */
@@ -301,48 +306,56 @@ main(void)
     max2_dims[0] = MAX_TWO_DIMS0;
     max2_dims[0] = MAX_TWO_DIMS1;
 
-    for(i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++) {
-        two_cbuf[i].field1 = 1;
-        two_cbuf[i].field2.a = 2;
-        two_cbuf[i].field2.c = 4;
+    for (i = 0; i < (TWO_DIMS0 * TWO_DIMS1); i++) {
+        two_cbuf[i].field1     = 1;
+        two_cbuf[i].field2.a   = 2;
+        two_cbuf[i].field2.c   = 4;
         two_cbuf[i].field2.b.a = 20;
         two_cbuf[i].field2.b.b = 40;
         two_cbuf[i].field2.b.c = 80;
-        two_cbuf[i].field3 = 3.0F;
-        two_cbuf[i].field4.a = 4;
-        two_cbuf[i].field4.b = 8;
+        two_cbuf[i].field3     = 3.0F;
+        two_cbuf[i].field4.a   = 4;
+        two_cbuf[i].field4.b   = 8;
     } /* end for */
 
     /* Generate DSET_CMPD_TWO */
-    if(generate_dset(fid, DSET_CMPD_TWO, 2, cur2_dims, max2_dims, set_tid, two_cbuf) < 0)
+    if (generate_dset(fid, DSET_CMPD_TWO, 2, cur2_dims, max2_dims, set_tid, two_cbuf) < 0)
         goto done;
 
     /* Closing */
-    if(H5Tclose(sub22_tid) < 0) goto done;
-    if(H5Tclose(sub2_tid) < 0) goto done;
-    if(H5Tclose(sub4_tid) < 0) goto done;
-    if(H5Tclose(set_tid) < 0) goto done;
-    if(H5Tclose(esc_sub2_tid) < 0) goto done;
-    if(H5Tclose(esc_sub4_tid) < 0) goto done;
-    if(H5Tclose(esc_set_tid) < 0) goto done;
-    if(H5Pclose(fapl) < 0) goto done;
-    if(H5Fclose(fid) < 0) goto done;
+    if (H5Tclose(sub22_tid) < 0)
+        goto done;
+    if (H5Tclose(sub2_tid) < 0)
+        goto done;
+    if (H5Tclose(sub4_tid) < 0)
+        goto done;
+    if (H5Tclose(set_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_sub2_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_sub4_tid) < 0)
+        goto done;
+    if (H5Tclose(esc_set_tid) < 0)
+        goto done;
+    if (H5Pclose(fapl) < 0)
+        goto done;
+    if (H5Fclose(fid) < 0)
+        goto done;
 
     HDexit(EXIT_SUCCESS);
 
 done:
     H5E_BEGIN_TRY
-	H5Tclose(sub22_tid);
-	H5Tclose(sub2_tid);
-	H5Tclose(sub4_tid);
-	H5Tclose(set_tid);
-	H5Tclose(esc_sub2_tid);
-	H5Tclose(esc_sub4_tid);
-	H5Tclose(esc_set_tid);
-	H5Pclose(fapl);
-	H5Fclose(fid);
+    H5Tclose(sub22_tid);
+    H5Tclose(sub2_tid);
+    H5Tclose(sub4_tid);
+    H5Tclose(set_tid);
+    H5Tclose(esc_sub2_tid);
+    H5Tclose(esc_sub4_tid);
+    H5Tclose(esc_set_tid);
+    H5Pclose(fapl);
+    H5Fclose(fid);
     H5E_END_TRY
 
     HDexit(EXIT_FAILURE);
 } /* end main() */
-
diff --git a/hl/tools/h5watch/swmr_check_compat_vfd.c b/hl/tools/h5watch/swmr_check_compat_vfd.c
index 26f76cb..fb1c903 100644
--- a/hl/tools/h5watch/swmr_check_compat_vfd.c
+++ b/hl/tools/h5watch/swmr_check_compat_vfd.c
@@ -13,7 +13,7 @@
 
 /* Purpose:     This is a small program that checks if the HDF5_DRIVER
  *              environment variable is set to a value that supports SWMR.
- *              
+ *
  *              It is intended for use in shell scripts.
  */
 
@@ -22,11 +22,10 @@
 #include "H5private.h"
 
 /* This file needs to access the file driver testing code */
-#define H5FD_FRIEND		/*suppress error about including H5FDpkg	  */
+#define H5FD_FRIEND /*suppress error about including H5FDpkg	  */
 #define H5FD_TESTING
-#include "H5FDpkg.h"	/* File drivers	 			*/
+#include "H5FDpkg.h" /* File drivers	 			*/
 
-
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -48,10 +47,9 @@ main(void)
 
     driver = HDgetenv("HDF5_DRIVER");
 
-    if(H5FD__supports_swmr_test(driver))
+    if (H5FD__supports_swmr_test(driver))
         return EXIT_SUCCESS;
     else
         return EXIT_FAILURE;
 
 } /* end main() */
-